diff options
author | Artur Signell <artur@vaadin.com> | 2012-12-14 15:28:17 +0200 |
---|---|---|
committer | Artur Signell <artur@vaadin.com> | 2012-12-17 21:46:54 +0200 |
commit | b7aa5ead03310a45587284b3cfec64f56613fbd6 (patch) | |
tree | 8e66eba1be016c6527b2c1501fc1eca1862489b4 /WebContent/VAADIN/themes/base | |
parent | 95d9349d2381b751526c6617f4d0d9d13fac18d3 (diff) | |
download | vaadin-framework-b7aa5ead03310a45587284b3cfec64f56613fbd6.tar.gz vaadin-framework-b7aa5ead03310a45587284b3cfec64f56613fbd6.zip |
Fixed IE scrollbar issues for most if not all components
Fixed by defining font-size:0 and line-height:normal for all v-scrollable elements. A font-size is defined using $font-size for all themes and this is reset in v-widget. Similarly for $line-height.
Should fix at least #9004, #9552, #9572
Change-Id: I78da2c2ce497a0a22962644c9c97df5a0e41e056
Diffstat (limited to 'WebContent/VAADIN/themes/base')
10 files changed, 21 insertions, 4 deletions
diff --git a/WebContent/VAADIN/themes/base/accordion/accordion.scss b/WebContent/VAADIN/themes/base/accordion/accordion.scss index 65906d491f..a8def37d3b 100644 --- a/WebContent/VAADIN/themes/base/accordion/accordion.scss +++ b/WebContent/VAADIN/themes/base/accordion/accordion.scss @@ -5,6 +5,7 @@ outline: none; overflow: visible; text-align: left; /* Force default alignment */ + font-size: 0; } .v-accordion-item { position: relative; @@ -19,6 +20,7 @@ } .v-accordion-item-caption .v-caption { cursor: pointer; + font-size: $font-size; } .v-accordion-item-open .v-accordion-item-caption .v-caption { cursor: default; diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss index 640978d316..87754b6777 100644 --- a/WebContent/VAADIN/themes/base/base.scss +++ b/WebContent/VAADIN/themes/base/base.scss @@ -47,7 +47,8 @@ margin: 0; overflow: hidden; } - +$font-size: 16px; +$line-height: normal; @mixin base { // @include base-app; diff --git a/WebContent/VAADIN/themes/base/button/button.scss b/WebContent/VAADIN/themes/base/button/button.scss index 3ab0eb7aaa..66c7c13ce8 100644 --- a/WebContent/VAADIN/themes/base/button/button.scss +++ b/WebContent/VAADIN/themes/base/button/button.scss @@ -16,6 +16,7 @@ padding: .2em 1em; color: inherit; font: inherit; + font-size: $font-size; line-height: normal; -khtml-user-select: none; -moz-user-select: none; diff --git a/WebContent/VAADIN/themes/base/caption/caption.scss b/WebContent/VAADIN/themes/base/caption/caption.scss index 7b62866d3c..ec87f71999 100644 --- a/WebContent/VAADIN/themes/base/caption/caption.scss +++ b/WebContent/VAADIN/themes/base/caption/caption.scss @@ -6,6 +6,7 @@ .#{$primaryStyleName} { overflow: hidden; white-space: nowrap; + font-size: $font-size; } .v-errorindicator { display: inline-block; diff --git a/WebContent/VAADIN/themes/base/common/common.scss b/WebContent/VAADIN/themes/base/common/common.scss index ac9154d2dc..fd4625606a 100644 --- a/WebContent/VAADIN/themes/base/common/common.scss +++ b/WebContent/VAADIN/themes/base/common/common.scss @@ -219,6 +219,8 @@ body &.v-app-loading { .v-scrollable { overflow: auto; + font-size: 0; + line-height: normal; } /* Enable kinetic scrolling on Mobile Safari 6 */ diff --git a/WebContent/VAADIN/themes/base/layout/layout.scss b/WebContent/VAADIN/themes/base/layout/layout.scss index 85ebaec5ba..374e637855 100644 --- a/WebContent/VAADIN/themes/base/layout/layout.scss +++ b/WebContent/VAADIN/themes/base/layout/layout.scss @@ -33,6 +33,11 @@ TODO .v-gridlayout.v-layout-margin-top { padding-top: 24px; } +.v-gridlayout, +.v-verticallayout { + font-size: 0; +} + .v-gridlayout.v-layout-margin-bottom { padding-bottom: 24px; } diff --git a/WebContent/VAADIN/themes/base/table/table.scss b/WebContent/VAADIN/themes/base/table/table.scss index e48b582804..f500d2f12a 100644 --- a/WebContent/VAADIN/themes/base/table/table.scss +++ b/WebContent/VAADIN/themes/base/table/table.scss @@ -42,6 +42,10 @@ padding: 0; border: 0; } +.#{$primaryStyleName}-table { + font-size: $font-size; +} + .#{$primaryStyleName}-header td { padding: 0; } diff --git a/WebContent/VAADIN/themes/base/textfield/textfield.scss b/WebContent/VAADIN/themes/base/textfield/textfield.scss index de57e50e4d..4266346132 100644 --- a/WebContent/VAADIN/themes/base/textfield/textfield.scss +++ b/WebContent/VAADIN/themes/base/textfield/textfield.scss @@ -67,6 +67,7 @@ textarea.v-textarea-readonly:focus { } .v-richtextarea .gwt-HTML { height: 100%; + font-size: $font-size; } .v-richtextarea .gwt-RichTextToolbar { white-space: nowrap; diff --git a/WebContent/VAADIN/themes/base/tree/tree.scss b/WebContent/VAADIN/themes/base/tree/tree.scss index 22bd3b7703..ace6d7d2f2 100644 --- a/WebContent/VAADIN/themes/base/tree/tree.scss +++ b/WebContent/VAADIN/themes/base/tree/tree.scss @@ -4,7 +4,6 @@ .#{$primaryStyleName} { text-align: left; /* Force default alignment */ - overflow: hidden; padding: 1px 0; outline: none; } diff --git a/WebContent/VAADIN/themes/base/widget/widget.scss b/WebContent/VAADIN/themes/base/widget/widget.scss index e1e830d488..e4f660003c 100644 --- a/WebContent/VAADIN/themes/base/widget/widget.scss +++ b/WebContent/VAADIN/themes/base/widget/widget.scss @@ -7,7 +7,8 @@ text-align: left; display: inline-block; white-space: normal; - vertical-align: top; + vertical-align: bottom; + font-size: $font-size; + line-height: $line-height; } - }
\ No newline at end of file |