diff options
| author | John Ahlroos <john@vaadin.com> | 2014-03-18 15:19:59 +0000 |
|---|---|---|
| committer | John Ahlroos <john@vaadin.com> | 2014-03-18 15:19:59 +0000 |
| commit | cca2172654699f9e2f79e8b36c70700c248da8f2 (patch) | |
| tree | 2122cdf70d91f7533de4f3f0e31b10fec1792289 /WebContent/VAADIN/themes/base/base.scss | |
| parent | 4420f52578e245045677f88852f1ba3f405e88a3 (diff) | |
| download | vaadin-framework-cca2172654699f9e2f79e8b36c70700c248da8f2.tar.gz vaadin-framework-cca2172654699f9e2f79e8b36c70700c248da8f2.zip | |
Revert "Merge branch 'master' into grid"
This reverts commit 4420f52578e245045677f88852f1ba3f405e88a3.
Change-Id: I06effe06f245baaeb499071917c359eb34cc55ea
Diffstat (limited to 'WebContent/VAADIN/themes/base/base.scss')
| -rw-r--r-- | WebContent/VAADIN/themes/base/base.scss | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss index 58274edacb..fd3c5d067d 100644 --- a/WebContent/VAADIN/themes/base/base.scss +++ b/WebContent/VAADIN/themes/base/base.scss @@ -15,10 +15,8 @@ @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"; @@ -92,9 +90,7 @@ $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; |