diff options
| author | Leif Åstrand <leif@vaadin.com> | 2014-03-18 15:40:01 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2014-03-18 15:40:50 +0200 |
| commit | 4420f52578e245045677f88852f1ba3f405e88a3 (patch) | |
| tree | 5f5c3f6c03326afe580f26eb395963f5c1e50804 /WebContent/VAADIN/themes/base/base.scss | |
| parent | 5d0b53bad905a2f77e4e75a3e307a69824c9b87d (diff) | |
| parent | 796063f898ef34bbbe457164976ae96c802c1bc7 (diff) | |
| download | vaadin-framework-4420f52578e245045677f88852f1ba3f405e88a3.tar.gz vaadin-framework-4420f52578e245045677f88852f1ba3f405e88a3.zip | |
Merge branch 'master' into grid
Change-Id: Ia9d156009a3f1b4e61f12eb415040670a52d7876
Diffstat (limited to 'WebContent/VAADIN/themes/base/base.scss')
| -rw-r--r-- | WebContent/VAADIN/themes/base/base.scss | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss index fd3c5d067d..58274edacb 100644 --- a/WebContent/VAADIN/themes/base/base.scss +++ b/WebContent/VAADIN/themes/base/base.scss @@ -15,8 +15,10 @@ @import "inlinedatefield/inlinedatefield.scss"; @import "dragwrapper/dragwrapper.scss"; @import "embedded/embedded.scss"; +@import "escalator/escalator.scss"; @import "fonts/fonts.scss"; @import "formlayout/formlayout.scss"; +@import "grid/grid.scss"; @import "gridlayout/gridlayout.scss"; @import "label/label.scss"; @import "link/link.scss"; @@ -90,7 +92,9 @@ $line-height: normal; @include base-inline-datefield; @include base-dragwrapper; @include base-embedded; + @include base-escalator; @include base-formlayout; + @include base-grid; @include base-gridlayout; @include base-label; @include base-link; |