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/reindeer | |
| 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/reindeer')
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/reindeer.scss | 6 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/styles.scss | 4 |
2 files changed, 5 insertions, 5 deletions
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; |