summaryrefslogtreecommitdiffstats
path: root/WebContent
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-12-14 15:28:17 +0200
committerArtur Signell <artur@vaadin.com>2012-12-17 21:46:54 +0200
commitb7aa5ead03310a45587284b3cfec64f56613fbd6 (patch)
tree8e66eba1be016c6527b2c1501fc1eca1862489b4 /WebContent
parent95d9349d2381b751526c6617f4d0d9d13fac18d3 (diff)
downloadvaadin-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')
-rw-r--r--WebContent/VAADIN/themes/base/accordion/accordion.scss2
-rw-r--r--WebContent/VAADIN/themes/base/base.scss3
-rw-r--r--WebContent/VAADIN/themes/base/button/button.scss1
-rw-r--r--WebContent/VAADIN/themes/base/caption/caption.scss1
-rw-r--r--WebContent/VAADIN/themes/base/common/common.scss2
-rw-r--r--WebContent/VAADIN/themes/base/layout/layout.scss5
-rw-r--r--WebContent/VAADIN/themes/base/table/table.scss4
-rw-r--r--WebContent/VAADIN/themes/base/textfield/textfield.scss1
-rw-r--r--WebContent/VAADIN/themes/base/tree/tree.scss1
-rw-r--r--WebContent/VAADIN/themes/base/widget/widget.scss5
-rw-r--r--WebContent/VAADIN/themes/chameleon/chameleon.scss2
-rw-r--r--WebContent/VAADIN/themes/chameleon/components/table/table.scss4
-rw-r--r--WebContent/VAADIN/themes/liferay/accordion/accordion.scss5
-rw-r--r--WebContent/VAADIN/themes/liferay/liferay.scss1
-rw-r--r--WebContent/VAADIN/themes/reindeer/accordion/accordion.scss3
-rw-r--r--WebContent/VAADIN/themes/reindeer/reindeer.scss2
-rw-r--r--WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss2
-rw-r--r--WebContent/VAADIN/themes/runo/accordion/accordion.scss2
-rw-r--r--WebContent/VAADIN/themes/runo/runo.scss3
19 files changed, 42 insertions, 7 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
diff --git a/WebContent/VAADIN/themes/chameleon/chameleon.scss b/WebContent/VAADIN/themes/chameleon/chameleon.scss
index 8a24a73cbf..95f81f69c1 100644
--- 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 9a90222c86..b3ebf44d63 100644
--- 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 840c02feec..9a37fd463e 100644
--- 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 299542fea0..7d7665ad86 100644
--- 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 c6ffaa4823..77fe1c0b9a 100644
--- 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 f02fcf18a8..d6b252513b 100644
--- 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 2f1d0c7081..556b5de443 100644
--- 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 f85a1dadab..69a52dd22a 100644
--- 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 395f4d0b1b..6e88b14eb4 100644
--- 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;