diff options
| author | Artur Signell <artur@vaadin.com> | 2013-01-15 09:57:10 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-01-15 09:57:10 +0000 |
| commit | 82acfe3b4e1771c895af279a99e50bfa461a7068 (patch) | |
| tree | d5977fc360de9f3bd5426311693961cc019c5fc8 | |
| parent | d8c9b399e5913343007df9fb53f109d89b66943c (diff) | |
| parent | f13b509805366522d2b87360af1a960875ff21c1 (diff) | |
| download | vaadin-framework-82acfe3b4e1771c895af279a99e50bfa461a7068.tar.gz vaadin-framework-82acfe3b4e1771c895af279a99e50bfa461a7068.zip | |
Merge "Fixed broken Tabsheet styles after fixes to #10682"
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss | 10 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss | 10 |
2 files changed, 13 insertions, 7 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss index 75ce9e1094..989e1d3f5a 100644 --- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss +++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss @@ -104,12 +104,12 @@ -webkit-border-radius: 7px; -moz-border-radius: 7px; } -.#{$primaryStyleName}-tabs-minimal .#{$primaryStyleName}-caption-close { - margin-top: 1px; -} -.v-ff & .#{$primaryStyleName}-tabs-minimal .#{$primaryStyleName}-caption-close { - margin-top: -15px; + +.v-ie9 & .#{$primaryStyleName}-tabs-minimal .#{$primaryStyleName}-caption-close:only-child, +.v-ie9 & .#{$primaryStyleName}-tabs-minimal .v-captiontext:first-child + .#{$primaryStyleName}-caption-close { + margin-top: -14px; } + .#{$primaryStyleName}-tabs-minimal .#{$primaryStyleName}-caption-close:hover, .white .#{$primaryStyleName}-tabs-minimal .#{$primaryStyleName}-caption-close:hover { color: #fff; diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss index 7dde13e55e..91bb3915be 100644 --- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss +++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss @@ -55,9 +55,15 @@ font-size: 14px; font-weight: normal; } -.v-ff & .#{$primaryStyleName}-caption-close { - margin-top: -15px; +.v-ff & .#{$primaryStyleName}-caption-close{ + margin-top: -17px; } + +.v-ff & .#{$primaryStyleName}-caption-close:only-child { + margin-top: -1px; +} + + .#{$primaryStyleName}-caption-close:hover { background-image: url(img/close-btn-hover.png); /** sprite-ref: verticals */ } |