diff options
author | Artur Signell <artur@vaadin.com> | 2013-03-11 22:20:51 +0200 |
---|---|---|
committer | Artur Signell <artur@vaadin.com> | 2013-03-11 22:23:54 +0200 |
commit | 04ee1d7fbbe908c91f0c26e2fc6e72b628718b76 (patch) | |
tree | 858787251f5f63e09563b03722191f2227eba6a6 /WebContent/VAADIN/themes/reindeer/tabsheet | |
parent | 2af3a297286fa6adeaee3ee0b88df705e095154a (diff) | |
download | vaadin-framework-04ee1d7fbbe908c91f0c26e2fc6e72b628718b76.tar.gz vaadin-framework-04ee1d7fbbe908c91f0c26e2fc6e72b628718b76.zip |
Applied IE9 CSS fixes to IE10 also (#11301)
Change-Id: I50e5d33773127e9073e820bc4e307979bbcbd875
Diffstat (limited to 'WebContent/VAADIN/themes/reindeer/tabsheet')
-rw-r--r-- | WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss | 12 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss | 7 |
2 files changed, 11 insertions, 8 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss index fe17d90e26..77d4922535 100644 --- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss +++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss @@ -105,15 +105,17 @@ -moz-border-radius: 7px; } -.v-ie9 & .#{$primaryStyleName}-tabs-minimal .#{$primaryStyleName}-tabitem .#{$primaryStyleName}-caption-close { - &, &:hover, &:active { +.v-ie9 &, .v-ie10 & { + .#{$primaryStyleName}-tabs-minimal .#{$primaryStyleName}-tabitem .#{$primaryStyleName}-caption-close { + &, &:hover, &:active { - /* IE9 suffers from rounding subpixel values errors when measuring the tabs which makes the close button wrap. */ + /* IE9/IE10 suffers from rounding subpixel values errors when measuring the tabs which makes the close button wrap. */ margin-left: 2.5px; - /* The close button is a pixel too high in IE9, adjust for that */ + /* The close button is a pixel too high in IE9/IE10, adjust for that */ margin-top: 1px; - } + } + } } .#{$primaryStyleName}-tabs-minimal .#{$primaryStyleName}-caption-close:hover, diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss index 56bad4ed72..4141586d5a 100644 --- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss +++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss @@ -55,11 +55,12 @@ .v-ff & .#{$primaryStyleName}-tabs-bar .#{$primaryStyleName}-caption-close { margin-top: -14px; } -.v-ie9 & .#{$primaryStyleName}-tabs-bar .#{$primaryStyleName}-caption-close:only-child, -.v-ie9 & .#{$primaryStyleName}-tabs-bar .v-captiontext:first-child + .#{$primaryStyleName}-caption-close { +.v-ie9 &, .v-ie10 & { + .#{$primaryStyleName}-tabs-bar .#{$primaryStyleName}-caption-close:only-child, + .#{$primaryStyleName}-tabs-bar .v-captiontext:first-child + .#{$primaryStyleName}-caption-close { margin-top: -14px; + } } - .#{$primaryStyleName}-tabs-bar .#{$primaryStyleName}-caption-close:hover { background: #bfbfbf; -webkit-box-shadow: 0 1px 0 #fff; |