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

diff --git a/WebContent/VAADIN/themes/base/accordion/accordion.scss b/WebContent/VAADIN/themes/base/accordion/accordion.scss
index 65906d491fdc630bfca2f32f548e5917fa4a3e73..a8def37d3bcde34f3f59f8bae2f48af9e66d781f 100644 (file)
--- 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 640978d3168ae784303fe68bac5964843098b2bc..87754b6777278d4ecc4911573ff18f931fc1d5de 100644 (file)
--- 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 3ab0eb7aaacecc3983003dc85571f64b7458d721..66c7c13ce80e6bc3feae6708aff3fe5ef49f0b04 100644 (file)
--- 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 7b62866d3c838be6975f55f9126cef27f632cb95..ec87f71999c7521a9bbf10d2d365f3efe4667de0 100644 (file)
--- 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 ac9154d2dc8206009f86e0cca9cd856640a3440a..fd4625606a45b3c4a233411c48d91bd8687b4249 100644 (file)
--- 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 85ebaec5baa86210a6cb9c8c12136ccf2fb1bb35..374e63785545cd9b1a3d61fc5d3fb2c80ce11df5 100644 (file)
--- 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 e48b582804cd717fe0e5f1ad3b41bebfdfc38d12..f500d2f12af84e571b1f7b36454dfe876170e57e 100644 (file)
--- 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 de57e50e4dba8c7cca5c0180536c54df48955487..42663461320f751e80498d15f99cc49a06cbc55e 100644 (file)
--- 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 22bd3b77031b03e93e8453b107eec28a5755c556..ace6d7d2f2ddec43290411b5685373de6cbbcd5b 100644 (file)
--- 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 e1e830d4882bc0e99901c06d9b9ac695ab5417ff..e4f660003c9045966981e573519e6a4749157baf 100644 (file)
--- 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

diff --git a/WebContent/VAADIN/themes/chameleon/chameleon.scss b/WebContent/VAADIN/themes/chameleon/chameleon.scss
index 8a24a73cbfca782e05f7d2170099bbb13d030048..95f81f69c1fcbe0112bc2ab52f19cbcf05b634d6 100644 (file)
--- a/WebContent/VAADIN/themes/chameleon/chameleon.scss
+++ b/WebContent/VAADIN/themes/chameleon/chameleon.scss
@@ -3,6 +3,8 @@
 @import "components/components.scss";
 @import "compound/compound.scss";
 
