Rearranging sass theme structure in phases.

diff --git a/WebContent/VAADIN/themes/chameleon/chameleon.scss b/WebContent/VAADIN/themes/chameleon/chameleon.scss
index 16f95bbbb47eee786da8e77eb3430c83f07880f0..73109ad0bf8ebfdfa921320c9e787c80a285f4be 100644 (file)
--- a/WebContent/VAADIN/themes/chameleon/chameleon.scss
+++ b/WebContent/VAADIN/themes/chameleon/chameleon.scss
@@ -1,10 +1,12 @@
-// this file just defines all chameleon mixins by importing them
-
-// common (mostly application or page level) parts of the theme
-
+@import "../base/styles.scss";
 @import "common/common.scss";
-
-// components - can override or replace in user themes
-
 @import "components/components.scss";
 @import "compound/compound.scss";
+
+@mixin chameleon {
+       // TODO each
+       @include chameleon-app;
+       @include chameleon-common;
+       @include chameleon-components;
+       @include chameleon-compound;
+}

diff --git a/WebContent/VAADIN/themes/chameleon/styles.scss b/WebContent/VAADIN/themes/chameleon/styles.scss
index ee905c17e98241bf3254dd7600982a0f2855d4db..0c55a57239e19319dde7adb104ba12828780165f 100644 (file)
--- a/WebContent/VAADIN/themes/chameleon/styles.scss
+++ b/WebContent/VAADIN/themes/chameleon/styles.scss
@@ -1,10 +1,4 @@
-@import "../base/styles.scss";
 @import "chameleon.scss";
-
-@include chameleon-app;
-
-// .v-theme-chameleon {
-@include chameleon-common;
-@include chameleon-components;
-@include chameleon-compound;
-// }
+.chameleon {
+       @include chameleon;
+}
\ No newline at end of file

diff --git a/WebContent/VAADIN/themes/liferay/liferay.scss b/WebContent/VAADIN/themes/liferay/liferay.scss
index 68e9efbfe23cdbad3e7729d7760f060e09c66791..d024dc2553d15f30dc1f7efda246266a96c1cd5c 100644 (file)
--- a/WebContent/VAADIN/themes/liferay/liferay.scss
+++ b/WebContent/VAADIN/themes/liferay/liferay.scss
@@ -1,6 +1,4 @@
-// this file just defines all reindeer mixins by importing them
-
-// common between others for now for backwards compatibility
+@import "../base/styles.scss";
 
 @import "accordion/accordion.scss";
 @import "button/button.scss";
@@ -23,3 +21,26 @@
 @import "textfield/textfield.scss";
 @import "tree/tree.scss";
 @import "window/window.scss";
+       
+@mixin liferay {
+       @include liferay-accordion;
+       @include liferay-button;
+       
+       @include liferay-common;
+       @include liferay-contextmenu;
+       @include liferay-datefield;
+       @include liferay-formlayout;
+       @include liferay-menubar;
+       @include liferay-notification;
+       @include liferay-panel;
+       @include liferay-popupview;
+       @include liferay-progressindicator;
+       @include liferay-select;
+       @include liferay-slider;
+       @include liferay-splitpanel;
+       @include liferay-table;
+       @include liferay-tabsheet;
+       @include liferay-textfield;
+       @include liferay-tree;
+       @include liferay-window;
+}

diff --git a/WebContent/VAADIN/themes/liferay/styles.scss b/WebContent/VAADIN/themes/liferay/styles.scss
index 78fbd62c25c889fe78860250bb5ccaa253f33320..d51807124912554f7f2c6c4fa98fcba60982bc6d 100644 (file)
--- a/WebContent/VAADIN/themes/liferay/styles.scss
+++ b/WebContent/VAADIN/themes/liferay/styles.scss
@@ -1,28 +1,6 @@
-// this file actually attaches all liferay mixins to a parent style
-
-@import "../base/styles.scss";
 @import "liferay.scss";
 
-// .v-theme-liferay {
-       @include liferay-accordion;
-       @include liferay-button;
-       
-       @include liferay-common;
-       
-       @include liferay-contextmenu;
-       @include liferay-datefield;
-       @include liferay-formlayout;
-       @include liferay-menubar;
-       @include liferay-notification;
-       @include liferay-panel;
-       @include liferay-popupview;
-       @include liferay-progressindicator;
-       @include liferay-select;
-       @include liferay-slider;
-       @include liferay-splitpanel;
-       @include liferay-table;
-       @include liferay-tabsheet;
-       @include liferay-textfield;
-       @include liferay-tree;
-       @include liferay-window;
-// }
+.liferay {
+       @include liferay;
+}
+

diff --git a/WebContent/VAADIN/themes/reindeer/reindeer.scss b/WebContent/VAADIN/themes/reindeer/reindeer.scss
index 0cd01f7885347867e21643f3c5767f115e20872d..67a997d9ebd06663e941387d5b8cf428cad22c47 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/reindeer.scss
+++ b/WebContent/VAADIN/themes/reindeer/reindeer.scss
@@ -1,7 +1,7 @@
-// this file just defines all reindeer mixins by importing them
+// move this(?)
+@import "base.scss";
 
 // common between others for now for backwards compatibility
-
 @import "accordion/accordion.scss";
 @import "a-sprite-definitions/a-sprite-definitions.scss";
 @import "button/button.scss";
