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/base | |
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/base')
9 files changed, 14 insertions, 14 deletions
diff --git a/WebContent/VAADIN/themes/base/button/button.scss b/WebContent/VAADIN/themes/base/button/button.scss index 212e386e29..3ab0eb7aaa 100644 --- a/WebContent/VAADIN/themes/base/button/button.scss +++ b/WebContent/VAADIN/themes/base/button/button.scss @@ -66,7 +66,7 @@ } /* Inset Safari focus outline a bit */ -.v-sa .#{$primaryStyleName}-link:focus{ +.v-sa & .#{$primaryStyleName}-link:focus{ outline-offset: -3px; } diff --git a/WebContent/VAADIN/themes/base/button/nativebutton.scss b/WebContent/VAADIN/themes/base/button/nativebutton.scss index 724316a34d..f85bd507ab 100644 --- a/WebContent/VAADIN/themes/base/button/nativebutton.scss +++ b/WebContent/VAADIN/themes/base/button/nativebutton.scss @@ -60,13 +60,13 @@ float: none; } /* Fixes stretched buttons in IE7*/ -.v-ie .#{$primaryStyleName} { +.v-ie & .#{$primaryStyleName} { overflow: visible; padding-left: 1em; padding-right: 1em; } -.v-ie .#{$primaryStyleName}-link { +.v-ie & .#{$primaryStyleName}-link { padding: 0; } diff --git a/WebContent/VAADIN/themes/base/common/common.scss b/WebContent/VAADIN/themes/base/common/common.scss index 56da6e3051..ac9154d2dc 100644 --- a/WebContent/VAADIN/themes/base/common/common.scss +++ b/WebContent/VAADIN/themes/base/common/common.scss @@ -222,7 +222,7 @@ body &.v-app-loading { } /* Enable kinetic scrolling on Mobile Safari 6 */ -.v-ios.v-sa6 .v-scrollable { +.v-ios.v-sa6 & .v-scrollable { -webkit-overflow-scrolling: touch; } diff --git a/WebContent/VAADIN/themes/base/dragwrapper/dragwrapper.scss b/WebContent/VAADIN/themes/base/dragwrapper/dragwrapper.scss index 2baf8a4e09..e66f02e207 100644 --- a/WebContent/VAADIN/themes/base/dragwrapper/dragwrapper.scss +++ b/WebContent/VAADIN/themes/base/dragwrapper/dragwrapper.scss @@ -13,7 +13,7 @@ -khtml-user-select: none; -webkit-user-select: none; } -.v-ie .#{$primaryStyleName} a.drag-start { +.v-ie & .#{$primaryStyleName} a.drag-start { display: block; position: absolute; top: 0; diff --git a/WebContent/VAADIN/themes/base/select/select.scss b/WebContent/VAADIN/themes/base/select/select.scss index e45249ce66..31de83d859 100644 --- a/WebContent/VAADIN/themes/base/select/select.scss +++ b/WebContent/VAADIN/themes/base/select/select.scss @@ -12,7 +12,7 @@ white-space: nowrap; margin: 0 2px; } -.v-ie .#{$primaryStyleName}-optiongroup .#{$primaryStyleName}-option { +.v-ie & .#{$primaryStyleName}-optiongroup .#{$primaryStyleName}-option { zoom: 1; } .#{$primaryStyleName}-select { diff --git a/WebContent/VAADIN/themes/base/table/table.scss b/WebContent/VAADIN/themes/base/table/table.scss index 660c30a4cf..e48b582804 100644 --- a/WebContent/VAADIN/themes/base/table/table.scss +++ b/WebContent/VAADIN/themes/base/table/table.scss @@ -275,8 +275,8 @@ margin-left: -6px; background: transparent url(../common/img/drag-slot-dot.png); } -.v-ff .#{$primaryStyleName}-row-drag-bottom .#{$primaryStyleName}-cell-content:first-child:after, -.v-ie .#{$primaryStyleName}-row-drag-bottom .#{$primaryStyleName}-cell-content:first-child:after { +.v-ff & .#{$primaryStyleName}-row-drag-bottom .#{$primaryStyleName}-cell-content:first-child:after, +.v-ie & .#{$primaryStyleName}-row-drag-bottom .#{$primaryStyleName}-cell-content:first-child:after { margin-top: -2px; } diff --git a/WebContent/VAADIN/themes/base/textfield/textfield.scss b/WebContent/VAADIN/themes/base/textfield/textfield.scss index 1eb1203e97..de57e50e4d 100644 --- a/WebContent/VAADIN/themes/base/textfield/textfield.scss +++ b/WebContent/VAADIN/themes/base/textfield/textfield.scss @@ -46,8 +46,8 @@ textarea.v-textarea-readonly:focus { } */ /* Safari focus glow fix */ -.v-sa input:focus, -.v-sa textarea:focus { +.v-sa & input:focus, +.v-sa & textarea:focus { outline-width: medium; } diff --git a/WebContent/VAADIN/themes/base/tree/tree.scss b/WebContent/VAADIN/themes/base/tree/tree.scss index c1d1283f52..22bd3b7703 100644 --- a/WebContent/VAADIN/themes/base/tree/tree.scss +++ b/WebContent/VAADIN/themes/base/tree/tree.scss @@ -71,8 +71,8 @@ div.#{$primaryStyleName}-node-leaf { .#{$primaryStyleName} .#{$primaryStyleName}-node-caption-drag-center:after { margin-left: 14px; } -.v-ff .#{$primaryStyleName} .#{$primaryStyleName}-node-caption-drag-center:after, -.v-ie .#{$primaryStyleName} .#{$primaryStyleName}-node-caption-drag-center:after { +.v-ff & .#{$primaryStyleName} .#{$primaryStyleName}-node-caption-drag-center:after, +.v-ie & .#{$primaryStyleName} .#{$primaryStyleName}-node-caption-drag-center:after { margin-top: -2px; } .#{$primaryStyleName} .#{$primaryStyleName}-node-drag-top { diff --git a/WebContent/VAADIN/themes/base/upload/upload.scss b/WebContent/VAADIN/themes/base/upload/upload.scss index 71827480ae..933482764c 100644 --- a/WebContent/VAADIN/themes/base/upload/upload.scss +++ b/WebContent/VAADIN/themes/base/upload/upload.scss @@ -11,8 +11,8 @@ overflow: hidden; } -.v-ff .#{$primaryStyleName}-immediate, -.v-op .#{$primaryStyleName}-immediate { +.v-ff & .#{$primaryStyleName}-immediate, +.v-op & .#{$primaryStyleName}-immediate { display: inline-block; } |