Applied IE9 CSS fixes to IE10 also (#11301)

Change-Id: I50e5d33773127e9073e820bc4e307979bbcbd875

diff --git a/WebContent/VAADIN/themes/reindeer/notification/notification.scss b/WebContent/VAADIN/themes/reindeer/notification/notification.scss
index 4884f19f8bc6e9907cef69bd031332edab5277c2..ec0d15df2fee51e60cc35a0935d3c8246fbc08ad 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/notification/notification.scss
+++ b/WebContent/VAADIN/themes/reindeer/notification/notification.scss
@@ -10,9 +10,11 @@
        font-weight: bold;
 }
 
-.v-ie9 & .#{$primaryStyleName} H1 {
+.v-ie9 &, .v-ie10 & {
+       .#{$primaryStyleName} H1 {
        /* Fix for #6793 */
        font-weight: bold;
+       }
 }
        
 .#{$primaryStyleName} p {

diff --git a/WebContent/VAADIN/themes/reindeer/panel/panel.scss b/WebContent/VAADIN/themes/reindeer/panel/panel.scss
index b095fb4ffbc54ea2e2409302db5888b54bdde046..74ee10837dee540d274f5fb23f26da482aeae9f0 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/panel/panel.scss
+++ b/WebContent/VAADIN/themes/reindeer/panel/panel.scss
@@ -12,14 +12,24 @@
        border-bottom: 1px solid #e5e5e5;
        line-height: 16px; /* accommodate minimum icon size */
 }
-.v-webkit & .#{$primaryStyleName}-caption,
-.v-webkit & .#{$primaryStyleName}-nocaption,
-.v-gecko & .#{$primaryStyleName}-caption,
-.v-gecko & .#{$primaryStyleName}-nocaption,
-.v-ie9 & .#{$primaryStyleName}-caption,
-.v-ie9 & .#{$primaryStyleName}-nocaption {
-       border-bottom-color: rgba(0,0,0,.08);
+
+.v-webkit &, 
+.v-gecko &, 
+.v-ie9 &, 
+.v-ie10 & {
+       .#{$primaryStyleName}-caption,
+       .#{$primaryStyleName}-nocaption {
+               border-bottom-color: rgba(0,0,0,.08);
+       }
+       .#{$primaryStyleName}-content {
+               border-top-color: rgba(0,0,0,.07);
+       }
+       .#{$primaryStyleName}-deco {
+               border-top-color: rgba(0,0,0,.1);
+               background: rgba(0,0,0,.08);
+       }
 }
+
 .#{$primaryStyleName}-caption {
        padding-bottom: 2px;
 }
@@ -30,11 +40,7 @@
        border-bottom: none;
        border-top: none;
 }
-.v-webkit & .#{$primaryStyleName}-content,
-.v-gecko & .#{$primaryStyleName}-content,
-.v-ie9 & .#{$primaryStyleName}-content {
-       border-top-color: rgba(0,0,0,.07);
-}
+
 .blue .#{$primaryStyleName}-deco {
        border-color: #92a3ac;
        background: #adc2cd;
@@ -46,12 +52,6 @@
        background: #e2e2e2;
        overflow: hidden;
 }
-.v-webkit & .#{$primaryStyleName}-deco,
-.v-gecko & .#{$primaryStyleName}-deco,
-.v-ie9 & .#{$primaryStyleName}-deco {
-       border-top-color: rgba(0,0,0,.1);
-       background: rgba(0,0,0,.08);
-}
 .#{$primaryStyleName}-caption .v-errorindicator {
        height: 16px;
        width: 13px;

diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss
index fe17d90e26b6572956e45e060f063a0e0a9ac42b..77d4922535b652a038b0fa731a0daf47ba79ea02 100644 (file)
--- 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 56bad4ed72231c605e9fd715be766280f91e0318..4141586d5a15fd95d378d00b44193f20fa4c30b8 100644 (file)
--- 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;

diff --git a/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.scss b/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.scss
index 3b8773e9e6068c3a0c8d524f40195a47fc36f479..ab4afb1c6977d5a0aab3af124758af88fe4a5a20 100644 (file)
--- a/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.scss
+++ b/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.scss
@@ -142,9 +142,6 @@
        background: #babfc0;
        overflow: hidden;
        margin: 0;
-}
-.v-ie8 & .#{$primaryStyleName}-deco,
-.v-ie9 & .#{$primaryStyleName}-deco {
        width: 100%;
 }
 /* Light-style */