summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohnAlbin2013-07-03 21:09:34 (GMT)
committer JohnAlbin2013-07-03 21:09:34 (GMT)
commit504b74354c5be8e2ae038e44b645a5a4770bc590 (patch)
tree79a6f81c1850a34b5e4139ba96b612d4fd87ef1d
parent03871465145e6881a69cce041a57331ba0d95700 (diff)
Issue #1839484: _base partial does not contain SMACSS base styles
-rw-r--r--STARTERKIT/css/styles-rtl.css11
-rw-r--r--STARTERKIT/css/styles.css13
-rw-r--r--STARTERKIT/sass/_global-states-rtl.scss23
-rw-r--r--STARTERKIT/sass/_global-states.scss107
-rw-r--r--STARTERKIT/sass/_init.scss (renamed from STARTERKIT/sass/_base.scss)6
-rw-r--r--STARTERKIT/sass/components/_misc-rtl.scss (renamed from STARTERKIT/sass/_modular-styles-rtl.scss)21
-rw-r--r--STARTERKIT/sass/components/_misc.scss (renamed from STARTERKIT/sass/_modular-styles.scss)95
-rw-r--r--STARTERKIT/sass/layouts/_fixed-rtl.scss (renamed from STARTERKIT/sass/_layout-fixed-rtl.scss)2
-rw-r--r--STARTERKIT/sass/layouts/_fixed.scss (renamed from STARTERKIT/sass/_layout-fixed.scss)0
-rw-r--r--STARTERKIT/sass/layouts/_responsive-rtl.scss (renamed from STARTERKIT/sass/_layout-responsive-rtl.scss)2
-rw-r--r--STARTERKIT/sass/layouts/_responsive.scss (renamed from STARTERKIT/sass/_layout-responsive.scss)0
-rw-r--r--STARTERKIT/sass/styles-rtl.scss13
-rw-r--r--STARTERKIT/sass/styles.scss15
-rw-r--r--zen-internals/extras/sass/_init_extras.scss (renamed from zen-internals/extras/sass/_base_extras.scss)0
-rw-r--r--zen-internals/extras/sass/components/css-misc-rtl.scss2
-rw-r--r--zen-internals/extras/sass/components/css-misc.scss2
-rw-r--r--zen-internals/extras/sass/css-global-states-rtl.scss2
-rw-r--r--zen-internals/extras/sass/css-global-states.scss2
-rw-r--r--zen-internals/extras/sass/css-layout-fixed-rtl.scss2
-rw-r--r--zen-internals/extras/sass/css-layout-fixed.scss2
-rw-r--r--zen-internals/extras/sass/css-layout-responsive-rtl.scss2
-rw-r--r--zen-internals/extras/sass/css-layout-responsive.scss2
-rw-r--r--zen-internals/extras/sass/css-modular-styles-rtl.scss2
-rw-r--r--zen-internals/extras/sass/css-modular-styles.scss2
-rw-r--r--zen-internals/extras/sass/css-normalize-rtl.scss2
-rw-r--r--zen-internals/extras/sass/css-normalize.scss2
-rw-r--r--zen-internals/extras/sass/css-print.scss2
-rw-r--r--zen-internals/extras/sass/layouts/css-fixed-rtl.scss2
-rw-r--r--zen-internals/extras/sass/layouts/css-fixed.scss2
-rw-r--r--zen-internals/extras/sass/layouts/css-responsive-rtl.scss2
-rw-r--r--zen-internals/extras/sass/layouts/css-responsive.scss2
-rw-r--r--zen-internals/extras/sass/styles-fixed-rtl.scss13
-rw-r--r--zen-internals/extras/sass/styles-fixed.scss15
-rw-r--r--zen-internals/extras/text-replacements/components/misc--navigation-links--replace.txt (renamed from zen-internals/extras/text-replacements/modular-styles--navigation-links--replace.txt)0
-rw-r--r--zen-internals/extras/text-replacements/components/misc--navigation-links--search.txt (renamed from zen-internals/extras/text-replacements/modular-styles--navigation-links--search.txt)0
-rw-r--r--zen-internals/extras/text-replacements/components/misc--openid-1--replace.txt (renamed from zen-internals/extras/text-replacements/modular-styles--openid-1--replace.txt)0
-rw-r--r--zen-internals/extras/text-replacements/components/misc--openid-1--search.txt (renamed from zen-internals/extras/text-replacements/modular-styles--openid-1--search.txt)0
-rw-r--r--zen-internals/extras/text-replacements/components/misc--openid-2--replace.txt (renamed from zen-internals/extras/text-replacements/modular-styles--openid-2--replace.txt)0
-rw-r--r--zen-internals/extras/text-replacements/components/misc--openid-2--search.txt (renamed from zen-internals/extras/text-replacements/modular-styles--openid-2--search.txt)0
-rw-r--r--zen-internals/extras/text-replacements/components/misc--titles--replace.txt (renamed from zen-internals/extras/text-replacements/modular-styles--titles--replace.txt)0
-rw-r--r--zen-internals/extras/text-replacements/components/misc--titles--search.txt (renamed from zen-internals/extras/text-replacements/modular-styles--titles--search.txt)0
-rw-r--r--zen-internals/extras/text-replacements/components/misc-rtl--navigation-links--replace.txt (renamed from zen-internals/extras/text-replacements/modular-styles-rtl--navigation-links--replace.txt)0
-rw-r--r--zen-internals/extras/text-replacements/components/misc-rtl--navigation-links--search.txt (renamed from zen-internals/extras/text-replacements/modular-styles-rtl--navigation-links--search.txt)0
-rwxr-xr-xzen-internals/generate.sh27
-rw-r--r--zen-internals/zen.drush.inc2
45 files changed, 184 insertions, 215 deletions
diff --git a/STARTERKIT/css/styles-rtl.css b/STARTERKIT/css/styles-rtl.css
index 739a9e4..96ea4a9 100644
--- a/STARTERKIT/css/styles-rtl.css
+++ b/STARTERKIT/css/styles-rtl.css
@@ -3,17 +3,14 @@
* RTL companion for the styles.css file.
*/
-/* Base rules */
+/* Base HTML element rules */
@import "normalize-rtl.css";
/* Layout rules */
-@import "layout-responsive-rtl.css";
+@import "layouts/responsive-rtl.css";
-/* Module rules */
-@import "modular-styles-rtl.css";
-
-/* Global state rules */
-@import "global-states-rtl.css";
+/* Component (SMACSS module) rules */
+@import "components/misc-rtl.css";
/* Theme rules */
/* @import "theme-A-rtl.css"; */
diff --git a/STARTERKIT/css/styles.css b/STARTERKIT/css/styles.css
index 9a936b1..8663e2a 100644
--- a/STARTERKIT/css/styles.css
+++ b/STARTERKIT/css/styles.css
@@ -6,20 +6,17 @@
* of these @include files will be combined into a single file.
*/
-/* Base rules */
+/* Base HTML element rules */
@import "normalize.css";
/* Layout rules */
-@import "layout-responsive.css";
+@import "layouts/responsive.css";
-/* Module rules */
-@import "modular-styles.css";
-/* Optionally, add your own modular stylesheets here. */
+/* Component (SMACSS module) rules */
+@import "components/misc.css";
+/* Optionally, add your own components here. */
@import "print.css";
-/* Global state rules */
-@import "global-states.css";
-
/* Theme rules */
/* @import "theme-A.css"; */
/* @import "theme-B.css"; */
diff --git a/STARTERKIT/sass/_global-states-rtl.scss b/STARTERKIT/sass/_global-states-rtl.scss
deleted file mode 100644
index 83d2626..0000000
--- a/STARTERKIT/sass/_global-states-rtl.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file
- * RTL companion for the global-states.css file.
- */
-
-/* =============================================================================
- Drupal form widgets
- ========================================================================== */
-
-.fieldset-legend {
- html.js .collapsible & {
- background-position: 98% 75%;
- padding-left: 0;
- padding-right: 15px;
- }
- html.js .collapsed & {
- background-image: inline-image("menu-collapsed-rtl.png");
- @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
- *background-image: url(../images/menu-collapsed-rtl.png);
- }
- background-position: 98% 50%;
- }
-}
diff --git a/STARTERKIT/sass/_global-states.scss b/STARTERKIT/sass/_global-states.scss
deleted file mode 100644
index b3f902e..0000000
--- a/STARTERKIT/sass/_global-states.scss
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * @file
- * SMACSS States
- *
- * Adds state-based styling. Global state rules are those that apply only during
- * certain states of the page and have a JavaScript dependency. For more
- * information, see https://smacss.com/book/type-state
- */
-
-/* =============================================================================
- Drupal form widgets
- ========================================================================== */
-
-/**
- * Autocomplete.
- *
- * @see autocomplete.js
- */
-
-#autocomplete .selected { /* Suggestion list */
- background: #0072b9;
- color: #fff;
-}
-
-/**
- * Collapsible fieldsets.
- *
- * @see collapse.js
- */
-
-.fieldset-legend {
- html.js .collapsible & {
- background-image: inline-image("menu-expanded.png");
- @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
- *background-image: url(../images/menu-expanded.png);
- }
- background-position: 5px 65%; /* LTR */
- background-repeat: no-repeat;
- padding-left: 15px; /* LTR */
- }
- html.js .collapsed & {
- background-image: inline-image("menu-collapsed.png"); /* LTR */
- @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
- *background-image: url(../images/menu-collapsed.png); /* LTR */
- }
- background-position: 5px 50%; /* LTR */
- }
-
- .summary {
- color: #999;
- font-size: 0.9em;
- margin-left: 0.5em;
- }
-}
-
-/**
- * TableDrag behavior.
- *
- * @see tabledrag.js
- */
-
-tr.drag {
- background-color: #fffff0;
-}
-
-tr.drag-previous {
- background-color: #ffd;
-}
-
-.tabledrag-toggle-weight {
- font-size: 0.9em;
-}
-
-/**
- * TableSelect behavior.
- *
- * @see tableselect.js
- */
-
-tr.selected td {
- background: #ffc;
-}
-
-/**
- * Progress bar.
- *
- * @see progress.js
- */
-
-.progress {
- font-weight: bold;
-
- .bar {
- background: #ccc;
- border-color: #666;
- margin: 0 0.2em;
- @include border-radius(3px);
- }
-
- .filled {
- background-color: #0072b9;
- background-image: inline-image("progress.gif");
- @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
- *background-image: url(../images/progress.gif);
- }
- }
-}
diff --git a/STARTERKIT/sass/_base.scss b/STARTERKIT/sass/_init.scss
index c6b3b3f..63db562 100644
--- a/STARTERKIT/sass/_base.scss
+++ b/STARTERKIT/sass/_init.scss
@@ -1,11 +1,11 @@
//
-// "base" partial
+// Initialization partial
//
// To make it easier to use all variables and mixins in any Sass file in this
-// theme, each .scss file has a @import "base" declaration. And this _base.scss
+// theme, each .scss file has a @import "init" declaration. And this _init.scss
// file is in charge of importing all the other partials needed for the theme.
//
-// This base partial is organized in this way:
+// This initialization partial is organized in this way:
// - First we set any shared Sass variables.
// - Next we import Compass plug-ins (Sass mixin libraries).
// - Last we define our custom mixins for this theme.
diff --git a/STARTERKIT/sass/_modular-styles-rtl.scss b/STARTERKIT/sass/components/_misc-rtl.scss
index afc981d..9f131e5 100644
--- a/STARTERKIT/sass/_modular-styles-rtl.scss
+++ b/STARTERKIT/sass/components/_misc-rtl.scss
@@ -138,3 +138,24 @@ form {
padding-right: 0;
}
}
+
+/**
+ * Collapsible fieldsets.
+ *
+ * @see collapse.js
+ */
+
+.fieldset-legend {
+ html.js .collapsible & {
+ background-position: 98% 75%;
+ padding-left: 0;
+ padding-right: 15px;
+ }
+ html.js .collapsed & {
+ background-image: inline-image("menu-collapsed-rtl.png");
+ @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
+ *background-image: url(../images/menu-collapsed-rtl.png);
+ }
+ background-position: 98% 50%;
+ }
+}
diff --git a/STARTERKIT/sass/_modular-styles.scss b/STARTERKIT/sass/components/_misc.scss
index ec0875a..3289cba 100644
--- a/STARTERKIT/sass/_modular-styles.scss
+++ b/STARTERKIT/sass/components/_misc.scss
@@ -716,3 +716,98 @@ th.checkbox {
td.menu-disabled {
background: #ccc;
}
+
+/**
+ * Autocomplete.
+ *
+ * @see autocomplete.js
+ */
+
+#autocomplete .selected { /* Suggestion list */
+ background: #0072b9;
+ color: #fff;
+}
+
+/**
+ * Collapsible fieldsets.
+ *
+ * @see collapse.js
+ */
+
+.fieldset-legend {
+ html.js .collapsible & {
+ background-image: inline-image("menu-expanded.png");
+ @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
+ *background-image: url(../images/menu-expanded.png);
+ }
+ background-position: 5px 65%; /* LTR */
+ background-repeat: no-repeat;
+ padding-left: 15px; /* LTR */
+ }
+ html.js .collapsed & {
+ background-image: inline-image("menu-collapsed.png"); /* LTR */
+ @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
+ *background-image: url(../images/menu-collapsed.png); /* LTR */
+ }
+ background-position: 5px 50%; /* LTR */
+ }
+
+ .summary {
+ color: #999;
+ font-size: 0.9em;
+ margin-left: 0.5em;
+ }
+}
+
+/**
+ * TableDrag behavior.
+ *
+ * @see tabledrag.js
+ */
+
+tr.drag {
+ background-color: #fffff0;
+}
+
+tr.drag-previous {
+ background-color: #ffd;
+}
+
+.tabledrag-toggle-weight {
+ font-size: 0.9em;
+}
+
+/**
+ * TableSelect behavior.
+ *
+ * @see tableselect.js
+ */
+
+tr.selected td {
+ background: #ffc;
+}
+
+/**
+ * Progress bar.
+ *
+ * @see progress.js
+ */
+
+.progress {
+ font-weight: bold;
+
+ .bar {
+ background: #ccc;
+ border-color: #666;
+ margin: 0 0.2em;
+ @include border-radius(3px);
+ }
+
+ .filled {
+ background-color: #0072b9;
+ background-image: inline-image("progress.gif");
+ @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
+ *background-image: url(../images/progress.gif);
+ }
+ }
+}
diff --git a/STARTERKIT/sass/_layout-fixed-rtl.scss b/STARTERKIT/sass/layouts/_fixed-rtl.scss
index ae114f0..053d83b 100644
--- a/STARTERKIT/sass/_layout-fixed-rtl.scss
+++ b/STARTERKIT/sass/layouts/_fixed-rtl.scss
@@ -8,4 +8,4 @@
$zen-reverse-all-floats: true;
// Then we import the LTR layout and the directions are automatically reversed.
-@import "layout-fixed";
+@import "fixed";
diff --git a/STARTERKIT/sass/_layout-fixed.scss b/STARTERKIT/sass/layouts/_fixed.scss
index 684a218..684a218 100644
--- a/STARTERKIT/sass/_layout-fixed.scss
+++ b/STARTERKIT/sass/layouts/_fixed.scss
diff --git a/STARTERKIT/sass/_layout-responsive-rtl.scss b/STARTERKIT/sass/layouts/_responsive-rtl.scss
index 3fbe5bd..83338af 100644
--- a/STARTERKIT/sass/_layout-responsive-rtl.scss
+++ b/STARTERKIT/sass/layouts/_responsive-rtl.scss
@@ -8,4 +8,4 @@
$zen-reverse-all-floats: true;
// Then we import the LTR layout and the directions are automatically reversed.
-@import "layout-responsive";
+@import "responsive";
diff --git a/STARTERKIT/sass/_layout-responsive.scss b/STARTERKIT/sass/layouts/_responsive.scss
index 2c6e9e6..2c6e9e6 100644
--- a/STARTERKIT/sass/_layout-responsive.scss
+++ b/STARTERKIT/sass/layouts/_responsive.scss
diff --git a/STARTERKIT/sass/styles-rtl.scss b/STARTERKIT/sass/styles-rtl.scss
index 1791b40..1abcff0 100644
--- a/STARTERKIT/sass/styles-rtl.scss
+++ b/STARTERKIT/sass/styles-rtl.scss
@@ -3,20 +3,17 @@
* RTL companion for the styles.scss file.
*/
-@import "base"; /* Import Sass mixins, variables, Compass modules, etc. */
+@import "init"; /* Import Sass mixins, variables, Compass modules, etc. */
-/* Base rules */
+/* Base HTML element rules */
@import "normalize-rtl";
/* Layout rules */
-@import "layout-responsive-rtl";
+@import "layouts/responsive-rtl";
-/* Module rules */
-@import "modular-styles-rtl";
-
-/* Global state rules */
-@import "global-states-rtl";
+/* Component (SMACSS module) rules */
+@import "components/misc-rtl";
/* Theme rules */
/* @import "theme-A-rtl"; */
diff --git a/STARTERKIT/sass/styles.scss b/STARTERKIT/sass/styles.scss
index 8a9d3af..e323164 100644
--- a/STARTERKIT/sass/styles.scss
+++ b/STARTERKIT/sass/styles.scss
@@ -6,23 +6,20 @@
* of these @include files will be combined into a single file.
*/
-@import "base"; /* Import Sass mixins, variables, Compass modules, etc. */
+@import "init"; /* Import Sass mixins, variables, Compass modules, etc. */
-/* Base rules */
+/* Base HTML element rules */
@import "normalize";
/* Layout rules */
-@import "layout-responsive";
+@import "layouts/responsive";
-/* Module rules */
-@import "modular-styles";
-// Optionally, add your own modular stylesheets here.
+/* Component (SMACSS module) rules */
+@import "components/misc";
+// Optionally, add your own components here.
@import "print";
-/* Global state rules */
-@import "global-states";
-
/* Theme rules */
/* @import "theme-A"; */
/* @import "theme-B"; */
diff --git a/zen-internals/extras/sass/_base_extras.scss b/zen-internals/extras/sass/_init_extras.scss
index af16446..af16446 100644
--- a/zen-internals/extras/sass/_base_extras.scss
+++ b/zen-internals/extras/sass/_init_extras.scss
diff --git a/zen-internals/extras/sass/components/css-misc-rtl.scss b/zen-internals/extras/sass/components/css-misc-rtl.scss
new file mode 100644
index 0000000..39267cd
--- /dev/null
+++ b/zen-internals/extras/sass/components/css-misc-rtl.scss
@@ -0,0 +1,2 @@
+@import "init";
+@import "components/misc-rtl";
diff --git a/zen-internals/extras/sass/components/css-misc.scss b/zen-internals/extras/sass/components/css-misc.scss
new file mode 100644
index 0000000..6f1f466
--- /dev/null
+++ b/zen-internals/extras/sass/components/css-misc.scss
@@ -0,0 +1,2 @@
+@import "init";
+@import "components/misc";
diff --git a/zen-internals/extras/sass/css-global-states-rtl.scss b/zen-internals/extras/sass/css-global-states-rtl.scss
deleted file mode 100644
index 7fff83c..0000000
--- a/zen-internals/extras/sass/css-global-states-rtl.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "base";
-@import "global-states-rtl";
diff --git a/zen-internals/extras/sass/css-global-states.scss b/zen-internals/extras/sass/css-global-states.scss
deleted file mode 100644
index 656c4a5..0000000
--- a/zen-internals/extras/sass/css-global-states.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "base";
-@import "global-states";
diff --git a/zen-internals/extras/sass/css-layout-fixed-rtl.scss b/zen-internals/extras/sass/css-layout-fixed-rtl.scss
deleted file mode 100644
index a57c606..0000000
--- a/zen-internals/extras/sass/css-layout-fixed-rtl.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "base";
-@import "layout-fixed-rtl";
diff --git a/zen-internals/extras/sass/css-layout-fixed.scss b/zen-internals/extras/sass/css-layout-fixed.scss
deleted file mode 100644
index b0bb94c..0000000
--- a/zen-internals/extras/sass/css-layout-fixed.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "base";
-@import "layout-fixed";
diff --git a/zen-internals/extras/sass/css-layout-responsive-rtl.scss b/zen-internals/extras/sass/css-layout-responsive-rtl.scss
deleted file mode 100644
index 748f30a..0000000
--- a/zen-internals/extras/sass/css-layout-responsive-rtl.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "base";
-@import "layout-responsive-rtl";
diff --git a/zen-internals/extras/sass/css-layout-responsive.scss b/zen-internals/extras/sass/css-layout-responsive.scss
deleted file mode 100644
index e19474a..0000000
--- a/zen-internals/extras/sass/css-layout-responsive.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "base";
-@import "layout-responsive";
diff --git a/zen-internals/extras/sass/css-modular-styles-rtl.scss b/zen-internals/extras/sass/css-modular-styles-rtl.scss
deleted file mode 100644
index 001c420..0000000
--- a/zen-internals/extras/sass/css-modular-styles-rtl.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "base";
-@import "modular-styles-rtl";
diff --git a/zen-internals/extras/sass/css-modular-styles.scss b/zen-internals/extras/sass/css-modular-styles.scss
deleted file mode 100644
index 720713a..0000000
--- a/zen-internals/extras/sass/css-modular-styles.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "base";
-@import "modular-styles";
diff --git a/zen-internals/extras/sass/css-normalize-rtl.scss b/zen-internals/extras/sass/css-normalize-rtl.scss
index 314c179..a13ebb9 100644
--- a/zen-internals/extras/sass/css-normalize-rtl.scss
+++ b/zen-internals/extras/sass/css-normalize-rtl.scss
@@ -1,2 +1,2 @@
-@import "base";
+@import "init";
@import "normalize-rtl";
diff --git a/zen-internals/extras/sass/css-normalize.scss b/zen-internals/extras/sass/css-normalize.scss
index 7253546..cc8f5b4 100644
--- a/zen-internals/extras/sass/css-normalize.scss
+++ b/zen-internals/extras/sass/css-normalize.scss
@@ -1,2 +1,2 @@
-@import "base";
+@import "init";
@import "normalize";
diff --git a/zen-internals/extras/sass/css-print.scss b/zen-internals/extras/sass/css-print.scss
index 42617b5..a624ae2 100644
--- a/zen-internals/extras/sass/css-print.scss
+++ b/zen-internals/extras/sass/css-print.scss
@@ -1,2 +1,2 @@
-@import "base";
+@import "init";
@import "print";
diff --git a/zen-internals/extras/sass/layouts/css-fixed-rtl.scss b/zen-internals/extras/sass/layouts/css-fixed-rtl.scss
new file mode 100644
index 0000000..da4b68e
--- /dev/null
+++ b/zen-internals/extras/sass/layouts/css-fixed-rtl.scss
@@ -0,0 +1,2 @@
+@import "init";
+@import "layouts/fixed-rtl";
diff --git a/zen-internals/extras/sass/layouts/css-fixed.scss b/zen-internals/extras/sass/layouts/css-fixed.scss
new file mode 100644
index 0000000..168b53c
--- /dev/null
+++ b/zen-internals/extras/sass/layouts/css-fixed.scss
@@ -0,0 +1,2 @@
+@import "init";
+@import "layouts/fixed";
diff --git a/zen-internals/extras/sass/layouts/css-responsive-rtl.scss b/zen-internals/extras/sass/layouts/css-responsive-rtl.scss
new file mode 100644
index 0000000..9710a68
--- /dev/null
+++ b/zen-internals/extras/sass/layouts/css-responsive-rtl.scss
@@ -0,0 +1,2 @@
+@import "init";
+@import "layouts/responsive-rtl";
diff --git a/zen-internals/extras/sass/layouts/css-responsive.scss b/zen-internals/extras/sass/layouts/css-responsive.scss
new file mode 100644
index 0000000..fbbef44
--- /dev/null
+++ b/zen-internals/extras/sass/layouts/css-responsive.scss
@@ -0,0 +1,2 @@
+@import "init";
+@import "layouts/responsive";
diff --git a/zen-internals/extras/sass/styles-fixed-rtl.scss b/zen-internals/extras/sass/styles-fixed-rtl.scss
index df921a9..9aebd48 100644
--- a/zen-internals/extras/sass/styles-fixed-rtl.scss
+++ b/zen-internals/extras/sass/styles-fixed-rtl.scss
@@ -3,20 +3,17 @@
* RTL companion for the styles.scss file.
*/
-@import "base"; /* Import Sass mixins, variables, Compass modules, etc. */
+@import "init"; /* Import Sass mixins, variables, Compass modules, etc. */
-/* Base rules */
+/* Base HTML element rules */
@import "normalize-rtl";
/* Layout rules */
-@import "layout-fixed-rtl";
+@import "layouts/fixed-rtl";
-/* Module rules */
-@import "modular-styles-rtl";
-
-/* Global state rules */
-@import "global-states-rtl";
+/* Component (SMACSS module) rules */
+@import "components/misc-rtl";
/* Theme rules */
/* @import "theme-A-rtl"; */
diff --git a/zen-internals/extras/sass/styles-fixed.scss b/zen-internals/extras/sass/styles-fixed.scss
index a072bb2..21aa7b6 100644
--- a/zen-internals/extras/sass/styles-fixed.scss
+++ b/zen-internals/extras/sass/styles-fixed.scss
@@ -6,23 +6,20 @@
* of these @include files will be combined into a single file.
*/
-@import "base"; /* Import Sass mixins, variables, Compass modules, etc. */
+@import "init"; /* Import Sass mixins, variables, Compass modules, etc. */
-/* Base rules */
+/* Base HTML element rules */
@import "normalize";
/* Layout rules */
-@import "layout-fixed";
+@import "layouts/fixed";
-/* Module rules */
-@import "modular-styles";
-// Optionally, add your own modular stylesheets here.
+/* Component (SMACSS module) rules */
+@import "components/misc";
+// Optionally, add your own components here.
@import "print";
-/* Global state rules */
-@import "global-states";
-
/* Theme rules */
/* @import "theme-A"; */
/* @import "theme-B"; */
diff --git a/zen-internals/extras/text-replacements/modular-styles--navigation-links--replace.txt b/zen-internals/extras/text-replacements/components/misc--navigation-links--replace.txt
index 06603ef..06603ef 100644
--- a/zen-internals/extras/text-replacements/modular-styles--navigation-links--replace.txt
+++ b/zen-internals/extras/text-replacements/components/misc--navigation-links--replace.txt
diff --git a/zen-internals/extras/text-replacements/modular-styles--navigation-links--search.txt b/zen-internals/extras/text-replacements/components/misc--navigation-links--search.txt
index 758623a..758623a 100644
--- a/zen-internals/extras/text-replacements/modular-styles--navigation-links--search.txt
+++ b/zen-internals/extras/text-replacements/components/misc--navigation-links--search.txt
diff --git a/zen-internals/extras/text-replacements/modular-styles--openid-1--replace.txt b/zen-internals/extras/text-replacements/components/misc--openid-1--replace.txt
index 08525a5..08525a5 100644
--- a/zen-internals/extras/text-replacements/modular-styles--openid-1--replace.txt
+++ b/zen-internals/extras/text-replacements/components/misc--openid-1--replace.txt
diff --git a/zen-internals/extras/text-replacements/modular-styles--openid-1--search.txt b/zen-internals/extras/text-replacements/components/misc--openid-1--search.txt
index e6a740a..e6a740a 100644
--- a/zen-internals/extras/text-replacements/modular-styles--openid-1--search.txt
+++ b/zen-internals/extras/text-replacements/components/misc--openid-1--search.txt
diff --git a/zen-internals/extras/text-replacements/modular-styles--openid-2--replace.txt b/zen-internals/extras/text-replacements/components/misc--openid-2--replace.txt
index db65abb..db65abb 100644
--- a/zen-internals/extras/text-replacements/modular-styles--openid-2--replace.txt
+++ b/zen-internals/extras/text-replacements/components/misc--openid-2--replace.txt
diff --git a/zen-internals/extras/text-replacements/modular-styles--openid-2--search.txt b/zen-internals/extras/text-replacements/components/misc--openid-2--search.txt
index 7b153a7..7b153a7 100644
--- a/zen-internals/extras/text-replacements/modular-styles--openid-2--search.txt
+++ b/zen-internals/extras/text-replacements/components/misc--openid-2--search.txt
diff --git a/zen-internals/extras/text-replacements/modular-styles--titles--replace.txt b/zen-internals/extras/text-replacements/components/misc--titles--replace.txt
index 2380a71..2380a71 100644
--- a/zen-internals/extras/text-replacements/modular-styles--titles--replace.txt
+++ b/zen-internals/extras/text-replacements/components/misc--titles--replace.txt
diff --git a/zen-internals/extras/text-replacements/modular-styles--titles--search.txt b/zen-internals/extras/text-replacements/components/misc--titles--search.txt
index 826f7ce..826f7ce 100644
--- a/zen-internals/extras/text-replacements/modular-styles--titles--search.txt
+++ b/zen-internals/extras/text-replacements/components/misc--titles--search.txt
diff --git a/zen-internals/extras/text-replacements/modular-styles-rtl--navigation-links--replace.txt b/zen-internals/extras/text-replacements/components/misc-rtl--navigation-links--replace.txt
index 06603ef..06603ef 100644
--- a/zen-internals/extras/text-replacements/modular-styles-rtl--navigation-links--replace.txt
+++ b/zen-internals/extras/text-replacements/components/misc-rtl--navigation-links--replace.txt
diff --git a/zen-internals/extras/text-replacements/modular-styles-rtl--navigation-links--search.txt b/zen-internals/extras/text-replacements/components/misc-rtl--navigation-links--search.txt
index 758623a..758623a 100644
--- a/zen-internals/extras/text-replacements/modular-styles-rtl--navigation-links--search.txt
+++ b/zen-internals/extras/text-replacements/components/misc-rtl--navigation-links--search.txt
diff --git a/zen-internals/generate.sh b/zen-internals/generate.sh
index 2e96503..8bae694 100755
--- a/zen-internals/generate.sh
+++ b/zen-internals/generate.sh
@@ -12,9 +12,9 @@ STARTERKIT=../STARTERKIT;
cd $STARTERKIT;
compass clean;
-# Create our custom base partial, while keeping the original.
-mv sass/_base.scss $ORIG/;
-cat $ORIG/_base.scss $ORIG/extras/sass/_base_extras.scss > sass/_base.scss;
+# Create our custom init partial, while keeping the original.
+mv sass/_init.scss $ORIG/;
+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/;
@@ -29,16 +29,18 @@ cp images/* $ORIG/images/;
# Build the CSS versions of the stylesheets.
cp $ORIG/extras/sass/css-* sass/;
-rm css/*.css;
+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;
-rm sass/css-*;
+rm sass/css-* sass/*/css-*;
# Don't use the generated styles.css.
git checkout css/styles.css css/styles-rtl.css;
# Massage the generated css-* files and rename them.
-for FILENAME in css/css-*.css; do
+for FILENAME in css/css-*.css css/*/css-*.css; do
NEWFILE=`echo $FILENAME | sed -e 's/css\-//'`;
cat $FILENAME |
@@ -93,9 +95,12 @@ for FILENAME in css/css-*.css; do
rm $FILENAME;
done
-for FIND_FILE in $ORIG/extras/text-replacements/*--search.txt; do
+for FIND_FILE in $ORIG/extras/text-replacements/*--search.txt $ORIG/extras/text-replacements/*/*--search.txt; do
REPLACE_FILE=`echo "$FIND_FILE" | sed -e 's/\-\-search\.txt/--replace.txt/'`;
- CSS_FILE=css/`basename $FIND_FILE | sed -e 's/\-\-.*\-\-search\.txt/.css/'`;
+ CSS_PATH=`dirname $FIND_FILE`;
+ CSS_PATH=css/`basename $CSS_PATH`;
+ if [[ $CSS_PATH == 'css/text-replacements' ]]; then CSS_PATH=css; fi
+ CSS_FILE=$CSS_PATH/`basename $FIND_FILE | sed -e 's/\-\-.*\-\-search\.txt/.css/'`;
# Convert search string to a sed-compatible regular expression.
FIND=`cat $FIND_FILE | perl -e 'while (<>) { $_ =~ s/\s+$//; $line = quotemeta($_) . "\\\n"; $line =~ s/\\\([\(\)\{\}])/\1/g; print $line}'`;
@@ -115,8 +120,8 @@ for FIND_FILE in $ORIG/extras/text-replacements/*--search.txt; do
# Delete all the generated CSS, except for the one that generated the error.
rm css/*.css $ORIG/css/*.css;
mv $CSS_FILE.new $CSS_FILE;
- # Restore the base partial.
- mv $ORIG/_base.scss sass/;
+ # Restore the init partial.
+ mv $ORIG/_init.scss sass/;
exit;
fi
@@ -124,5 +129,5 @@ for FIND_FILE in $ORIG/extras/text-replacements/*--search.txt; do
done
# Restore the environment.
-mv $ORIG/_base.scss sass/;
+mv $ORIG/_init.scss sass/;
cd $ORIG;
diff --git a/zen-internals/zen.drush.inc b/zen-internals/zen.drush.inc
index 3e8df30..5383d2d 100644
--- a/zen-internals/zen.drush.inc
+++ b/zen-internals/zen.drush.inc
@@ -90,7 +90,7 @@ function drush_zen($name = NULL, $machine_name = NULL) {
// Remove all RTL stylesheets.
if ($without_rtl = drush_get_option('without-rtl')) {
- foreach (array('_global-states', '_layout-fixed', '_layout-responsive', '_modular-styles', '_normalize', 'styles') as $file) {
+ foreach (array('layouts/_fixed', 'layouts/_responsive', 'components/_misc', '_normalize', 'styles') as $file) {
// Remove the RTL stylesheet.
$css_file = ($file[0] == '_') ? substr($file, 1) : $file;
drush_op('unlink', drush_normalize_path($subtheme_path . '/css/' . $css_file . '-rtl.css'));