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

diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss
index c26c259e1d6b2b0d25dbeaf045087227228dff76..a16b063ba81a3a1048eb4c58626846294fc84eab 100644 (file)
--- 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 f636359a385ce399decc6965693fe4428b77952e..56da6e305141b874cdd24fdcc0cf1ff784a098da 100644 (file)
--- 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 821f041789380cc6fe2e8a86d758b2426ef1432f..f06a7a763888e0dd71871142054db7c60caa909f 100644 (file)
--- 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 ef827190b56e67b2e6c3a9e0395c1ee4b3ce6e92..ce6b54610ed1ffd0d04b67081d4ca9a2e0fdad4e 100644 (file)
--- 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 be39a1287aaa1953bcc31e33f21dd5a78d1e3ccb..9d4b4a4858665f294c93f2357d2b2c1c97a92e39 100644 (file)
--- 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 04f1ec5f1362073047e527d7642451f5732f000c..de4d2b3bbdd23e2705d87686f3af6af1d51ca1f8 100644 (file)
--- 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;