From: Henrik Paul <henrik@vaadin.com>
Date: Mon, 3 Mar 2014 09:46:35 +0000 (+0200)
Subject: Merge branch 'master' into grid
X-Git-Tag: 7.2.0.beta1~108^2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3798a8ab782d5e68b269692bbb784069b9312122;p=vaadin-framework.git

Merge branch 'master' into grid

Change-Id: I2f1134ce1bd5e8dbb183881fc69120e964271245
---

3798a8ab782d5e68b269692bbb784069b9312122
diff --cc WebContent/VAADIN/themes/base/base.scss
index 0e19c8a339,fd3c5d067d..58274edacb
--- a/WebContent/VAADIN/themes/base/base.scss
+++ b/WebContent/VAADIN/themes/base/base.scss
@@@ -15,9 -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";