summaryrefslogtreecommitdiffstats
path: root/zen
diff options
context:
space:
mode:
authorJohnAlbin2008-09-14 13:01:32 +0000
committerJohnAlbin2008-09-14 13:01:32 +0000
commit2041a7c1ddcf57028073ff3c21fd9cc8322b03d3 (patch)
tree09224ae4940e3fff33655da00adfcb6283a24075 /zen
parent9c9b5bbc1ead9ebf7e46e13aff42ad5088486bcc (diff)
#263228: Allow sub-themes to override wireframes.css
Diffstat (limited to 'zen')
-rw-r--r--zen/template.php11
-rw-r--r--zen/wireframes.css16
-rw-r--r--zen/zen.info1
3 files changed, 14 insertions, 14 deletions
diff --git a/zen/template.php b/zen/template.php
index e9a8965..c9a1c5e 100644
--- a/zen/template.php
+++ b/zen/template.php
@@ -108,13 +108,9 @@ function zen_preprocess_page(&$vars, $hook) {
else {
drupal_add_css($vars['directory'] . '/layout-fixed.css', 'theme', 'all');
}
+ $vars['css'] = drupal_add_css();
+ $vars['styles'] = drupal_get_css();
}
- // Optionally add the wireframes style.
- if (theme_get_setting('zen_wireframes')) {
- drupal_add_css(path_to_zentheme() . '/wireframes.css', 'theme', 'all');
- }
- $vars['css'] = drupal_add_css();
- $vars['styles'] = drupal_get_css();
// Allow sub-themes to have an ie.css file
$vars['zentheme_directory'] = path_to_zentheme();
@@ -153,6 +149,9 @@ function zen_preprocess_page(&$vars, $hook) {
}
}
}
+ if (theme_get_setting('zen_wireframes')) {
+ $body_classes[] = 'with-wireframes'; // Optionally add the wireframes style.
+ }
$vars['body_classes'] = implode(' ', $body_classes); // Concatenate with spaces
}
diff --git a/zen/wireframes.css b/zen/wireframes.css
index 03fce30..f085662 100644
--- a/zen/wireframes.css
+++ b/zen/wireframes.css
@@ -7,20 +7,20 @@
*/
- #header-inner,
- #content-inner,
- #content-inner>*,
- #navbar-inner,
- #sidebar-left-inner,
- #sidebar-right-inner,
- #footer-inner
+ .with-wireframes #header-inner,
+ .with-wireframes #content-inner,
+ .with-wireframes #content-inner>*,
+ .with-wireframes #navbar-inner,
+ .with-wireframes #sidebar-left-inner,
+ .with-wireframes #sidebar-right-inner,
+ .with-wireframes #footer-inner
{
margin: 1px;
padding: 2px;
border: 1px solid #ccc;
}
- #closure-blocks
+ .with-wireframes #closure-blocks
{
margin-top: 1px;
padding: 2px;
diff --git a/zen/zen.info b/zen/zen.info
index 4b9ba16..0fb74cb 100644
--- a/zen/zen.info
+++ b/zen/zen.info
@@ -27,6 +27,7 @@ stylesheets[all][] = html-elements.css
stylesheets[all][] = tabs.css
stylesheets[all][] = zen.css
stylesheets[all][] = block-editing.css
+stylesheets[all][] = wireframes.css
stylesheets[print][] = print.css
; The layout CSS files are added by Zen's template.php file (based on its