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/liferay | |
| 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/liferay')
| -rw-r--r-- | WebContent/VAADIN/themes/liferay/liferay.scss | 27 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/liferay/styles.scss | 30 |
2 files changed, 28 insertions, 29 deletions
diff --git a/WebContent/VAADIN/themes/liferay/liferay.scss b/WebContent/VAADIN/themes/liferay/liferay.scss index 68e9efbfe2..d024dc2553 100644 --- a/WebContent/VAADIN/themes/liferay/liferay.scss +++ b/WebContent/VAADIN/themes/liferay/liferay.scss @@ -1,6 +1,4 @@ -// this file just defines all reindeer mixins by importing them - -// common between others for now for backwards compatibility +@import "../base/styles.scss"; @import "accordion/accordion.scss"; @import "button/button.scss"; @@ -23,3 +21,26 @@ @import "textfield/textfield.scss"; @import "tree/tree.scss"; @import "window/window.scss"; + +@mixin liferay { + @include liferay-accordion; + @include liferay-button; + + @include liferay-common; + @include liferay-contextmenu; + @include liferay-datefield; + @include liferay-formlayout; + @include liferay-menubar; + @include liferay-notification; + @include liferay-panel; + @include liferay-popupview; + @include liferay-progressindicator; + @include liferay-select; + @include liferay-slider; + @include liferay-splitpanel; + @include liferay-table; + @include liferay-tabsheet; + @include liferay-textfield; + @include liferay-tree; + @include liferay-window; +} diff --git a/WebContent/VAADIN/themes/liferay/styles.scss b/WebContent/VAADIN/themes/liferay/styles.scss index 78fbd62c25..d518071249 100644 --- a/WebContent/VAADIN/themes/liferay/styles.scss +++ b/WebContent/VAADIN/themes/liferay/styles.scss @@ -1,28 +1,6 @@ -// this file actually attaches all liferay mixins to a parent style - -@import "../base/styles.scss"; @import "liferay.scss"; -// .v-theme-liferay { - @include liferay-accordion; - @include liferay-button; - - @include liferay-common; - - @include liferay-contextmenu; - @include liferay-datefield; - @include liferay-formlayout; - @include liferay-menubar; - @include liferay-notification; - @include liferay-panel; - @include liferay-popupview; - @include liferay-progressindicator; - @include liferay-select; - @include liferay-slider; - @include liferay-splitpanel; - @include liferay-table; - @include liferay-tabsheet; - @include liferay-textfield; - @include liferay-tree; - @include liferay-window; -// } +.liferay { + @include liferay; +} + |