Skip to content

Allow parent theme to be selected for base location #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shadoath merged 6 commits into from
May 12, 2021
Merged

Allow parent theme to be selected for base location #178

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
62ff799
Allow parent theme to be selected for base location
Mar 11, 2021
2980f0a
Merge branch 'master' into sb-parent-theme-directory
May 10, 2021
f008499
Add warning
May 10, 2021
465afb4
Parent theme notes
shadoath May 10, 2021
ead2f66
Update comment about updating, Check to show correct theme when choos…
shadoath May 10, 2021
f6a692c
change == to ===
May 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions options.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ public function page_init()
'name' => 'base_compiling_folder',
'type' => apply_filters( 'wp_scss_base_compiling_modes',
array(
get_stylesheet_directory() => 'Current theme',
get_template_directory() => 'Parent theme', // Won't display if no parent theme as it would have duplicate keys in array
get_stylesheet_directory() => (get_stylesheet_directory() === get_template_directory() ? 'Current theme' : 'Child theme'),
wp_get_upload_dir()['basedir'] => 'Uploads directory',
WPSCSS_PLUGIN_DIR => 'WP-SCSS Plugin',
)
Expand Down Expand Up @@ -246,7 +247,9 @@ public function sanitize( $input ) {
* Print the Section text
*/
public function print_paths_info() {
print 'Location of your SCSS/CSS folders. Folders must be nested under your <b>Base Location</b> and start with <code>/</code>.</br>Examples: <code>/custom-scss/</code> and <code>/custom-css/</code>';
print 'Location of your SCSS/CSS folders. Folders must be nested under your <b>Base Location</b> and start with <code>/</code>.'+
'</br>Examples: <code>/custom-scss/</code> and <code>/custom-css/</code>'+
'</br><b>Caution</b> updating some themes or plugins will delete the custom WP-SCSS Base Location when nested.';
}
public function print_compile_info() {
print 'Choose how you would like SCSS and source maps to be compiled and how you would like the plugin to handle errors';
Expand Down