summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes/chameleon
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-11-23 19:43:19 +0200
committerArtur Signell <artur@vaadin.com>2012-11-23 20:44:25 +0200
commitf60f4bffa65f0031c2b094e7d9200c3df20c69ea (patch)
tree477b67f581087f415a94cf7cea8e41d418d9e564 /WebContent/VAADIN/themes/chameleon
parentd553c3eca98e574d8d6a0b1f2a0276093f53b55e (diff)
downloadvaadin-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/chameleon')
-rw-r--r--WebContent/VAADIN/themes/chameleon/common/common.scss2
-rw-r--r--WebContent/VAADIN/themes/chameleon/components/button/button.scss26
-rw-r--r--WebContent/VAADIN/themes/chameleon/components/datefield/datefield.scss4
-rw-r--r--WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss6
4 files changed, 19 insertions, 19 deletions
diff --git a/WebContent/VAADIN/themes/chameleon/common/common.scss b/WebContent/VAADIN/themes/chameleon/common/common.scss
index a38ed62eb9..050d100673 100644
--- a/WebContent/VAADIN/themes/chameleon/common/common.scss
+++ b/WebContent/VAADIN/themes/chameleon/common/common.scss
@@ -31,7 +31,7 @@ $chameleon-line-height: 1.4;
-moz-border-radius: 4px;
}
- .v-sa .v-tooltip {
+ .v-sa & .v-tooltip {
outline: 1px solid rgba(0,0,0,.2);
-webkit-border-radius: 0;
-moz-border-radius: 0;
diff --git a/WebContent/VAADIN/themes/chameleon/components/button/button.scss b/WebContent/VAADIN/themes/chameleon/components/button/button.scss
index beeba2478f..28d96991a7 100644
--- a/WebContent/VAADIN/themes/chameleon/components/button/button.scss
+++ b/WebContent/VAADIN/themes/chameleon/components/button/button.scss
@@ -1,14 +1,14 @@
@mixin chameleon-button {
.v-button:active,
-.v-ie8 .v-pressed.v-button,
+.v-ie8 & .v-pressed.v-button,
div.v-button-down {
background-image: url(../../img/grad-dark-bottom2.png);
background-color: #afafaf;
}
.v-button:active .v-button-wrap,
-.v-ie8 .v-pressed.v-button .v-button-wrap,
+.v-ie8 & .v-pressed.v-button .v-button-wrap,
.v-button-down .v-button-wrap {
background-image: url(../../img/grad-dark-top2.png);
border: 1px solid #888;
@@ -55,10 +55,10 @@ div.v-button-down .v-button-wrap {
-ms-text-overflow: ellipsis;
}
-.v-sa .v-button,
-.v-sa .v-button-wrap,
-.v-ff .v-button,
-.v-ff .v-button-wrap {
+.v-sa & .v-button,
+.v-sa & .v-button-wrap,
+.v-ff & .v-button,
+.v-ff & .v-button-wrap {
overflow: hidden;
}
@@ -96,7 +96,7 @@ div.v-button-down .v-button-wrap {
}
.v-button-small:active .v-button-wrap,
-.v-ie8 .v-button-small.v-pressed .v-button-wrap,
+.v-ie8 & .v-button-small.v-pressed .v-button-wrap,
.v-button-down.small .v-button-wrap {
padding: 2px 10px;
}
@@ -116,7 +116,7 @@ div.v-button-down .v-button-wrap {
}
.v-button-wide:active .v-button-wrap,
-.v-ie8 .v-button-wide.v-pressed .v-button-wrap {
+.v-ie8 & .v-button-wide.v-pressed .v-button-wrap {
padding-left: 25px;
padding-right: 25px;
}
@@ -131,7 +131,7 @@ div.v-button-down .v-button-wrap {
}
.v-button-tall:active .v-button-wrap,
-.v-ie8 .v-button-tall.v-pressed .v-button-wrap {
+.v-ie8 & .v-button-tall.v-pressed .v-button-wrap {
padding-top: 12px;
padding-bottom: 12px;
}
@@ -154,13 +154,13 @@ div.v-button-link:focus,
.v-button-link:active,
div.v-disabled.v-button-link,
div.v-disabled.v-button-link:focus,
-body.v-ie .v-pressed.v-button-link,
+body.v-ie & .v-pressed.v-button-link,
div.v-button-borderless,
div.v-button-borderless:focus,
.v-button-borderless:active,
div.v-disabled.v-button-borderless,
div.v-disabled.v-button-borderless:focus,
-body.v-ie .v-pressed.v-button-borderless {
+body.v-ie & .v-pressed.v-button-borderless {
background: transparent;
font-weight: normal;
text-shadow: none;
@@ -180,13 +180,13 @@ div.v-button-link:focus .v-button-wrap,
.v-button-link:active .v-button-wrap,
div.v-disabled.v-button-link .v-button-wrap,
div.v-disabled.v-button-link:focus .v-button-wrap,
-body.v-ie .v-pressed.v-button-link .v-button-wrap,
+body.v-ie & .v-pressed.v-button-link .v-button-wrap,
div.v-button-borderless .v-button-wrap,
div.v-button-borderless:focus .v-button-wrap,
.v-button-borderless:active .v-button-wrap,
div.v-disabled.v-button-borderless .v-button-wrap,
div.v-disabled.v-button-borderless:focus .v-button-wrap,
-body.v-ie .v-pressed.v-button-borderless .v-button-wrap {
+body.v-ie & .v-pressed.v-button-borderless .v-button-wrap {
background: transparent;
font-weight: normal;
text-shadow: none;
diff --git a/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.scss b/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.scss
index 791b564449..bd9c89bb33 100644
--- a/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.scss
+++ b/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.scss
@@ -25,12 +25,12 @@
height: 1.2em;
}
-.v-ie8 .#{$primaryStyleName}-button {
+.v-ie8 & .#{$primaryStyleName}-button {
height: 1.6em;
padding: 0;
}
-.v-ie8 .#{$primaryStyleName}-big .#{$primaryStyleName}-button {
+.v-ie8 & .#{$primaryStyleName}-big .#{$primaryStyleName}-button {
height: 1.8em;
}
diff --git a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss b/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss
index 335b9d9451..edbdf5eff5 100644
--- a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss
+++ b/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss
@@ -38,9 +38,9 @@ body input.v-filterselect-input {
color: #222;
}
-.v-ie input.v-textfield,
-.v-ie textarea.v-textarea,
-.v-ie .v-filterselect {
+.v-ie & input.v-textfield,
+.v-ie & textarea.v-textarea,
+.v-ie & .v-filterselect {
border-top-color: #808080;
}