summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes/base
diff options
context:
space:
mode:
authorJonatan Kronqvist <jonatan@vaadin.com>2014-02-07 16:01:00 +0200
committerJonatan Kronqvist <jonatan@vaadin.com>2014-02-07 19:35:38 +0200
commitad5e882b4dda5458ff16ce9c2321407a1d255ec6 (patch)
tree752a675827540cedba900979e1d2a42c3ff6e048 /WebContent/VAADIN/themes/base
parent0e8500a5af0c4924d4a164bbd548128cf474b203 (diff)
parentfbc48c6ab75479560919a463ba5693b44bb0e811 (diff)
downloadvaadin-framework-ad5e882b4dda5458ff16ce9c2321407a1d255ec6.tar.gz
vaadin-framework-ad5e882b4dda5458ff16ce9c2321407a1d255ec6.zip
Merge commit 'fbc48c6ab75479560919a463ba5693b44bb0e811' into merge71
Conflicts: client/src/com/vaadin/client/ui/VWindow.java Change-Id: I6b4605ffafe990747757ec545cf2b52656c9f9f4
Diffstat (limited to 'WebContent/VAADIN/themes/base')
-rw-r--r--WebContent/VAADIN/themes/base/base.scss5
1 files changed, 5 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss
index c6760e1907..aa1e778d6f 100644
--- a/WebContent/VAADIN/themes/base/base.scss
+++ b/WebContent/VAADIN/themes/base/base.scss
@@ -53,6 +53,11 @@
margin: 0;
overflow: hidden;
}
+
+.v-modal-window-open {
+ overflow: hidden;
+}
+
$font-size: 16px;
$line-height: normal;
@mixin base {