diff options
author | Marc Englund <marc@vaadin.com> | 2012-11-22 17:09:10 +0200 |
---|---|---|
committer | Marc Englund <marc@vaadin.com> | 2012-11-23 09:29:59 +0200 |
commit | d6caa6043adef61387ccfece57336593641875c4 (patch) | |
tree | 64ad544c320a07b1ce7394cd06ecbb2c637a6abd /WebContent/VAADIN/themes/reindeer/common | |
parent | e33302b9676ae62ea0bdc53ff6c6e3f4aea01522 (diff) | |
download | vaadin-framework-d6caa6043adef61387ccfece57336593641875c4.tar.gz vaadin-framework-d6caa6043adef61387ccfece57336593641875c4.zip |
Fixes #6714 #10330 - wraps theme in themename{}, creates legacy-styles.css, updates themes to support this.
Change-Id: I185b67b2ee74dca2faf48ff2517f24280aff4375
Diffstat (limited to 'WebContent/VAADIN/themes/reindeer/common')
-rw-r--r-- | WebContent/VAADIN/themes/reindeer/common/common.scss | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/common/common.scss b/WebContent/VAADIN/themes/reindeer/common/common.scss index 10e8e18e4c..821f041789 100644 --- a/WebContent/VAADIN/themes/reindeer/common/common.scss +++ b/WebContent/VAADIN/themes/reindeer/common/common.scss @@ -1,18 +1,18 @@ @mixin reindeer-common { .v-generated-body, -.v-app { +&.v-app { background: #f5f5f5; } /* Global font styles */ -.v-app, +&.v-app, .v-window, .v-popupview-popup, .v-tooltip, -.v-app input, -.v-app select, -.v-app button, -.v-app textarea, +&.v-app input, +&.v-app select, +&.v-app button, +&.v-app textarea, .v-window input, .v-window select, .v-window button, @@ -34,7 +34,7 @@ color: #222; } /* Fonts on black background */ -.v-app .black, +&.v-app .black, .v-window-black, .v-window .black, .v-popupview-popup .black { @@ -110,13 +110,13 @@ } /* Fixes for Liferay 6.0 */ -.portlet .v-app { +.portlet &.v-app { background: transparent; } -.portlet .v-app .v-radiobutton input, +.portlet &.v-app .v-radiobutton input, .portlet .v-window .v-radiobutton input, .portlet .v-popupview-popup .v-radiobutton input, -.portlet .v-app .v-checkbox input, +.portlet &.v-app .v-checkbox input, .portlet .v-window .v-checkbox input, .portlet .v-popupview-popup .v-checkbox input { margin-right: 3px; |