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