diff options
| author | Henrik Paul <henrik@vaadin.com> | 2014-03-03 11:46:35 +0200 |
|---|---|---|
| committer | John Ahlroos <john@vaadin.com> | 2014-03-03 09:56:47 +0000 |
| commit | 3798a8ab782d5e68b269692bbb784069b9312122 (patch) | |
| tree | 248e2d6317f11a6906c2c13161609c118ffff8c4 /WebContent/VAADIN/themes/base/base.scss | |
| parent | 54b448d018922f6315bb756c24c6ce7feff6e14d (diff) | |
| parent | 6b7ad587042d2c98c2133c93382fb5ea8cdded8c (diff) | |
| download | vaadin-framework-3798a8ab782d5e68b269692bbb784069b9312122.tar.gz vaadin-framework-3798a8ab782d5e68b269692bbb784069b9312122.zip | |
Merge branch 'master' into grid
Change-Id: I2f1134ce1bd5e8dbb183881fc69120e964271245
Diffstat (limited to 'WebContent/VAADIN/themes/base/base.scss')
| -rw-r--r-- | WebContent/VAADIN/themes/base/base.scss | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss index 0e19c8a339..58274edacb 100644 --- a/WebContent/VAADIN/themes/base/base.scss +++ b/WebContent/VAADIN/themes/base/base.scss @@ -16,6 +16,7 @@ @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"; @@ -123,3 +124,4 @@ $line-height: normal; // always include, don't wrap in .themename{} @include debug-globals; +@include fonts; |