summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-10-09 09:19:38 +0000
committerVaadin Code Review <review@vaadin.com>2012-10-09 09:19:38 +0000
commited220b024805a7329e267a4deca71aa136d2aa3f (patch)
tree414378e34046133aad7a08cf123ae398aef7d266
parent88a5e019ab0e545b869852fd37a60654a4927801 (diff)
parent9700e89aa7ea5c90ad8f44355c829acffe13fe97 (diff)
downloadvaadin-framework-ed220b024805a7329e267a4deca71aa136d2aa3f.tar.gz
vaadin-framework-ed220b024805a7329e267a4deca71aa136d2aa3f.zip
Merge "Applied a similar fix for the scrollbars in accordion and tabsheet as was done for the splitpanel previously #9572"
-rw-r--r--WebContent/VAADIN/themes/base/accordion/accordion.scss10
-rw-r--r--WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss12
2 files changed, 22 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/base/accordion/accordion.scss b/WebContent/VAADIN/themes/base/accordion/accordion.scss
index 6f4825f16b..694f5ca930 100644
--- a/WebContent/VAADIN/themes/base/accordion/accordion.scss
+++ b/WebContent/VAADIN/themes/base/accordion/accordion.scss
@@ -27,4 +27,14 @@
width: 100%;
}
+/*
+ * In IE8 and IE9 we need to do magic things to avoid scrollbars since it does not completely
+ * support the HTML5 doctype. Changing the contained element to a block element will not add
+ * magical bottom paddings to the contained element and cause scrollbars. Doing this for
+ * all browsers for consistency.
+ */
+.v-accordion .v-accordion-item-content > .v-widget {
+ display: block;
+}
+
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss
index a001605f27..6fcb3d1705 100644
--- a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss
+++ b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss
@@ -125,4 +125,16 @@
height: 0;
}
+/*
+ * In IE8 and IE9 we need to do magic things to avoid scrollbars since it does not completely
+ * support the HTML5 doctype. Changing the contained element to a block element will not add
+ * magical bottom paddings to the contained element and cause scrollbars. Doing this for
+ * all browsers for consistency.
+ */
+.#{$name} .v-scrollable > .v-widget {
+ display: block;
+}
+
+
+
} \ No newline at end of file