diff --git a/STARTERKIT/css/styles-rtl.css b/STARTERKIT/css/styles-rtl.css index 739a9e4998063b587489791c7cab3cb3159610a9..96ea4a9dd0695f0ebf7af34d2cd33a73a840e3be 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 9a936b1b16af2dec2e46866430c94fed62f4b02d..8663e2a289a692cc3d11502b649eef61bb486214 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 83d2626b2a2693d718f9b67e4a475af108804ef5..0000000000000000000000000000000000000000 --- 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 b3f902eb7761fed3afef8adfa34a300e0d2ff5b9..0000000000000000000000000000000000000000 --- 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 similarity index 97% rename from STARTERKIT/sass/_base.scss rename to STARTERKIT/sass/_init.scss index c6b3b3f26a02bbfceaefa5b8196e29ed0dbcf7fe..63db5624aee83a381aa0560aba614057c197a1f4 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 similarity index 87% rename from STARTERKIT/sass/_modular-styles-rtl.scss rename to STARTERKIT/sass/components/_misc-rtl.scss index afc981d9570f1ed824a6ed282674d391684e7642..9f131e5ee89878dfa95e71eec50f6a63ff679490 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 similarity index 91% rename from STARTERKIT/sass/_modular-styles.scss rename to STARTERKIT/sass/components/_misc.scss index ec0875ac7146f47a15fd437aa937f8dc4e3f243b..3289cba8827254eb8d2864930fd23575971c5e65 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 similarity index 91% rename from STARTERKIT/sass/_layout-fixed-rtl.scss rename to STARTERKIT/sass/layouts/_fixed-rtl.scss index ae114f09a3209ef9ca7bbb0b7940ca75bdbd1b5d..053d83b8392811ceaaa18b270028080a21b838d5 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 similarity index 100% rename from STARTERKIT/sass/_layout-fixed.scss rename to STARTERKIT/sass/layouts/_fixed.scss diff --git a/STARTERKIT/sass/_layout-responsive-rtl.scss b/STARTERKIT/sass/layouts/_responsive-rtl.scss similarity index 89% rename from STARTERKIT/sass/_layout-responsive-rtl.scss rename to STARTERKIT/sass/layouts/_responsive-rtl.scss index 3fbe5bde95ebdff23e79ff922d699109d7d5b12c..83338af0d50db199d2e5d1857f6f12571e8b8b2a 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 similarity index 100% rename from STARTERKIT/sass/_layout-responsive.scss rename to STARTERKIT/sass/layouts/_responsive.scss diff --git a/STARTERKIT/sass/styles-rtl.scss b/STARTERKIT/sass/styles-rtl.scss index 1791b4011c8bcf083d37ab9c70be5ee1a83c6b7e..1abcff0936b5a4e1077a4ed2a617fe08d1ddd296 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 8a9d3afa0e8e8da3f5dcbd1b6e2509b68e2cb518..e32316445c961886dd0d544830f131aef75353ce 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 similarity index 100% rename from zen-internals/extras/sass/_base_extras.scss rename to 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 0000000000000000000000000000000000000000..39267cd655ac79fc4fffb286700b5a8ece967284 --- /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 0000000000000000000000000000000000000000..6f1f4666269d0ea6ba6ee56aa21c426bd2990e85 --- /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 7fff83c97846d69fc7355bcf24b708c68d2e84dc..0000000000000000000000000000000000000000 --- 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 656c4a59f2e8fa2c9040cfc3aa43879d4692ea9e..0000000000000000000000000000000000000000 --- 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 a57c60689dca41e03fc5fdedf3ddf9a9511ae836..0000000000000000000000000000000000000000 --- 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 b0bb94c7e593e19cb42ac908fd97e8633ffa6aa8..0000000000000000000000000000000000000000 --- 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 748f30a49c07a7b3b2969e42e2f245c96233283a..0000000000000000000000000000000000000000 --- 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 e19474ae5423b61b9fd04a60e659d3733f5df742..0000000000000000000000000000000000000000 --- 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 001c420f5e2b8d231166d1498b7f7d37c36f394e..0000000000000000000000000000000000000000 --- 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 720713a315fe05c9addaccf272e9d1389a389017..0000000000000000000000000000000000000000 --- 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 314c1796e7db979d0ebfb31d8e7b7923cf9d0d0d..a13ebb9349e5be60e3b29500cdd9e31ef7105d69 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 72535466a90762692d7542ec010fd92a9deee5c0..cc8f5b4e2576f4e7d0ba15f32f1f7d893d5f008a 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 42617b56ac696b32c6a37fc3e24971dfd6c616e0..a624ae23bffb82769ec5bce1e141efdb6d9a8728 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 0000000000000000000000000000000000000000..da4b68ebce624a9d17440b1062177dbc56b3148f --- /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 0000000000000000000000000000000000000000..168b53c6d36020f8a79f7a7d78d90a16e089b740 --- /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 0000000000000000000000000000000000000000..9710a6847c7bfadb7f321cc96e302daa80060ccb --- /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 0000000000000000000000000000000000000000..fbbef447c1eac56082e85f76670569b8dd322d6e --- /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 df921a9e38c71da4f28a03a4e214dfa3d56b9d77..9aebd48b709e35d66ebf52c32ec77890b77d6749 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 a072bb20028916b785a6e75be73aaa120a43bc4e..21aa7b605ed1a590384489479efa3d08a4f39f53 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 similarity index 100% rename from zen-internals/extras/text-replacements/modular-styles--navigation-links--replace.txt rename to 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 similarity index 100% rename from zen-internals/extras/text-replacements/modular-styles--navigation-links--search.txt rename to 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 similarity index 100% rename from zen-internals/extras/text-replacements/modular-styles--openid-1--replace.txt rename to 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 similarity index 100% rename from zen-internals/extras/text-replacements/modular-styles--openid-1--search.txt rename to 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 similarity index 100% rename from zen-internals/extras/text-replacements/modular-styles--openid-2--replace.txt rename to 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 similarity index 100% rename from zen-internals/extras/text-replacements/modular-styles--openid-2--search.txt rename to 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 similarity index 100% rename from zen-internals/extras/text-replacements/modular-styles--titles--replace.txt rename to 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 similarity index 100% rename from zen-internals/extras/text-replacements/modular-styles--titles--search.txt rename to 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 similarity index 100% rename from zen-internals/extras/text-replacements/modular-styles-rtl--navigation-links--replace.txt rename to 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 similarity index 100% rename from zen-internals/extras/text-replacements/modular-styles-rtl--navigation-links--search.txt rename to 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 2e9650308186a91ada5eb2b8d5a1649e600851af..8bae6945a6b995f46f1a03c3c904897a7f8e86a5 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 3e8df307cecf969e842d420459e1404f7a1cf072..5383d2dabafee75a6bd52c1f1cf46ab84aaffa32 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'));