Sass restructure: need to disable .themename{} -wrapping until we get overlay-container.

diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss
index dae1d0eef3ecebad419bfc95829a196599a50e66..87f9119168647354073b3ce7b3997f44c95b1612 100644 (file)
--- a/WebContent/VAADIN/themes/base/base.scss
+++ b/WebContent/VAADIN/themes/base/base.scss
@@ -33,3 +33,53 @@
 @import "upload/upload.scss";
 @import "widget/widget.scss";
 @import "window/window.scss";
+
+
+@mixin base {
+       // @include base-app;
+       
+       // everything included from base theme
+       // other themes should enclose corresponding definitions in theme selectors
+       
+       @include base-widget;
+       
+       @include base-absolutelayout;
+       @include base-accordion;
+       @include base-button;
+       @include base-caption;
+       
+       // here for now to preserve old semantics
+       @include base-common;
+       
+       @include base-layout;
+       @include base-csslayout;
+       @include base-customcomponent;
+       @include base-customlayout;
+       @include base-datefield;
+       @include base-dragwrapper;
+       @include base-embedded;
+       @include base-formlayout;
+       @include base-gridlayout;
+       @include base-label;
+       @include base-link;
+       @include base-loginform;
+       @include base-menubar;
+       @include base-notification;
+       @include base-orderedlayout;
+       @include base-panel;
+       @include base-popupview;
+       @include base-progressindicator;
+       @include base-select;
+       @include base-shadow;
+       @include base-slider;
+       @include base-splitpanel;
+       @include base-table;
+       @include base-tabsheet;
+       @include base-textfield;
+       @include base-richtextarea;
+       @include base-tree;
+       @include base-treetable;
+       @include base-upload;
+       @include base-window;
+}
+

diff --git a/WebContent/VAADIN/themes/base/styles.scss b/WebContent/VAADIN/themes/base/styles.scss
index 7ca27280bc55d8886efd9d59198d0660a5bb5687..40990f2c31bb58c7fd077504837096355e92581d 100644 (file)
--- a/WebContent/VAADIN/themes/base/styles.scss
+++ b/WebContent/VAADIN/themes/base/styles.scss
@@ -1,47 +1,2 @@
 @import "base.scss";
-
-// @include base-app;
-
-// everything included from base theme
-// other themes should enclose corresponding definitions in theme selectors
-
-@include base-widget;
-
-@include base-absolutelayout;
-@include base-accordion;
-@include base-button;
-@include base-caption;
-
-// here for now to preserve old semantics
-@include base-common;
-
-@include base-layout;
-@include base-csslayout;
-@include base-customcomponent;
-@include base-customlayout;
-@include base-datefield;
-@include base-dragwrapper;
-@include base-embedded;
-@include base-formlayout;
-@include base-gridlayout;
-@include base-label;
-@include base-link;
-@include base-loginform;
-@include base-menubar;
-@include base-notification;
-@include base-orderedlayout;
-@include base-panel;
-@include base-popupview;
-@include base-progressindicator;
-@include base-select;
-@include base-shadow;
-@include base-slider;
-@include base-splitpanel;
-@include base-table;
-@include base-tabsheet;
-@include base-textfield;
-@include base-richtextarea;
-@include base-tree;
-@include base-treetable;
-@include base-upload;
-@include base-window;
+@include base;

