From 464a7d721c3c97f7f3033bd7e22fe94c33fe698c Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 23 Nov 2012 18:12:03 +0200
Subject: [PATCH] Ensure generated-body rules are not prefixed (#10360)

This should not cause issue with multiple themes as you do not have a generated body then.

Change-Id: I9391ee006de9c5759df0d7e1a7d6470caf82a8c4
---
 WebContent/VAADIN/themes/base/base.scss              | 9 +++++++++
 WebContent/VAADIN/themes/base/common/common.scss     | 8 --------
 WebContent/VAADIN/themes/reindeer/common/common.scss | 1 -
 WebContent/VAADIN/themes/reindeer/reindeer.scss      | 4 ++++
 WebContent/VAADIN/themes/runo/common/common.scss     | 3 ---
 WebContent/VAADIN/themes/runo/runo.scss              | 4 ++++
 6 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss
index c26c259e1d..a16b063ba8 100644
--- a/WebContent/VAADIN/themes/base/base.scss
+++ b/WebContent/VAADIN/themes/base/base.scss
@@ -38,6 +38,15 @@
 @import "window/window.scss";
 @import "debug/debug.scss";
 
+/* References the BODY tag generated by Vaadin application servlet */
+.v-generated-body {
+	width: 100%;
+	height: 100%;
+	border: 0;
+	margin: 0;
+	overflow: hidden;
+}
+
 @mixin base {
 	// @include base-app;
 	
diff --git a/WebContent/VAADIN/themes/base/common/common.scss b/WebContent/VAADIN/themes/base/common/common.scss
index f636359a38..56da6e3051 100644
--- a/WebContent/VAADIN/themes/base/common/common.scss
+++ b/WebContent/VAADIN/themes/base/common/common.scss
@@ -1,13 +1,5 @@
 @mixin base-common {
 
-/* References the BODY tag generated by Vaadin application servlet */
-.v-generated-body {
-	width: 100%;
-	height: 100%;
-	border: 0;
-	margin: 0;
-	overflow: hidden;
-}
 &.v-app {
 	height: 100%;
 }
diff --git a/WebContent/VAADIN/themes/reindeer/common/common.scss b/WebContent/VAADIN/themes/reindeer/common/common.scss
index 821f041789..f06a7a7638 100644
--- a/WebContent/VAADIN/themes/reindeer/common/common.scss
+++ b/WebContent/VAADIN/themes/reindeer/common/common.scss
@@ -1,6 +1,5 @@
 @mixin reindeer-common {
 
-.v-generated-body,
 &.v-app {
 	background: #f5f5f5;
 }
diff --git a/WebContent/VAADIN/themes/reindeer/reindeer.scss b/WebContent/VAADIN/themes/reindeer/reindeer.scss
index ef827190b5..ce6b54610e 100644
--- a/WebContent/VAADIN/themes/reindeer/reindeer.scss
+++ b/WebContent/VAADIN/themes/reindeer/reindeer.scss
@@ -28,6 +28,10 @@
 @import "tree/tree.scss";
 @import "window/window.scss";
 
+.v-generated-body {
+	background: #f5f5f5;
+}
+
 @mixin reindeer {
 	// should this be here?
 	@include base;
diff --git a/WebContent/VAADIN/themes/runo/common/common.scss b/WebContent/VAADIN/themes/runo/common/common.scss
index be39a1287a..9d4b4a4858 100644
--- a/WebContent/VAADIN/themes/runo/common/common.scss
+++ b/WebContent/VAADIN/themes/runo/common/common.scss
@@ -1,8 +1,5 @@
 @mixin runo-common {
 
-.v-generated-body {
-	background: #e9eced;
-}
 &.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;
diff --git a/WebContent/VAADIN/themes/runo/runo.scss b/WebContent/VAADIN/themes/runo/runo.scss
index 04f1ec5f13..de4d2b3bbd 100644
--- a/WebContent/VAADIN/themes/runo/runo.scss
+++ b/WebContent/VAADIN/themes/runo/runo.scss
@@ -27,6 +27,10 @@
 @import "tree/tree.scss";
 @import "window/window.scss";
 
+.v-generated-body {
+	background: #e9eced;
+}
+
 @mixin runo {
 	// TODO move?
 	@include base;
-- 
2.39.5