diff options
| author | Artur Signell <artur@vaadin.com> | 2012-11-23 19:43:19 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-11-23 20:44:25 +0200 |
| commit | f60f4bffa65f0031c2b094e7d9200c3df20c69ea (patch) | |
| tree | 477b67f581087f415a94cf7cea8e41d418d9e564 /WebContent/VAADIN/themes/reindeer/tabsheet | |
| parent | d553c3eca98e574d8d6a0b1f2a0276093f53b55e (diff) | |
| download | vaadin-framework-f60f4bffa65f0031c2b094e7d9200c3df20c69ea.tar.gz vaadin-framework-f60f4bffa65f0031c2b094e7d9200c3df20c69ea.zip | |
Fixed browser specific theme selectors (#10362)
Browser specific class names are set on the body element and the theme class name is inside body. Theme selectors must therefore be of type ".v-ie & "
Change-Id: I1893946ed9b5441a6977945a757a85ae87c07ce8
Diffstat (limited to 'WebContent/VAADIN/themes/reindeer/tabsheet')
3 files changed, 8 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 7b6ed54c02..75ce9e1094 100644 --- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss +++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss @@ -107,7 +107,7 @@ .#{$primaryStyleName}-tabs-minimal .#{$primaryStyleName}-caption-close { margin-top: 1px; } -.v-ff .#{$primaryStyleName}-tabs-minimal .#{$primaryStyleName}-caption-close { +.v-ff & .#{$primaryStyleName}-tabs-minimal .#{$primaryStyleName}-caption-close { margin-top: -15px; } .#{$primaryStyleName}-tabs-minimal .#{$primaryStyleName}-caption-close:hover, diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss index c13bb6f025..172c735933 100644 --- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss +++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss @@ -104,7 +104,7 @@ .#{$primaryStyleName}-tabsheetpanel { background: #fff; } -.v-sa .#{$primaryStyleName}-content { +.v-sa & .#{$primaryStyleName}-content { border-color: rgba(0,0,0,.1); } .blue .#{$primaryStyleName}-deco { @@ -118,7 +118,7 @@ background: #e2e2e2; overflow: hidden; } -.v-sa .#{$primaryStyleName}-deco { +.v-sa & .#{$primaryStyleName}-deco { border-top-color: rgba(0,0,0,.1); background: rgba(0,0,0,.08); } @@ -132,7 +132,7 @@ display: inline; float: none; } -.v-sa .#{$primaryStyleName}-tabs .v-captiontext { +.v-sa & .#{$primaryStyleName}-tabs .v-captiontext { display: inline-block; } .#{$primaryStyleName}-tabs .v-icon { @@ -145,12 +145,12 @@ height: 16px; background: transparent url(../common/icons/error.png) no-repeat 50%; } -.v-ie .#{$primaryStyleName}-tabs .v-errorindicator { +.v-ie & .#{$primaryStyleName}-tabs .v-errorindicator { zoom: 1; display: inline; } -.v-ie8 .#{$primaryStyleName}-tabs .v-errorindicator, -.v-ie9 .#{$primaryStyleName}-tabs .v-errorindicator { +.v-ie8 & .#{$primaryStyleName}-tabs .v-errorindicator, +.v-ie9 & .#{$primaryStyleName}-tabs .v-errorindicator { display: inline-block; } diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss index de0c29d516..2f1d0c7081 100644 --- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss +++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss @@ -52,7 +52,7 @@ .#{$primaryStyleName}-tabs-bar .#{$primaryStyleName}-caption-close { margin-top: 1px; } -.v-ff .#{$primaryStyleName}-tabs-bar .#{$primaryStyleName}-caption-close { +.v-ff & .#{$primaryStyleName}-tabs-bar .#{$primaryStyleName}-caption-close { margin-top: -14px; } .#{$primaryStyleName}-tabs-bar .#{$primaryStyleName}-caption-close:hover { |