From 6e8b34434e07490bc5813f62f993d5a8f920afad Mon Sep 17 00:00:00 2001
From: John Ahlroos <john@vaadin.com>
Date: Thu, 5 Dec 2013 13:09:26 +0200
Subject: Support primary style names in Escalator and Grid #13058

Change-Id: I8fa99a96c2120583bb1ecd152f8f337aef702614
---
 WebContent/VAADIN/themes/base/base.scss      | 2 ++
 WebContent/VAADIN/themes/base/grid/grid.scss | 3 +++
 2 files changed, 5 insertions(+)
 create mode 100644 WebContent/VAADIN/themes/base/grid/grid.scss

(limited to 'WebContent')

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;
diff --git a/WebContent/VAADIN/themes/base/grid/grid.scss b/WebContent/VAADIN/themes/base/grid/grid.scss
new file mode 100644
index 0000000000..9f7a2d8664
--- /dev/null
+++ b/WebContent/VAADIN/themes/base/grid/grid.scss
@@ -0,0 +1,3 @@
+@mixin base-grid($primaryStyleName : v-grid) {
+	@include base-escalator($primaryStyleName);
+}
\ No newline at end of file
-- 
cgit v1.2.3