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/reindeer | |
| 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/reindeer')
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/reindeer.scss | 33 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/styles.scss | 33 |
2 files changed, 34 insertions, 32 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/reindeer.scss b/WebContent/VAADIN/themes/reindeer/reindeer.scss index 0cd01f7885..67a997d9eb 100644 --- a/WebContent/VAADIN/themes/reindeer/reindeer.scss +++ b/WebContent/VAADIN/themes/reindeer/reindeer.scss @@ -1,7 +1,7 @@ -// this file just defines all reindeer mixins by importing them +// move this(?) +@import "base.scss"; // common between others for now for backwards compatibility - @import "accordion/accordion.scss"; @import "a-sprite-definitions/a-sprite-definitions.scss"; @import "button/button.scss"; @@ -26,3 +26,32 @@ @import "textfield/textfield.scss"; @import "tree/tree.scss"; @import "window/window.scss"; + +@mixin reindeer { + // TODO @each + + @include reindeer-accordion; + // TODO @include a-sprite-definitions; + @include reindeer-button; + @include reindeer-common; + @include reindeer-datefield; + @include reindeer-formlayout; + @include reindeer-label; + @include reindeer-layouts; + @include reindeer-link; + @include reindeer-menubar; + @include reindeer-notification; + @include reindeer-panel; + @include reindeer-popupview; + @include reindeer-progressindicator; + @include reindeer-select; + @include reindeer-slider; + @include reindeer-splitpanel; + @include reindeer-table; + @include reindeer-tabsheet; + @include reindeer-textfield; + @include reindeer-tree; + @include reindeer-window; +} + + diff --git a/WebContent/VAADIN/themes/reindeer/styles.scss b/WebContent/VAADIN/themes/reindeer/styles.scss index 51daace9d3..d0cab9f923 100644 --- a/WebContent/VAADIN/themes/reindeer/styles.scss +++ b/WebContent/VAADIN/themes/reindeer/styles.scss @@ -1,32 +1,5 @@ -// this file actually attaches all reindeer mixins to a parent style - -@import "../base/styles.scss"; @import "reindeer.scss"; -// .v-theme-reindeer { - @include reindeer-accordion; - // TODO this is problematic: comments get stripped out - // @include a-sprite-definitions; - @include reindeer-button; - - @include reindeer-common; - - @include reindeer-datefield; - @include reindeer-formlayout; - @include reindeer-label; - @include reindeer-layouts; - @include reindeer-link; - @include reindeer-menubar; - @include reindeer-notification; - @include reindeer-panel; - @include reindeer-popupview; - @include reindeer-progressindicator; - @include reindeer-select; - @include reindeer-slider; - @include reindeer-splitpanel; - @include reindeer-table; - @include reindeer-tabsheet; - @include reindeer-textfield; - @include reindeer-tree; - @include reindeer-window; -// } +.reindeer { + @include reindeer; +} |