diff options
| author | Marc Englund <marc@vaadin.com> | 2012-09-26 16:23:39 +0300 |
|---|---|---|
| committer | Marc Englund <marc@vaadin.com> | 2012-09-26 16:23:49 +0300 |
| commit | af67b3056eabb6428aa2a5e736d5a19e6cca9564 (patch) | |
| tree | f2d428dfcd64568e3f16174e3aced764f8de8163 /WebContent/VAADIN/themes/chameleon | |
| parent | 8d3294bd5c337e20a6fe3aa7112259e099609432 (diff) | |
| download | vaadin-framework-af67b3056eabb6428aa2a5e736d5a19e6cca9564.tar.gz vaadin-framework-af67b3056eabb6428aa2a5e736d5a19e6cca9564.zip | |
Rearranging sass theme structure in phases.
Diffstat (limited to 'WebContent/VAADIN/themes/chameleon')
| -rw-r--r-- | WebContent/VAADIN/themes/chameleon/chameleon.scss | 16 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/chameleon/styles.scss | 12 |
2 files changed, 12 insertions, 16 deletions
diff --git a/WebContent/VAADIN/themes/chameleon/chameleon.scss b/WebContent/VAADIN/themes/chameleon/chameleon.scss index 16f95bbbb4..73109ad0bf 100644 --- 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 ee905c17e9..0c55a57239 100644 --- 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 |