diff options
| author | Marc Englund <marc@vaadin.com> | 2012-09-28 10:02:50 +0300 |
|---|---|---|
| committer | Marc Englund <marc@vaadin.com> | 2012-09-28 10:02:50 +0300 |
| commit | 8ca203ca29543429425823c0f547ddf4140f6991 (patch) | |
| tree | f91abe69b61df26944b338acf8f0a95a4024d731 /WebContent/VAADIN/themes/chameleon | |
| parent | 0cf6705e9a53c3c2b476a99cf7e6d048881b298c (diff) | |
| download | vaadin-framework-8ca203ca29543429425823c0f547ddf4140f6991.tar.gz vaadin-framework-8ca203ca29543429425823c0f547ddf4140f6991.zip | |
Sass restructure: need to disable .themename{} -wrapping until we get overlay-container.
Diffstat (limited to 'WebContent/VAADIN/themes/chameleon')
| -rw-r--r-- | WebContent/VAADIN/themes/chameleon/chameleon.scss | 4 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/chameleon/styles.scss | 5 |
2 files changed, 5 insertions, 4 deletions
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; |