aboutsummaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes/base/common
diff options
context:
space:
mode:
authorMarc Englund <marc@vaadin.com>2012-11-22 17:09:10 +0200
committerMarc Englund <marc@vaadin.com>2012-11-23 09:29:59 +0200
commitd6caa6043adef61387ccfece57336593641875c4 (patch)
tree64ad544c320a07b1ce7394cd06ecbb2c637a6abd /WebContent/VAADIN/themes/base/common
parente33302b9676ae62ea0bdc53ff6c6e3f4aea01522 (diff)
downloadvaadin-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/base/common')
-rw-r--r--WebContent/VAADIN/themes/base/common/common.scss26
1 files changed, 13 insertions, 13 deletions
diff --git a/WebContent/VAADIN/themes/base/common/common.scss b/WebContent/VAADIN/themes/base/common/common.scss
index b1e5ae1674..27a8f56a48 100644
--- a/WebContent/VAADIN/themes/base/common/common.scss
+++ b/WebContent/VAADIN/themes/base/common/common.scss
@@ -8,18 +8,18 @@
margin: 0;
overflow: hidden;
}
-.v-app {
+&.v-app {
height: 100%;
}
/* Force arrow cursor for all elements inside the app */
-.v-app,
+&.v-app,
.v-window,
.v-popupview-popup,
.v-label,
.v-caption {
cursor: default;
}
-div.v-app-loading {
+body &.v-app-loading {
/* You can use this to provide indication for the user that the application is loading. */
/* It is applied to the same element as .v-app */
background-image: url(img/loading-indicator.gif);
@@ -65,7 +65,7 @@ div.v-app-loading {
.v-ui:focus {
outline: none;
}
-.v-app select,
+&.v-app select,
.v-window select {
margin: 0;
}
@@ -77,10 +77,10 @@ div.v-app-loading {
.v-disabled * {
cursor: default;
}
-* html .v-disabled {
+* html & .v-disabled {
zoom: 1;
}
-*+html .v-disabled {
+*+html & .v-disabled {
zoom: 1;
}
.v-disabled .v-disabled {
@@ -217,16 +217,16 @@ div.v-app-loading {
font-size: xx-small;
}
/* Debug style */
-.v-app .invalidlayout,
-.v-app .invalidlayout * {
+&.v-app .invalidlayout,
+&.v-app .invalidlayout * {
background: #f99 !important;
}
/* Fix for Liferay, issue #2384 */
-.v-app input[type="text"],
-.v-app input[type="password"],
-.v-app input[type="reset"],
-.v-app select,
-.v-app textarea ,
+&.v-app input[type="text"],
+&.v-app input[type="password"],
+&.v-app input[type="reset"],
+&.v-app select,
+&.v-app textarea ,
.v-window input[type="text"],
.v-window input[type="password"],
.v-window input[type="reset"],