summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes/liferay
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/liferay
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/liferay')
-rw-r--r--WebContent/VAADIN/themes/liferay/button/button.scss4
-rw-r--r--WebContent/VAADIN/themes/liferay/datefield/datefield.scss8
-rw-r--r--WebContent/VAADIN/themes/liferay/panel/panel.scss12
-rw-r--r--WebContent/VAADIN/themes/liferay/table/table.scss2
4 files changed, 13 insertions, 13 deletions
diff --git a/WebContent/VAADIN/themes/liferay/button/button.scss b/WebContent/VAADIN/themes/liferay/button/button.scss
index 3a2e4a7acb..9835628d31 100644
--- a/WebContent/VAADIN/themes/liferay/button/button.scss
+++ b/WebContent/VAADIN/themes/liferay/button/button.scss
@@ -91,12 +91,12 @@ button.v-nativebutton-link-pressed,
}
.v-button-link:focus,
-.v-sa .v-button-link:focus {
+.v-sa & .v-button-link:focus {
outline: 1px dotted #1b699f;
outline-offset: -1px;
}
-.v-sa .v-button-link:focus {
+.v-sa & .v-button-link:focus {
outline-offset: -1px;
}
diff --git a/WebContent/VAADIN/themes/liferay/datefield/datefield.scss b/WebContent/VAADIN/themes/liferay/datefield/datefield.scss
index 97fb25cfe5..608b4504b0 100644
--- a/WebContent/VAADIN/themes/liferay/datefield/datefield.scss
+++ b/WebContent/VAADIN/themes/liferay/datefield/datefield.scss
@@ -83,10 +83,10 @@ span.#{$primaryStyleName}-calendarpanel-month {
border-radius: 0;
}
-.v-ie .#{$primaryStyleName}-calendarpanel-prevyear button,
-.v-ie .#{$primaryStyleName}-calendarpanel-nextyear button,
-.v-ie .#{$primaryStyleName}-calendarpanel-prevmonth button,
-.v-ie .#{$primaryStyleName}-calendarpanel-nextmonth button {
+.v-ie & .#{$primaryStyleName}-calendarpanel-prevyear button,
+.v-ie & .#{$primaryStyleName}-calendarpanel-nextyear button,
+.v-ie & .#{$primaryStyleName}-calendarpanel-prevmonth button,
+.v-ie & .#{$primaryStyleName}-calendarpanel-nextmonth button {
text-indent: 0;
font-size: 1px;
}
diff --git a/WebContent/VAADIN/themes/liferay/panel/panel.scss b/WebContent/VAADIN/themes/liferay/panel/panel.scss
index 79172b2474..cb65560a74 100644
--- a/WebContent/VAADIN/themes/liferay/panel/panel.scss
+++ b/WebContent/VAADIN/themes/liferay/panel/panel.scss
@@ -61,11 +61,11 @@
}
/* IE specific rules */
-.v-ie .v-panel {
+.v-ie & .v-panel {
background: transparent;
}
-.v-ie .v-panel-caption,
-.v-ie .v-panel-nocaption {
+.v-ie & .v-panel-caption,
+.v-ie & .v-panel-nocaption {
border: 1px solid #999;
border-bottom: none;
background: #c0c2c5 url(/html/themes/classic/images/application/panel_header_bg.png) repeat-x 0 0;
@@ -73,13 +73,13 @@
padding-left: 5px;
}
-.v-ie .v-panel-caption-light,
-.v-ie .v-panel-nocaption-light {
+.v-ie & .v-panel-caption-light,
+.v-ie & .v-panel-nocaption-light {
border: none;
background: transparent;
}
-.v-ie .v-panel-caption-light {
+.v-ie & .v-panel-caption-light {
border-bottom: 1px solid #999;
}
diff --git a/WebContent/VAADIN/themes/liferay/table/table.scss b/WebContent/VAADIN/themes/liferay/table/table.scss
index 0e1b96f5b0..ecb260709b 100644
--- a/WebContent/VAADIN/themes/liferay/table/table.scss
+++ b/WebContent/VAADIN/themes/liferay/table/table.scss
@@ -64,7 +64,7 @@
margin: -4px 3px 0 0;
}
-.v-ie .v-table-caption-container .v-icon {
+.v-ie & .v-table-caption-container .v-icon {
margin-top: -2px;
}