theme-settings.php

@@ -58,9 +58,6 @@ function zen_form_system_theme_settings_alter(&$form, $form_state, $form_id = NU
       'disabled' => array(
         ':input[name="zen_breadcrumb_title"]' => array('checked' => TRUE),
       ),
-      'unchecked' => array(
-        ':input[name="zen_breadcrumb_title"]' => array('checked' => TRUE),
-      ),
     ),
   );
   $form['breadcrumb']['breadcrumb_options']['zen_breadcrumb_title'] = array(

zen-internals/css/styles-fixed-rtl.css

-dd{margin:0 30px 0 0}menu,ol,ul{padding:0 30px 0 0}legend{*margin-left:0;*margin-right:-7px}.sidebar-first #content{float:right;width:764px;margin-right:196px;margin-left:-980px}.sidebar-first .region-sidebar-first{float:right;width:176px;margin-right:0px;margin-left:-196px}.sidebar-second #content{float:right;width:764px;margin-right:0px;margin-left:-784px}.sidebar-second .region-sidebar-second{float:right;width:176px;margin-right:784px;margin-left:-980px}.two-sidebars #content{float:right;width:568px;margin-right:196px;margin-left:-784px}.two-sidebars .region-sidebar-first{float:right;width:176px;margin-right:0px;margin-left:-196px}.two-sidebars .region-sidebar-second{float:right;width:176px;margin-right:784px;margin-left:-980px}.header--logo{float:right}.header--secondary-menu{float:left}#navigation .links,#navigation .menu{text-align:right}#navigation .links li,#navigation .menu li{float:right;padding:0 0 0 10px}.messages,.messages-status,.messages-warning,.messages-error{padding:10px 50px 10px 10px;background-position:99% 8px}.tabs-primary--tab,.tabs-primary--tab-active,.tabs-secondary--tab,.tabs-secondary--tab-active{float:right}.inline li{display:inline-block;padding:0 0 0 1em}span.field-label{padding:0 0 0 1em}.more-link{text-align:left}.more-help-link{text-align:left}.more-help-link a{background-position:100% 50%;padding:1px 20px 1px 0}.menu--collapsed{list-style-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHAQMAAAD+nMWQAAAABlBMVEX///8AAABVwtN+AAAAAXRSTlMAQObYZgAAABNJREFUCB1j4GASYFJgcmD+A4IADUIDfIUMT4wAAAAASUVORK5CYII=');*list-style-image:url('../images/menu-collapsed-rtl.png')}#user-login-form{text-align:right}html.js #user-login-form li.openid-link,#user-login-form li.openid-link{margin-left:0;margin-right:-20px}form th{text-align:right;padding-left:1em;padding-right:0}html.js .collapsible .fieldset-legend{background-position:98% 75%;padding-left:0;padding-right:15px}html.js .collapsed .fieldset-legend{background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHAQMAAAD+nMWQAAAABlBMVEX///8AAABVwtN+AAAAAXRSTlMAQObYZgAAABNJREFUCB1j4GASYFJgcmD+A4IADUIDfIUMT4wAAAAASUVORK5CYII=');*background-image:url('../images/menu-collapsed-rtl.png');background-position:98% 50%}
+dd{margin:0 30px 0 0}menu,ol,ul{padding:0 30px 0 0}legend{*margin-left:0;*margin-right:-7px}.sidebar-first #content{float:right;width:764px;margin-right:196px;margin-left:-980px}.sidebar-first .region-sidebar-first{float:right;width:176px;margin-right:0px;margin-left:-196px}.sidebar-second #content{float:right;width:764px;margin-right:0px;margin-left:-784px}.sidebar-second .region-sidebar-second{float:right;width:176px;margin-right:784px;margin-left:-980px}.two-sidebars #content{float:right;width:568px;margin-right:196px;margin-left:-784px}.two-sidebars .region-sidebar-first{float:right;width:176px;margin-right:0px;margin-left:-196px}.two-sidebars .region-sidebar-second{float:right;width:176px;margin-right:784px;margin-left:-980px}.header__logo{float:right}.header__secondary-menu{float:left}#navigation .links,#navigation .menu{text-align:right}#navigation .links li,#navigation .menu li{float:right;padding:0 0 0 10px}.messages,.messages--status,.messages--warning,.messages--error{padding:10px 50px 10px 10px;background-position:99% 8px}.tabs-primary__tab,.tabs-primary__tab.is-active,.tabs-secondary__tab,.tabs-secondary__tab.is-active{float:right}.inline li{display:inline-block;padding:0 0 0 1em}span.field-label{padding:0 0 0 1em}.more-link{text-align:left}.more-help-link{text-align:left}.more-help-link a{background-position:100% 50%;padding:1px 20px 1px 0}.menu__item.is-collapsed{list-style-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHAQMAAAD+nMWQAAAABlBMVEX///8AAABVwtN+AAAAAXRSTlMAQObYZgAAABNJREFUCB1j4GASYFJgcmD+A4IADUIDfIUMT4wAAAAASUVORK5CYII=');*list-style-image:url('../images/menu-collapsed-rtl.png')}.indented{margin-left:0;margin-right:30px}#user-login-form{text-align:right}html.js #user-login-form li.openid-link,#user-login-form li.openid-link{margin-left:0;margin-right:-20px}form th{text-align:right;padding-left:1em;padding-right:0}html.js .collapsible .fieldset-legend{background-position:98% 75%;padding-left:0;padding-right:15px}html.js .collapsed .fieldset-legend{background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHAQMAAAD+nMWQAAAABlBMVEX///8AAABVwtN+AAAAAXRSTlMAQObYZgAAABNJREFUCB1j4GASYFJgcmD+A4IADUIDfIUMT4wAAAAASUVORK5CYII=');*background-image:url('../images/menu-collapsed-rtl.png');background-position:98% 50%}

zen-internals/css/styles-rtl.css

-dd{margin:0 30px 0 0}menu,ol,ul{padding:0 30px 0 0}legend{*margin-left:0;*margin-right:-7px}@media all and (min-width: 480px) and (max-width: 959px){.sidebar-first #content{float:right;width:66.66667%;margin-right:33.33333%;margin-left:-100%}.sidebar-first .region-sidebar-first{float:right;width:33.33333%;margin-right:0%;margin-left:-33.33333%}.sidebar-second #content{float:right;width:66.66667%;margin-right:0%;margin-left:-66.66667%}.sidebar-second .region-sidebar-second{float:right;width:33.33333%;margin-right:66.66667%;margin-left:-100%}.two-sidebars #content{float:right;width:66.66667%;margin-right:33.33333%;margin-left:-100%}.two-sidebars .region-sidebar-first{float:right;width:33.33333%;margin-right:0%;margin-left:-33.33333%}.two-sidebars .region-sidebar-second{float:right;width:100%;margin-right:0%;margin-left:-100%;padding-left:0;padding-right:0;clear:right}.two-sidebars .region-sidebar-second .block{padding-left:10px;padding-right:10px;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;word-wrap:break-word;*behavior:url("/path/to/boxsizing.htc");_display:inline;_overflow:hidden;_overflow-y:visible}.two-sidebars .region-sidebar-second .block:nth-child(3n+1){float:right;width:33.33333%;margin-right:0%;margin-left:-33.33333%;clear:right}.two-sidebars .region-sidebar-second .block:nth-child(3n+2){float:right;width:33.33333%;margin-right:33.33333%;margin-left:-66.66667%}.two-sidebars .region-sidebar-second .block:nth-child(3n){float:right;width:33.33333%;margin-right:66.66667%;margin-left:-100%}}@media all and (min-width: 960px){.sidebar-first #content{float:right;width:80%;margin-right:20%;margin-left:-100%}.sidebar-first .region-sidebar-first{float:right;width:20%;margin-right:0%;margin-left:-20%}.sidebar-second #content{float:right;width:80%;margin-right:0%;margin-left:-80%}.sidebar-second .region-sidebar-second{float:right;width:20%;margin-right:80%;margin-left:-100%}.two-sidebars #content{float:right;width:60%;margin-right:20%;margin-left:-80%}.two-sidebars .region-sidebar-first{float:right;width:20%;margin-right:0%;margin-left:-20%}.two-sidebars .region-sidebar-second{float:right;width:20%;margin-right:80%;margin-left:-100%}}.header--logo{float:right}.header--secondary-menu{float:left}#navigation .links,#navigation .menu{text-align:right}#navigation .links li,#navigation .menu li{float:right;padding:0 0 0 10px}.messages,.messages-status,.messages-warning,.messages-error{padding:10px 50px 10px 10px;background-position:99% 8px}.tabs-primary--tab,.tabs-primary--tab-active,.tabs-secondary--tab,.tabs-secondary--tab-active{float:right}.inline li{display:inline-block;padding:0 0 0 1em}span.field-label{padding:0 0 0 1em}.more-link{text-align:left}.more-help-link{text-align:left}.more-help-link a{background-position:100% 50%;padding:1px 20px 1px 0}.menu--collapsed{list-style-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHAQMAAAD+nMWQAAAABlBMVEX///8AAABVwtN+AAAAAXRSTlMAQObYZgAAABNJREFUCB1j4GASYFJgcmD+A4IADUIDfIUMT4wAAAAASUVORK5CYII=');*list-style-image:url('../images/menu-collapsed-rtl.png')}#user-login-form{text-align:right}html.js #user-login-form li.openid-link,#user-login-form li.openid-link{margin-left:0;margin-right:-20px}form th{text-align:right;padding-left:1em;padding-right:0}html.js .collapsible .fieldset-legend{background-position:98% 75%;padding-left:0;padding-right:15px}html.js .collapsed .fieldset-legend{background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHAQMAAAD+nMWQAAAABlBMVEX///8AAABVwtN+AAAAAXRSTlMAQObYZgAAABNJREFUCB1j4GASYFJgcmD+A4IADUIDfIUMT4wAAAAASUVORK5CYII=');*background-image:url('../images/menu-collapsed-rtl.png');background-position:98% 50%}
+dd{margin:0 30px 0 0}menu,ol,ul{padding:0 30px 0 0}legend{*margin-left:0;*margin-right:-7px}@media all and (min-width: 480px) and (max-width: 959px){.sidebar-first #content{float:right;width:66.66667%;margin-right:33.33333%;margin-left:-100%}.sidebar-first .region-sidebar-first{float:right;width:33.33333%;margin-right:0%;margin-left:-33.33333%}.sidebar-second #content{float:right;width:66.66667%;margin-right:0%;margin-left:-66.66667%}.sidebar-second .region-sidebar-second{float:right;width:33.33333%;margin-right:66.66667%;margin-left:-100%}.two-sidebars #content{float:right;width:66.66667%;margin-right:33.33333%;margin-left:-100%}.two-sidebars .region-sidebar-first{float:right;width:33.33333%;margin-right:0%;margin-left:-33.33333%}.two-sidebars .region-sidebar-second{float:right;width:100%;margin-right:0%;margin-left:-100%;padding-left:0;padding-right:0;clear:right}.two-sidebars .region-sidebar-second .block{padding-left:10px;padding-right:10px;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;word-wrap:break-word;*behavior:url("/path/to/boxsizing.htc");_display:inline;_overflow:hidden;_overflow-y:visible}.two-sidebars .region-sidebar-second .block:nth-child(3n+1){float:right;width:33.33333%;margin-right:0%;margin-left:-33.33333%;clear:right}.two-sidebars .region-sidebar-second .block:nth-child(3n+2){float:right;width:33.33333%;margin-right:33.33333%;margin-left:-66.66667%}.two-sidebars .region-sidebar-second .block:nth-child(3n){float:right;width:33.33333%;margin-right:66.66667%;margin-left:-100%}}@media all and (min-width: 960px){.sidebar-first #content{float:right;width:80%;margin-right:20%;margin-left:-100%}.sidebar-first .region-sidebar-first{float:right;width:20%;margin-right:0%;margin-left:-20%}.sidebar-second #content{float:right;width:80%;margin-right:0%;margin-left:-80%}.sidebar-second .region-sidebar-second{float:right;width:20%;margin-right:80%;margin-left:-100%}.two-sidebars #content{float:right;width:60%;margin-right:20%;margin-left:-80%}.two-sidebars .region-sidebar-first{float:right;width:20%;margin-right:0%;margin-left:-20%}.two-sidebars .region-sidebar-second{float:right;width:20%;margin-right:80%;margin-left:-100%}}.header__logo{float:right}.header__secondary-menu{float:left}#navigation .links,#navigation .menu{text-align:right}#navigation .links li,#navigation .menu li{float:right;padding:0 0 0 10px}.messages,.messages--status,.messages--warning,.messages--error{padding:10px 50px 10px 10px;background-position:99% 8px}.tabs-primary__tab,.tabs-primary__tab.is-active,.tabs-secondary__tab,.tabs-secondary__tab.is-active{float:right}.inline li{display:inline-block;padding:0 0 0 1em}span.field-label{padding:0 0 0 1em}.more-link{text-align:left}.more-help-link{text-align:left}.more-help-link a{background-position:100% 50%;padding:1px 20px 1px 0}.menu__item.is-collapsed{list-style-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHAQMAAAD+nMWQAAAABlBMVEX///8AAABVwtN+AAAAAXRSTlMAQObYZgAAABNJREFUCB1j4GASYFJgcmD+A4IADUIDfIUMT4wAAAAASUVORK5CYII=');*list-style-image:url('../images/menu-collapsed-rtl.png')}.indented{margin-left:0;margin-right:30px}#user-login-form{text-align:right}html.js #user-login-form li.openid-link,#user-login-form li.openid-link{margin-left:0;margin-right:-20px}form th{text-align:right;padding-left:1em;padding-right:0}html.js .collapsible .fieldset-legend{background-position:98% 75%;padding-left:0;padding-right:15px}html.js .collapsed .fieldset-legend{background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHAQMAAAD+nMWQAAAABlBMVEX///8AAABVwtN+AAAAAXRSTlMAQObYZgAAABNJREFUCB1j4GASYFJgcmD+A4IADUIDfIUMT4wAAAAASUVORK5CYII=');*background-image:url('../images/menu-collapsed-rtl.png');background-position:98% 50%}

zen-internals/extras/text-replacements/normalize--font-face--search.txt

  *
  * Since we're using Sass, you'll need to declare your font faces here, then you
- * can add them to the font variables in the _base.scss partial.
+ * can add them to the font variables in the _init.scss partial.

zen-internals/generate.sh

@@ -12,7 +12,7 @@ STARTERKIT=../STARTERKIT;
 cd $STARTERKIT;
 cp config.rb config.rb.orig;
 echo "asset_cache_buster :none" >> config.rb;
-compass clean;
+bundle exec compass clean;
 
 # Create our custom init partial, while keeping the original.
 mv sass/_init.scss $ORIG/;
@@ -20,7 +20,7 @@ cat $ORIG/_init.scss $ORIG/extras/sass/_init_extras.scss > sass/_init.scss;
 
 # Build the stylesheets for the Zen base theme.
 cp $ORIG/extras/sass/styles-fixed* sass/;
-compass compile --environment production --no-line-comments --output-style compressed;
+bundle exec compass compile --environment production --no-line-comments --output-style compressed;
 rm sass/styles-fixed*;
 
 # Copy the stylesheets from STARTERKIT to the Zen theme.
@@ -34,8 +34,8 @@ cp $ORIG/extras/sass/css-* sass/;
 cp $ORIG/extras/sass/layouts/css-* sass/layouts/;
 cp $ORIG/extras/sass/components/css-* sass/components/;
 rm css/*.css css/*/*.css;
-compass clean;
-compass compile --no-line-comments;
+bundle exec compass clean;
+bundle exec compass compile --no-line-comments;
 rm sass/css-* sass/*/css-*;
 
 # Don't use the generated styles.css.

zen-internals/template.zen.inc

@@ -20,4 +20,9 @@ function _zen_preprocess_html(&$variables, $hook) {
   $directory = drupal_get_path('theme', 'zen') . '/zen-internals/css/';
   $stylesheet = (theme_get_setting('zen_layout') == 'zen-fixed-width') ? 'styles-fixed.css' : 'styles.css';
   drupal_add_css($directory . $stylesheet, array('group' => CSS_THEME, 'every_page' => TRUE));
+
+  // Sub-themes after 7.x-5.1 remove these files, but we can't remove them using
+  // zen.info since it will break sub-themes built with 7.x-5.0/5.1.
+  drupal_add_css($directory . 'system.messages.css', array('group' => CSS_THEME, 'every_page' => TRUE));
+  drupal_add_css($directory . 'system.theme.css', array('group' => CSS_THEME, 'every_page' => TRUE));
 }

zen-internals/zen.drush.inc

@@ -90,8 +90,17 @@ function drush_zen($name = NULL, $machine_name = NULL) {
   // Remove all RTL stylesheets.
   if ($without_rtl = drush_get_option('without-rtl')) {
     foreach (array('layouts/_fixed', 'layouts/_responsive', 'components/_misc', '_normalize', 'styles') as $file) {
-      // Remove the RTL stylesheet.
-      $css_file = ($file[0] == '_') ? substr($file, 1) : $file;
+      // Move any sub-directory into a separate variable.
+      list($sub_dir, $css_file) = explode('/', $file . '/');
+      if (!$css_file) {
+        $css_file = $sub_dir;
+        $sub_dir = '';
+      }
+      else {
+        $sub_dir .= '/';
+      }
+      // Remove the RTL css file.
+      $css_file = $sub_dir . (($css_file[0] == '_') ? substr($css_file, 1) : $css_file);
       drush_op('unlink', drush_normalize_path($subtheme_path . '/css/' . $css_file . '-rtl.css'));
       drush_op('zen_file_str_replace', $subtheme_path . '/css/' . $css_file . '.css', ' /* LTR */', '');
       // Remove the RTL sass file.

zen.info

@@ -6,8 +6,6 @@ core        = 7.x
 engine      = phptemplate
 
 stylesheets[all][] = system.menus.css
-stylesheets[all][] = system.messages.css
-stylesheets[all][] = system.theme.css
 
 regions[header]         = Header
 regions[navigation]     = Navigation bar