From: John Ahlroos <john@vaadin.com>
Date: Tue, 15 Jan 2013 09:30:47 +0000 (+0200)
Subject: Fixed broken Tabsheet styles after fixes to #10682
X-Git-Tag: 7.0.0.rc1~9^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f13b509805366522d2b87360af1a960875ff21c1;p=vaadin-framework.git

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 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 */
 }