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/liferay | |
| 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/liferay')
5 files changed, 15 insertions, 8 deletions
diff --git a/WebContent/VAADIN/themes/liferay/common/common.scss b/WebContent/VAADIN/themes/liferay/common/common.scss index a94431d4cb..0d653baf7c 100644 --- a/WebContent/VAADIN/themes/liferay/common/common.scss +++ b/WebContent/VAADIN/themes/liferay/common/common.scss @@ -1,6 +1,6 @@ @mixin liferay-common { -div.v-app { +body &.v-app { background-color: transparent; } diff --git a/WebContent/VAADIN/themes/liferay/legacy-styles.scss b/WebContent/VAADIN/themes/liferay/legacy-styles.scss new file mode 100644 index 0000000000..4f304fd397 --- /dev/null +++ b/WebContent/VAADIN/themes/liferay/legacy-styles.scss @@ -0,0 +1,6 @@ +@import "liferay.scss"; +// For legacy themes; does not wrap styles in .themename +// Creates legacy-styles.css that can be imported into non-sass themes. +// NOTE: can not be used in scenarios where multiple themes are used on the +// same page (e.g portals). +@include liferay;
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/liferay/select/select.scss b/WebContent/VAADIN/themes/liferay/select/select.scss index 3dbeaeab9d..d62bb43242 100644 --- a/WebContent/VAADIN/themes/liferay/select/select.scss +++ b/WebContent/VAADIN/themes/liferay/select/select.scss @@ -1,6 +1,6 @@ @mixin liferay-select { -.v-app select, +&.v-app select, .v-window select { padding: 1px; } diff --git a/WebContent/VAADIN/themes/liferay/styles.scss b/WebContent/VAADIN/themes/liferay/styles.scss index 030602a8b6..b76e5f756b 100644 --- a/WebContent/VAADIN/themes/liferay/styles.scss +++ b/WebContent/VAADIN/themes/liferay/styles.scss @@ -1,3 +1,4 @@ @import "liferay.scss"; - -@include liferay; +.liferay { + @include liferay; +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/liferay/textfield/textfield.scss b/WebContent/VAADIN/themes/liferay/textfield/textfield.scss index 9e3d2ece03..a260156bc8 100644 --- a/WebContent/VAADIN/themes/liferay/textfield/textfield.scss +++ b/WebContent/VAADIN/themes/liferay/textfield/textfield.scss @@ -1,9 +1,9 @@ @mixin liferay-textfield { -.v-app input[type="text"], -.v-app input[type="password"], -.v-app input[type="reset"], -.v-app textarea , +&.v-app input[type="text"], +&.v-app input[type="password"], +&.v-app input[type="reset"], +&.v-app textarea , .v-window input[type="text"], .v-window input[type="password"], .v-window input[type="reset"], |