Updating the Zen theme to 7.x-5.6

sites/all/themes/zen/README-FIRST.txt

@@ -6,7 +6,7 @@ they download the Zen theme is that there are A LOT of files -- way more than
 other themes.
 
 Don't worry! You don't need to learn everything all at once in order to make a
-drupal theme. Zen will do the bits you haven't learned and patiently wait for
+Drupal theme. Zen will do the bits you haven't learned and patiently wait for
 you to discover the documentation and inline comments about them.
 
 
@@ -64,30 +64,21 @@ ONLINE READING
 --------------
 
 Full documentation on the Zen theme can be found in Drupal's Handbook:
-  http://drupal.org/documentation/theme/zen
+  https://drupal.org/documentation/theme/zen
 
 Excellent documentation on Drupal theming can be found in the Theme Guide:
-  http://drupal.org/theme-guide
+  https://drupal.org/theme-guide
 
 
 INSTALLATION
 ------------
 
- 1. Download Zen from http://drupal.org/project/zen
+ 1. Download Zen from https://drupal.org/project/zen
 
  2. Unpack the downloaded file, take the entire zen folder and place it in your
-    Drupal installation under one of the following locations:
-      sites/all/themes
-        making it available to the default Drupal site and to all Drupal sites
-        in a multi-site configuration
-      sites/default/themes
-        making it available to only the default Drupal site
-      sites/example.com/themes
-        making it available to only the example.com site if there is a
-        sites/example.com/settings.php configuration file
-
-    Please note: you will need to manually create the "themes" folder under
-    "sites/default/".
+    Drupal installation under sites/all/themes. (Additional installation folders
+    can be used; see https://drupal.org/getting-started/install-contrib/themes
+    for more information.)
 
     For more information about acceptable theme installation directories, read
     the sites/default/default.settings.php file in your Drupal installation.

sites/all/themes/zen/STARTERKIT/Gemfile

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+group :frontend do
+  gem 'compass',        '<= 0.13'
+  # Build compass sprites faster with oily_png.
+  gem 'oily_png',       '~> 1.1'
+  gem 'sass',           '~> 3.2.0'
+  gem 'sass-globbing',  '~> 1.1'
+  gem 'zen-grids',      '~> 1.5'
+end

sites/all/themes/zen/STARTERKIT/README.txt

@@ -9,7 +9,7 @@ installed in sites/all/themes/, but any valid theme directory is acceptable
 (read the sites/default/default.settings.php for more info.)
 
   Why? To learn why you shouldn't modify any of the files in the zen/ folder,
-  see http://drupal.org/node/245802
+  see https://drupal.org/node/245802
 
 
 *** IMPORTANT NOTE ***
@@ -18,7 +18,7 @@ installed in sites/all/themes/, but any valid theme directory is acceptable
 * functions should be called. This means that if you add a new theme,
 * preprocess or process function to your template.php file or add a new template
 * (.tpl.php) file to your sub-theme, you will need to rebuild the "theme
-* registry." See http://drupal.org/node/173880#theme-registry
+* registry." See https://drupal.org/node/173880#theme-registry
 *
 * Drupal 7 also stores a cache of the data in .info files. If you modify any
 * lines in your sub-theme's .info file, you MUST refresh Drupal 7's cache by
@@ -53,34 +53,31 @@ installed in sites/all/themes/, but any valid theme directory is acceptable
       Why? The .info file describes the basic things about your theme: its
       name, description, features, template regions, CSS files, and JavaScript
       files. See the Drupal 7 Theme Guide for more info:
-      http://drupal.org/node/171205
+      https://drupal.org/node/171205
 
     Then, visit your site's Appearance page at admin/appearance to refresh
     Drupal 7's cache of .info file data.
 
  3. Choose your preferred page layout method or grid system.
 
     By default your new sub-theme is using a responsive layout. If you want a
-    fixed layout for your theme, delete the unneeded responsive-sidebars and
-    responsive-sidebars-rtl css/sass files and edit your sub-theme's .info file
-    and replace the reference to responsive-sidebars.css with fixed-width.css.
+    fixed layout for your theme, delete the unneeded "responsive" and
+    "responsive-rtl" css/sass files and edit your sub-theme's styles.css
+    or styles.scss file and replace the reference to "responsive" with
+    "fixed".
 
-    For example, edit foo/foo.info and change this line:
-      stylesheets[all][]   = css/layouts/responsive-sidebars.css
+    For example, edit foo/sass/styles.scss and change this line:
+      @import "layouts/responsive";
     to:
-      stylesheets[all][]   = css/layouts/fixed-width.css
-
-      Why? The "stylesheets" lines in your .info file describe the media type
-      and path to the CSS file you want to include. The format for these lines
-      is:  stylesheets[MEDIA][] = path/to/file.css
+      @import "layouts/fixed";
 
     Alternatively, if you are more familiar with a different CSS layout method,
     such as GridSetApp or 960.gs, etc., you can replace the
-    "css/layouts/responsive-sidebars.css" line in your .info file with a line
+    "layouts/responsive" line in your styles.scss file with a line
     pointing at your choice of layout CSS file.
 
     Then, visit your site's Appearance page at admin/appearance to refresh
-    Drupal 7's cache of .info file data.
+    Drupal 7's theme cache.
 
  4. Edit your sub-theme to use the proper function names.
 
@@ -118,17 +115,17 @@ Optional steps:
     the theme registry.
 
     You can find a full list of Drupal templates that you can override in the
-    templates/README.txt file or http://drupal.org/node/190815
+    templates/README.txt file or https://drupal.org/node/190815
 
       Why? In Drupal 7 theming, if you want to modify a template included by a
       module, you should copy the template file from the module's directory to
       your sub-theme's template directory and then rebuild the theme registry.
