framework/sage
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Close #789 - Don't automatically enqueue style.css for child themes

Browse Source
This commit is contained in:
Ben Word
2013-06-23 12:24:02 -05:00
parent a54c43d880
commit c444314d67
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/scripts.php
View File

@@ -6,7 +6,6 @@
* 1. /theme/assets/css/bootstrap.css * 1. /theme/assets/css/bootstrap.css
* 2. /theme/assets/css/bootstrap-responsive.css * 2. /theme/assets/css/bootstrap-responsive.css
* 3. /theme/assets/css/app.css * 3. /theme/assets/css/app.css
* 4. /child-theme/style.css (if a child theme is activated)
* *
* Enqueue scripts in the following order: * Enqueue scripts in the following order:
* 1. jquery-1.10.1.min.js via Google CDN * 1. jquery-1.10.1.min.js via Google CDN
@@ -19,11 +18,6 @@ function roots_scripts() {
wp_enqueue_style('roots_bootstrap_responsive', get_template_directory_uri() . '/assets/css/bootstrap-responsive.css', array('roots_bootstrap'), null); wp_enqueue_style('roots_bootstrap_responsive', get_template_directory_uri() . '/assets/css/bootstrap-responsive.css', array('roots_bootstrap'), null);
wp_enqueue_style('roots_app', get_template_directory_uri() . '/assets/css/app.css', false, null); wp_enqueue_style('roots_app', get_template_directory_uri() . '/assets/css/app.css', false, null);
// Load style.css from child theme
if (is_child_theme()) {
wp_enqueue_style('roots_child', get_stylesheet_uri(), false, null);
}
// jQuery is loaded using the same method from HTML5 Boilerplate: // jQuery is loaded using the same method from HTML5 Boilerplate:
// Grab Google CDN's latest jQuery with a protocol relative URL; fallback to local if offline // Grab Google CDN's latest jQuery with a protocol relative URL; fallback to local if offline
// It's kept in the header instead of footer to avoid conflicts with plugins. // It's kept in the header instead of footer to avoid conflicts with plugins.