diff options
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/VAADIN/themes/base/base.scss | 50 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/styles.scss | 47 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/chameleon/chameleon.scss | 4 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/chameleon/styles.scss | 5 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/liferay/liferay.scss | 5 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/liferay/styles.scss | 5 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/reindeer.scss | 6 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/styles.scss | 4 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/runo/runo.scss | 4 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/runo/styles.scss | 4 |
10 files changed, 70 insertions, 64 deletions
diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss index dae1d0eef3..87f9119168 100644 --- 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 7ca27280bc..40990f2c31 100644 --- 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 73109ad0bf..8a24a73cbf 100644 --- 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 0c55a57239..de7e306e20 100644 --- 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 d024dc2553..7ec561ffc9 100644 --- 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 d518071249..030602a8b6 100644 --- 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 67a997d9eb..61c99a86b3 100644 --- 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 d0cab9f923..7ae66252de 100644 --- 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 12c0349236..6db7c335cb 100644 --- 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 187fd3e2ec..987b1425b6 100644 --- 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 |