diff --git a/WebContent/VAADIN/themes/chameleon/chameleon.scss b/WebContent/VAADIN/themes/chameleon/chameleon.scss
index 73109ad0bf8ebfdfa921320c9e787c80a285f4be..8a24a73cbfca782e05f7d2170099bbb13d030048 100644 (file)
--- a/WebContent/VAADIN/themes/chameleon/chameleon.scss
+++ b/WebContent/VAADIN/themes/chameleon/chameleon.scss
@@ -1,9 +1,11 @@
-@import "../base/styles.scss";
+@import "../base/base.scss";
 @import "common/common.scss";
 @import "components/components.scss";
 @import "compound/compound.scss";
 
 @mixin chameleon {
+       // TODO move this?
+       @include base;
        // TODO each
        @include chameleon-app;
        @include chameleon-common;

diff --git a/WebContent/VAADIN/themes/chameleon/styles.scss b/WebContent/VAADIN/themes/chameleon/styles.scss
index 0c55a57239e19319dde7adb104ba12828780165f..de7e306e203effafc36dc330c8328fe8e98da57d 100644 (file)
--- a/WebContent/VAADIN/themes/chameleon/styles.scss
+++ b/WebContent/VAADIN/themes/chameleon/styles.scss
@@ -1,4 +1,3 @@
 @import "chameleon.scss";
-.chameleon {
-       @include chameleon;
-}
\ No newline at end of file
+
+@include chameleon;

diff --git a/WebContent/VAADIN/themes/liferay/liferay.scss b/WebContent/VAADIN/themes/liferay/liferay.scss
index d024dc2553d15f30dc1f7efda246266a96c1cd5c..7ec561ffc93bc6fc6015bb01a851895d26cc1ddb 100644 (file)
--- a/WebContent/VAADIN/themes/liferay/liferay.scss
+++ b/WebContent/VAADIN/themes/liferay/liferay.scss
@@ -1,4 +1,4 @@
-@import "../base/styles.scss";
+@import "../base/base.scss";
 
 @import "accordion/accordion.scss";
 @import "button/button.scss";
@@ -23,6 +23,9 @@
 @import "window/window.scss";
        
 @mixin liferay {
+       // TODO move?
+       @include base;
+       // TODO @each
        @include liferay-accordion;
        @include liferay-button;
        

diff --git a/WebContent/VAADIN/themes/liferay/styles.scss b/WebContent/VAADIN/themes/liferay/styles.scss
index d51807124912554f7f2c6c4fa98fcba60982bc6d..030602a8b63b839c6e11846a2c84642d1e2f5f81 100644 (file)
--- a/WebContent/VAADIN/themes/liferay/styles.scss
+++ b/WebContent/VAADIN/themes/liferay/styles.scss
@@ -1,6 +1,3 @@
 @import "liferay.scss";
 
-.liferay {
-       @include liferay;
-}
-
+@include liferay;

diff --git a/WebContent/VAADIN/themes/reindeer/reindeer.scss b/WebContent/VAADIN/themes/reindeer/reindeer.scss
index 67a997d9ebd06663e941387d5b8cf428cad22c47..61c99a86b36f7780422a6652f7ca4aaed42a4059 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/reindeer.scss
+++ b/WebContent/VAADIN/themes/reindeer/reindeer.scss
@@ -1,5 +1,4 @@
-// move this(?)
-@import "base.scss";
+@import "../base/base.scss";
 
 // common between others for now for backwards compatibility
 @import "accordion/accordion.scss";
@@ -28,6 +27,9 @@
 @import "window/window.scss";
 
 @mixin reindeer {
+       // should this be here?
+       @include base;
+       
        // TODO @each
 
        @include reindeer-accordion;

diff --git a/WebContent/VAADIN/themes/reindeer/styles.scss b/WebContent/VAADIN/themes/reindeer/styles.scss
index d0cab9f923a968503ddbe4e0c445d8135f8ac904..7ae66252deb5fff9080cc879b4ca1fe78ccddfad 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/styles.scss
+++ b/WebContent/VAADIN/themes/reindeer/styles.scss
@@ -1,5 +1,3 @@
 @import "reindeer.scss";
 
-.reindeer {
-       @include reindeer;      
-}
+@include reindeer;     

diff --git a/WebContent/VAADIN/themes/runo/runo.scss b/WebContent/VAADIN/themes/runo/runo.scss
index 12c0349236f25ac1b7ec4015464b4543d2fd85d8..6db7c335cb4f14d0daec0ff03d8bdfc081f58790 100644 (file)
--- a/WebContent/VAADIN/themes/runo/runo.scss
+++ b/WebContent/VAADIN/themes/runo/runo.scss
@@ -1,4 +1,4 @@
-@import "../base/styles.scss";
+@import "../base/base.scss";
 
 @import "absolutelayout/absolutelayout.scss";
 @import "accordion/accordion.scss";
@@ -27,6 +27,8 @@
 @import "window/window.scss";
 
 @mixin runo {
+       // TODO move?
+       @include base;
        // TODO each
        @include runo-absolutelayout;
        @include runo-accordion;

diff --git a/WebContent/VAADIN/themes/runo/styles.scss b/WebContent/VAADIN/themes/runo/styles.scss
index 187fd3e2ec3dffd46439b9ab4a96d37cb745e0d2..987b1425b64961b16daeb36ede0d9330e144dcff 100644 (file)
--- a/WebContent/VAADIN/themes/runo/styles.scss
+++ b/WebContent/VAADIN/themes/runo/styles.scss
@@ -1,4 +1,2 @@
 @import "runo.scss";
-.runo {
-       @include runo;  
-}
+@include runo;
\ No newline at end of file