-      See the Drupal 7 Theme Guide for more info: http://drupal.org/node/173880
+      See the Drupal 7 Theme Guide for more info: https://drupal.org/node/173880
 
  8. Further extend your sub-theme.
 
     Discover further ways to extend your sub-theme by reading Zen's
     documentation online at:
-      http://drupal.org/documentation/theme/zen
+      https://drupal.org/documentation/theme/zen
     and Drupal 7's Theme Guide online at:
-      http://drupal.org/theme-guide
+      https://drupal.org/theme-guide

sites/all/themes/zen/STARTERKIT/STARTERKIT.info.txt

@@ -13,7 +13,7 @@
 
 screenshot  = screenshot.png
 name        = Zen Sub-theme Starter Kit
-description = Read the <a href="http://drupal.org/node/873778">online docs</a> or the included README.txt on how to create a theme with Zen.
+description = Read the <a href="https://drupal.org/node/873778">online docs</a> or the included README.txt on how to create a theme with Zen.
 
 
 
@@ -44,24 +44,13 @@ base theme  = zen
 ; CSS2.1 media types: http://www.w3.org/TR/CSS21/media.html#media-types
 ; CSS3 media queries: http://www.w3.org/TR/css3-mediaqueries/
 
-; First we remove the system's menu styling since Zen has its own.
+; First we remove the system's menu and message styling since Zen has its own.
 stylesheets[all][] = system.menus.css
+stylesheets[all][] = system.messages.css
+stylesheets[all][] = system.theme.css
 
-; Then we add our own stylesheets.
-stylesheets[all][] = css/normalize.css
-stylesheets[all][] = css/wireframes.css
-stylesheets[all][] = css/layouts/responsive-sidebars.css
-stylesheets[all][] = css/page-backgrounds.css
-stylesheets[all][] = css/tabs.css
-stylesheets[all][] = css/pages.css
-stylesheets[all][] = css/blocks.css
-stylesheets[all][] = css/navigation.css
-stylesheets[all][] = css/views-styles.css
-stylesheets[all][] = css/nodes.css
-stylesheets[all][] = css/comments.css
-stylesheets[all][] = css/forms.css
-stylesheets[all][] = css/fields.css
-stylesheets[all][] = css/print.css
+; Then we add our own stylesheet.
+stylesheets[all][] = css/styles.css
 
 ; Built-in conditional stylesheet support has been removed from Zen 7.x-5.x.
 ; Instead, Zen now adds conditional-comment-included classes to the html
@@ -70,7 +59,7 @@ stylesheets[all][] = css/print.css
 ; http://paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/
 ;
 ; If you still wish to use conditional stylesheets, you must install the
-; conditional stylesheets module: http://drupal.org/project/conditional_styles
+; conditional stylesheets module: https://drupal.org/project/conditional_styles
 ;stylesheets-conditional[lte IE 8][all][] = css/ie8.css
 
 
@@ -120,7 +109,7 @@ regions[page_bottom]    = Page bottom
 ; admin/appearance config page. This is useful for suppressing check boxes
 ; for elements not used by your sub-theme. To suppress a check box, omit the
 ; entry for it below. See the Drupal 7 Theme Guide for more info:
-; http://drupal.org/node/171205#features
+; https://drupal.org/node/171205#features
 
 features[] = logo
 features[] = name
@@ -138,7 +127,7 @@ features[] = secondary_menu
 settings[zen_breadcrumb]           = yes
 settings[zen_breadcrumb_separator] = ' › '
 settings[zen_breadcrumb_home]      = 1
-settings[zen_breadcrumb_trailing]  = 1
+settings[zen_breadcrumb_trailing]  = 0
 settings[zen_breadcrumb_title]     = 0
 settings[zen_skip_link_anchor]     = main-menu
 settings[zen_skip_link_text]       = Jump to navigation
@@ -154,5 +143,5 @@ settings[zen_wireframes]           = 0
 ;settings[shortcut_module_link]    = 1
 
 ; To add a Panels layout (which can also be used by Display Suite), uncomment
-; the line below and see the documentation at: http://drupal.org/node/495654
-;plugins[panels][layouts] = layouts
+; the line below and see the documentation at: https://drupal.org/node/495654
+;plugins[panels][layouts] = panels-layouts

sites/all/themes/zen/STARTERKIT/config.rb

@@ -11,7 +11,20 @@
 environment = :development
 #environment = :production
 
-# In development, we can turn on the FireSass-compatible debug_info.
+# If in development (set above), we can turn on the sourcemap file generation.
+# Requires sass 3.3+ and compass 1.0.1+
+# Determine version from command line: sass --version && compass --version
+sourcemap = false
+#sourcemap = true
+
+# Alternative development debugging methods
+# If in development (above), we can enable line_comments for FireCompass plugin.
+# Requires Firebug plugin and FireCompass plugin
+firecompass = false
+#firecompass = true
+
+# If in development (above), we can enable debug_info for the FireSass plugin.
+# Requires Firebug plugin and Firesass plugin
 firesass = false
 #firesass = true
 
@@ -54,3 +67,11 @@
 # Pass options to sass. For development, we turn on the FireSass-compatible
 # debug_info if the firesass config variable above is true.
 sass_options = (environment == :development && firesass == true) ? {:debug_info => true} : {}
+
+# Pass options to sass. For development, we turn on the FireCompass-compatible
+# line_comments if the firecompass config variable above is true.
+sass_options = (environment == :development && firecompass == true) ? {:line_comments => true} : sass_options
+
+# Pass options to sass. For development and sourcemap variable is true (above),
+# then pass the "--sourcemap" option flag to compass/sass.
+sass_options = (environment == :development && sourcemap == true) ? {:sourcemap => true} : sass_options