From d6caa6043adef61387ccfece57336593641875c4 Mon Sep 17 00:00:00 2001
From: Marc Englund <marc@vaadin.com>
Date: Thu, 22 Nov 2012 17:09:10 +0200
Subject: Fixes #6714  #10330 - wraps theme in themename{}, creates
 legacy-styles.css, updates themes to support this.

Change-Id: I185b67b2ee74dca2faf48ff2517f24280aff4375
---
 WebContent/VAADIN/themes/runo/common/common.scss | 14 +++++++-------
 WebContent/VAADIN/themes/runo/legacy-styles.scss |  6 ++++++
 WebContent/VAADIN/themes/runo/select/select.scss |  2 +-
 WebContent/VAADIN/themes/runo/styles.scss        |  4 +++-
 4 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 WebContent/VAADIN/themes/runo/legacy-styles.scss

(limited to 'WebContent/VAADIN/themes/runo')

diff --git a/WebContent/VAADIN/themes/runo/common/common.scss b/WebContent/VAADIN/themes/runo/common/common.scss
index 41ab6dae88..be39a1287a 100644
--- a/WebContent/VAADIN/themes/runo/common/common.scss
+++ b/WebContent/VAADIN/themes/runo/common/common.scss
@@ -3,7 +3,7 @@
 .v-generated-body {
 	background: #e9eced;
 }
-.v-app {
+&.v-app {
 	background: #e9eced url(img/main-bg.png) repeat-x;
 	font-family: "Trebuchet MS", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", geneva, helvetica, arial, tahoma, verdana, sans-serif;
 	color: #464f52;
@@ -11,14 +11,14 @@
 	line-height: 18px;
 }
 /* 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,
@@ -37,7 +37,7 @@
 	color: #464f52;
 	font-size: 13px;
 }
-.v-app select,
+&.v-app select,
 .v-window select {
 	padding: 0;
 }
diff --git a/WebContent/VAADIN/themes/runo/legacy-styles.scss b/WebContent/VAADIN/themes/runo/legacy-styles.scss
new file mode 100644
index 0000000000..29ccb22aa5
--- /dev/null
+++ b/WebContent/VAADIN/themes/runo/legacy-styles.scss
@@ -0,0 +1,6 @@
+@import "runo.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 runo;
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/runo/select/select.scss b/WebContent/VAADIN/themes/runo/select/select.scss
index e043f143e3..64188eed09 100644
--- a/WebContent/VAADIN/themes/runo/select/select.scss
+++ b/WebContent/VAADIN/themes/runo/select/select.scss
@@ -19,7 +19,7 @@
 	background: transparent url(img/bg-left-filter.png) no-repeat;
 	padding-left: 4px;
 }
-.v-app .v-filterselect .v-filterselect-input,
+&.v-app .v-filterselect .v-filterselect-input,
 .v-window .v-filterselect .v-filterselect-input,
 .v-popupview-popup .v-filterselect .v-filterselect-input {
 	background: transparent url(img/bg-center-filter.png) no-repeat 1px 0;
diff --git a/WebContent/VAADIN/themes/runo/styles.scss b/WebContent/VAADIN/themes/runo/styles.scss
index 987b1425b6..cfcb8bfa78 100644
--- a/WebContent/VAADIN/themes/runo/styles.scss
+++ b/WebContent/VAADIN/themes/runo/styles.scss
@@ -1,2 +1,4 @@
 @import "runo.scss";
-@include runo;
\ No newline at end of file
+.runo {
+	@include runo;
+}
\ No newline at end of file
-- 
cgit v1.2.3