diff options
| author | Artur Signell <artur@vaadin.com> | 2012-12-18 08:40:27 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-12-18 08:40:27 +0000 |
| commit | 33933478c6948cca467d0aee615428208ea7d49d (patch) | |
| tree | b38ab3efcaa7226fc8aadbcf85542c4b3cdbcebe /WebContent/VAADIN/themes/reindeer | |
| parent | a27f7f16cf803b86e0dae175bb960793a877b76c (diff) | |
| parent | 7b22cda053287efeaebf45f6a1b3ad448a46f398 (diff) | |
| download | vaadin-framework-33933478c6948cca467d0aee615428208ea7d49d.tar.gz vaadin-framework-33933478c6948cca467d0aee615428208ea7d49d.zip | |
Merge changes Ide0a7e28,I78da2c2c
* changes:
Ugly hacks to make tests screenshot compatible
Fixed IE scrollbar issues for most if not all components
Diffstat (limited to 'WebContent/VAADIN/themes/reindeer')
3 files changed, 6 insertions, 1 deletions
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; |