@@ -26,3 +26,32 @@
 @import "textfield/textfield.scss";
 @import "tree/tree.scss";
 @import "window/window.scss";
+
+@mixin reindeer {
+       // TODO @each
+
+       @include reindeer-accordion;
+       // TODO @include a-sprite-definitions;
+       @include reindeer-button;
+       @include reindeer-common;
+       @include reindeer-datefield;
+       @include reindeer-formlayout;
+       @include reindeer-label;
+       @include reindeer-layouts;
+       @include reindeer-link;
+       @include reindeer-menubar;
+       @include reindeer-notification;
+       @include reindeer-panel;
+       @include reindeer-popupview;
+       @include reindeer-progressindicator;
+       @include reindeer-select;
+       @include reindeer-slider;
+       @include reindeer-splitpanel;
+       @include reindeer-table;
+       @include reindeer-tabsheet;
+       @include reindeer-textfield;
+       @include reindeer-tree;
+       @include reindeer-window;
+}
+
+

diff --git a/WebContent/VAADIN/themes/reindeer/styles.scss b/WebContent/VAADIN/themes/reindeer/styles.scss
index 51daace9d380729561abe2889846b9022de3b200..d0cab9f923a968503ddbe4e0c445d8135f8ac904 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/styles.scss
+++ b/WebContent/VAADIN/themes/reindeer/styles.scss
@@ -1,32 +1,5 @@
-// this file actually attaches all reindeer mixins to a parent style
-
-@import "../base/styles.scss";
 @import "reindeer.scss";
 
-// .v-theme-reindeer {
-       @include reindeer-accordion;
-       // TODO this is problematic: comments get stripped out
-       // @include a-sprite-definitions;
-       @include reindeer-button;
-       
-       @include reindeer-common;
-       
-       @include reindeer-datefield;
-       @include reindeer-formlayout;
-       @include reindeer-label;
-       @include reindeer-layouts;
-       @include reindeer-link;
-       @include reindeer-menubar;
-       @include reindeer-notification;
-       @include reindeer-panel;
-       @include reindeer-popupview;
-       @include reindeer-progressindicator;
-       @include reindeer-select;
-       @include reindeer-slider;
-       @include reindeer-splitpanel;
-       @include reindeer-table;
-       @include reindeer-tabsheet;
-       @include reindeer-textfield;
-       @include reindeer-tree;
-       @include reindeer-window;
-// }
+.reindeer {
+       @include reindeer;      
+}

diff --git a/WebContent/VAADIN/themes/runo/runo.scss b/WebContent/VAADIN/themes/runo/runo.scss
index 9ef3ed118a874504af09e92c79dac8b819eefdf5..12c0349236f25ac1b7ec4015464b4543d2fd85d8 100644 (file)
--- a/WebContent/VAADIN/themes/runo/runo.scss
+++ b/WebContent/VAADIN/themes/runo/runo.scss
@@ -1,4 +1,4 @@
-// this file just defines all runo mixins by importing them
+@import "../base/styles.scss";
 
 @import "absolutelayout/absolutelayout.scss";
 @import "accordion/accordion.scss";
@@ -25,3 +25,34 @@
 @import "textfield/textfield.scss";
 @import "tree/tree.scss";
 @import "window/window.scss";
+
+@mixin runo {
+       // TODO each
+       @include runo-absolutelayout;
+       @include runo-accordion;
+       @include runo-button;
+       @include runo-caption;
+       
+       @include runo-common;
+       
+       @include runo-datefield;
+       @include runo-formlayout;
+       @include runo-gridlayout;
+       @include runo-label;
+       @include runo-link;
+       @include runo-menubar;
+       @include runo-notification;
+       @include runo-orderedlayout;
+       @include runo-panel;
+       @include runo-popupview;
+       @include runo-progressindicator;
+       @include runo-select;
+       @include runo-shadow;
+       @include runo-slider;
+       @include runo-splitpanel;
+       @include runo-table;
+       @include runo-tabsheet;
+       @include runo-textfield;
+       @include runo-tree;
+       @include runo-window;
+}
\ No newline at end of file

diff --git a/WebContent/VAADIN/themes/runo/styles.scss b/WebContent/VAADIN/themes/runo/styles.scss
index 1bbe531b236ca199e407348758f7eed872ae4538..187fd3e2ec3dffd46439b9ab4a96d37cb745e0d2 100644 (file)
--- a/WebContent/VAADIN/themes/runo/styles.scss
+++ b/WebContent/VAADIN/themes/runo/styles.scss
@@ -1,32 +1,4 @@
-@import "../base/styles.scss";
 @import "runo.scss";
-
-// .v-theme-runo {
-@include runo-absolutelayout;
-@include runo-accordion;
-@include runo-button;
-@include runo-caption;
-
-@include runo-common;
-
-@include runo-datefield;
-@include runo-formlayout;
-@include runo-gridlayout;
-@include runo-label;
-@include runo-link;
-@include runo-menubar;
-@include runo-notification;
-@include runo-orderedlayout;
-@include runo-panel;
-@include runo-popupview;
-@include runo-progressindicator;
-@include runo-select;
-@include runo-shadow;
-@include runo-slider;
-@include runo-splitpanel;
-@include runo-table;
-@include runo-tabsheet;
-@include runo-textfield;
-@include runo-tree;
-@include runo-window;
-// }
+.runo {
+       @include runo;  
+}