summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-12-18 10:46:20 +0200
committerArtur Signell <artur@vaadin.com>2012-12-18 10:46:25 +0200
commit510435d377a50dcb73f9367ab4f783d408310456 (patch)
tree019780325714fa11ba07729f8380e4548b99d312 /WebContent/VAADIN
parent33933478c6948cca467d0aee615428208ea7d49d (diff)
downloadvaadin-framework-510435d377a50dcb73f9367ab4f783d408310456.tar.gz
vaadin-framework-510435d377a50dcb73f9367ab4f783d408310456.zip
Additional fixes for IE scrollbars issues
Related to #9004, #9552, #9572, #9578 Change-Id: I6f6677ec47713d480e2591f3bddf3b764861201c
Diffstat (limited to 'WebContent/VAADIN')
-rw-r--r--WebContent/VAADIN/themes/base/layout/layout.scss3
-rw-r--r--WebContent/VAADIN/themes/reindeer/reindeer.scss7
2 files changed, 5 insertions, 5 deletions
diff --git a/WebContent/VAADIN/themes/base/layout/layout.scss b/WebContent/VAADIN/themes/base/layout/layout.scss
index 374e637855..e085abcc60 100644
--- a/WebContent/VAADIN/themes/base/layout/layout.scss
+++ b/WebContent/VAADIN/themes/base/layout/layout.scss
@@ -34,7 +34,8 @@ TODO
padding-top: 24px;
}
.v-gridlayout,
-.v-verticallayout {
+.v-verticallayout,
+.v-horizontallayout {
font-size: 0;
}
diff --git a/WebContent/VAADIN/themes/reindeer/reindeer.scss b/WebContent/VAADIN/themes/reindeer/reindeer.scss
index d6b252513b..3cf1c392e3 100644
--- a/WebContent/VAADIN/themes/reindeer/reindeer.scss
+++ b/WebContent/VAADIN/themes/reindeer/reindeer.scss
@@ -33,12 +33,11 @@
background: #f5f5f5;
}
+$font-size: 12px;
+$line-height: normal;
+
@mixin reindeer {
- // should this be here?
- $font-size: 12px;
- $line-height: normal;
@include base;
-
// TODO @each
@include reindeer-accordion;