summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes/base/base.scss
diff options
context:
space:
mode:
authorJohn Ahlroos <john@vaadin.com>2013-12-05 13:09:26 +0200
committerJohn Ahlroos <john@vaadin.com>2013-12-10 10:10:02 +0200
commit6e8b34434e07490bc5813f62f993d5a8f920afad (patch)
treea4619d09b603da9dd49b3af1d78df232154b8071 /WebContent/VAADIN/themes/base/base.scss
parent117b7915617bc3835f766bccd49e5af6bb3bc723 (diff)
downloadvaadin-framework-6e8b34434e07490bc5813f62f993d5a8f920afad.tar.gz
vaadin-framework-6e8b34434e07490bc5813f62f993d5a8f920afad.zip
Support primary style names in Escalator and Grid #13058
Change-Id: I8fa99a96c2120583bb1ecd152f8f337aef702614
Diffstat (limited to 'WebContent/VAADIN/themes/base/base.scss')
-rw-r--r--WebContent/VAADIN/themes/base/base.scss2
1 files changed, 2 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss
index 5f33d8116f..54e0916da1 100644
--- a/WebContent/VAADIN/themes/base/base.scss
+++ b/WebContent/VAADIN/themes/base/base.scss
@@ -17,6 +17,7 @@
@import "embedded/embedded.scss";
@import "escalator/escalator.scss";
@import "formlayout/formlayout.scss";
+@import "grid/grid.scss";
@import "gridlayout/gridlayout.scss";
@import "label/label.scss";
@import "link/link.scss";
@@ -87,6 +88,7 @@ $line-height: normal;
@include base-embedded;
@include base-escalator;
@include base-formlayout;
+ @include base-grid;
@include base-gridlayout;
@include base-label;
@include base-link;