+$font-size: 13px;
+$line-height: 1.4;
 @mixin chameleon {
        // TODO move this?
        @include base;

diff --git a/WebContent/VAADIN/themes/chameleon/components/table/table.scss b/WebContent/VAADIN/themes/chameleon/components/table/table.scss
index 9a90222c869df1a0357ae9fb10dd50b43a7df58f..b3ebf44d6381f0b4ac6da63c7f0f84bb3aa75474 100644 (file)
--- a/WebContent/VAADIN/themes/chameleon/components/table/table.scss
+++ b/WebContent/VAADIN/themes/chameleon/components/table/table.scss
@@ -1,5 +1,9 @@
 @mixin chameleon-table($primaryStyleName : v-table) {
 
+.#{$primaryStyleName}-table {
+       line-height: $line-height;
+}
+
 .#{$primaryStyleName}-header-wrap,
 .#{$primaryStyleName}-header-drag {
        background: #c9c9c9 url(../../img/grad-light-top.png) repeat-x;

diff --git a/WebContent/VAADIN/themes/liferay/accordion/accordion.scss b/WebContent/VAADIN/themes/liferay/accordion/accordion.scss
index 840c02feec96a3d9f3bc0053b3f0233e6b91ceed..9a37fd463e17935e7172f53379c7d697e979a1dd 100644 (file)
--- a/WebContent/VAADIN/themes/liferay/accordion/accordion.scss
+++ b/WebContent/VAADIN/themes/liferay/accordion/accordion.scss
@@ -10,7 +10,6 @@
 .v-accordion-item-caption {
        color: #222;
        text-shadow: 1px 1px #FFFFFF;
-       font-size: 12px;
        font-weight: bold;
        background: #c0c2c5 url(/html/themes/classic/images/application/panel_header_bg.png) repeat-x scroll 0 0;
        border-top: 1px solid #999;
@@ -18,6 +17,10 @@
        padding: 4px 5px 5px 5px;
 }
 
+.v-accordion-item-caption .v-caption {
+       font-size: 12px;
+}
+
 .v-accordion-item-first .v-accordion-item-caption {
        border-top: none;
        -webkit-border-radius: 4px 4px 0 0;

diff --git a/WebContent/VAADIN/themes/liferay/liferay.scss b/WebContent/VAADIN/themes/liferay/liferay.scss
index 299542fea096863cef5c43d564f994db4f5ed9e1..7d7665ad865e98a3d56071a4b9ec04c94ebe4919 100644 (file)
--- a/WebContent/VAADIN/themes/liferay/liferay.scss
+++ b/WebContent/VAADIN/themes/liferay/liferay.scss
@@ -26,6 +26,7 @@
        
 @mixin liferay {
        // TODO move?
+       $font-size: 11px;
        @include base;
        // TODO @each
        @include liferay-accordion;

diff --git a/WebContent/VAADIN/themes/reindeer/accordion/accordion.scss b/WebContent/VAADIN/themes/reindeer/accordion/accordion.scss
index c6ffaa48231cf12a3cb116871bcc16d46a6900c1..77fe1c0b9a67b735a86d62092d98a5957857ef1e 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/accordion/accordion.scss
+++ b/WebContent/VAADIN/themes/reindeer/accordion/accordion.scss
@@ -18,6 +18,9 @@
        border-top: 1px solid #bebebe;
        text-shadow: #fff 0 1px 0;
 }
+.#{$primaryStyleName}-item-caption .v-caption {
+       font-size: 11px;
+}
 
 .#{$primaryStyleName}-item-caption .v-captiontext{
        vertical-align:baseline;

diff --git a/WebContent/VAADIN/themes/reindeer/reindeer.scss b/WebContent/VAADIN/themes/reindeer/reindeer.scss
index f02fcf18a89a1b94122cad35e7f1af3c2ddea75d..d6b252513bad6a439b69d879241c52bca64a56ac 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/reindeer.scss
+++ b/WebContent/VAADIN/themes/reindeer/reindeer.scss
@@ -35,6 +35,8 @@
 
 @mixin reindeer {
        // should this be here?
+       $font-size: 12px;
+       $line-height: normal;
        @include base;
        
        // TODO @each

diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss
index 2f1d0c7081ef23501841057d83980e23f644bdf4..556b5de443830305da44c3ec078fd663668adf82 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss
@@ -21,10 +21,10 @@
 .#{$primaryStyleName}-tabs-bar .#{$primaryStyleName}-spacertd div {
        height: 20px;
        background-image: url(img/bar/tab-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */
-       font-size: 11px;
        margin: 0;
 }
 .#{$primaryStyleName}-tabs-bar .#{$primaryStyleName}-tabitem .v-caption {
+       font-size: 11px;
        height: 18px;
        background-image: url(img/bar/tab-right.png); /** sprite-ref: verticals; sprite-alignment: right */
        padding: 2px 12px 0 10px;

diff --git a/WebContent/VAADIN/themes/runo/accordion/accordion.scss b/WebContent/VAADIN/themes/runo/accordion/accordion.scss
index f85a1dadabc6b283e65f0eb24aec0fa1ffdde7b6..69a52dd22a3d9fd54a0821353efff2b27fb66945 100644 (file)
--- a/WebContent/VAADIN/themes/runo/accordion/accordion.scss
+++ b/WebContent/VAADIN/themes/runo/accordion/accordion.scss
@@ -3,12 +3,12 @@
 .#{$primaryStyleName}-item-caption {
        height: 31px;
        background: #edf0f0 url(img/bg.png);
-       font-size: 15px;
        color: #656d73;
        border: none;
        border-top: 1px solid #c8cccd;
 }
 .#{$primaryStyleName}-item-caption .v-caption {
+       font-size: 15px;
        padding: 7px 0 4px 31px;
        background: transparent url(img/collapsed-icon.png) no-repeat 18px 55%;
 }

diff --git a/WebContent/VAADIN/themes/runo/runo.scss b/WebContent/VAADIN/themes/runo/runo.scss
index 395f4d0b1be5c955041cd3ff634f8cd2c2edbfcc..6e88b14eb44c81ffce5891bdb404684084ff6ccb 100644 (file)
--- a/WebContent/VAADIN/themes/runo/runo.scss
+++ b/WebContent/VAADIN/themes/runo/runo.scss
@@ -32,6 +32,9 @@
        background: #e9eced;
 }
 
+$font-size: 13px;
+$line-height: 18px;
+
 @mixin runo {
        // TODO move?
        @include base;