Fixed broken Tabsheet styles after fixes to #10682

Change-Id: I752e2cd2a83b89c0ac2623f57b3311aa7ae9934b

diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss
index 75ce9e1094226ae4d2ca00ece267f0358c3958b2..989e1d3f5a4a3db7556b7864145eda29c1e0fb2b 100644 (file)
--- 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 7dde13e55edb4209bdc52fa9ae486f2a6f511069..91bb3915be942c6f977e48c21c1ff8d86d84840a 100644 (file)
--- 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 */
 }