Fix chameleon "body" css selectors (#10382)

Change-Id: I39095703e74bdcad16d4b6cb700cc5f1953a66c6

diff --git a/WebContent/VAADIN/themes/chameleon/components/label/label.scss b/WebContent/VAADIN/themes/chameleon/components/label/label.scss
index 7471242f70b96be5bc50a27a3c97aff22b6e5739..a1c75ad2f1d4dc2819c573635ebb8c99a533f0a2 100644 (file)
--- a/WebContent/VAADIN/themes/chameleon/components/label/label.scss
+++ b/WebContent/VAADIN/themes/chameleon/components/label/label.scss
@@ -73,8 +73,8 @@
 /*******************************************************************************
  * Warning & error
  ******************************************************************************/
-body .v-label-warning,
-body .v-label-error {
+&.v-app .v-label-warning,
+&.v-app .v-label-error {
        color: #574734;
        background: #fffec8 url(../../img/label-warning-icon.png) no-repeat .2em 50%;
        white-space: nowrap;
@@ -87,7 +87,7 @@ body .v-label-error {
        text-shadow: none;
        }
 
-body .v-label-error {
+&.v-app .v-label-error {
        color: #fff;
        font-weight: bold;
        background: #c22f24 url(../../img/label-error-icon.png) no-repeat .2em 50%;
@@ -113,7 +113,7 @@ body .v-label-error {
 /*******************************************************************************
  * Loading
  ******************************************************************************/
-body .v-label-loading {
+&.v-app .v-label-loading {
        height: 32px;
        line-height: 32px;
        background-image: url(../../../base/common/img/loading-indicator.gif);

diff --git a/WebContent/VAADIN/themes/chameleon/components/selects/selects.scss b/WebContent/VAADIN/themes/chameleon/components/selects/selects.scss
index e5b41b31237a7a1d887bd805fb2d4c1736ca0d4a..bc0d75e35ba0d9f2faecd516b639e3b694e35b38 100644 (file)
--- a/WebContent/VAADIN/themes/chameleon/components/selects/selects.scss
+++ b/WebContent/VAADIN/themes/chameleon/components/selects/selects.scss
@@ -4,7 +4,7 @@
        overflow: hidden;
        }
 
-body input.v-filterselect-input {
+&.v-app input.v-filterselect-input {
        margin: 0;
        padding: 0;
        border: none;
@@ -12,7 +12,7 @@ body input.v-filterselect-input {
        line-height: normal;
        }
 
-body input.v-filterselect-input[type=text] {
+&.v-app input.v-filterselect-input[type=text] {
        padding: 0;
        }
 
@@ -52,11 +52,11 @@ body input.v-filterselect-input[type=text] {
     line-height:1.4em;
 }      
 
-body .v-filterselect-suggestpopup-small td {
+&.v-app .v-filterselect-suggestpopup-small td {
        font-size: .85em;
        }
 
-body .v-filterselect-suggestpopup-big td {
+&.v-app .v-filterselect-suggestpopup-big td {
        font-size: 1.1em;
        }
 

diff --git a/WebContent/VAADIN/themes/chameleon/components/splitpanel/splitpanel.scss b/WebContent/VAADIN/themes/chameleon/components/splitpanel/splitpanel.scss
index 99f51edc01b40e4d97c42bbab8983742b12a2f8e..e2bcf0a909ee56e1744fa2c7ae5c39c503f3ccf8 100644 (file)
--- a/WebContent/VAADIN/themes/chameleon/components/splitpanel/splitpanel.scss
+++ b/WebContent/VAADIN/themes/chameleon/components/splitpanel/splitpanel.scss
@@ -35,15 +35,15 @@
 /*******************************************************************************
  * Small
  ******************************************************************************/
-body .v-splitpanel-hsplitter-small,
-body .v-splitpanel-hsplitter-small-locked {
+&.v-app .v-splitpanel-hsplitter-small,
+&.v-app .v-splitpanel-hsplitter-small-locked {
        width: 1px;
        border: none;
        background-image: none;
        }
 
-body .v-splitpanel-vsplitter-small,
-body .v-splitpanel-vsplitter-small-locked {
+&.v-app .v-splitpanel-vsplitter-small,
+&.v-app .v-splitpanel-vsplitter-small-locked {
        height: 1px;
        border: none;
        background-image: none;

diff --git a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss b/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss
index edbdf5eff5881f032dc6797581c531c407a8421d..026a7e5bfeba43d84fa0567b8757506b36bceac2 100644 (file)
--- a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss
+++ b/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss
@@ -32,9 +32,9 @@ input.v-widget.v-textfield[type="text"],
        height: 1.6em;
        }
 
-body input.v-textfield,
-body textarea.v-textarea,
-body input.v-filterselect-input {
+&.v-app input.v-textfield,
+&.v-app textarea.v-textarea,
+&.v-app input.v-filterselect-input {
        color: #222;
        }
 
@@ -44,8 +44,8 @@ body input.v-filterselect-input {
        border-top-color: #808080;
        }
 
-body input.v-textfield-prompt,
-body textarea.v-textarea-prompt {
+&.v-app input.v-textfield-prompt,
+&.v-app textarea.v-textarea-prompt {
        font-style: normal;
        color: #999;
        }
@@ -69,8 +69,8 @@ textarea.v-textarea-readonly {
 /*******************************************************************************
  * Small
  ******************************************************************************/
-body input.v-textfield-small,
-body textarea.v-textarea-small,
+&.v-app input.v-textfield-small,
+&.v-app textarea.v-textarea-small,
 .v-datefield-small .v-datefield-textfield,
 .v-datefield-small .v-datefield-button,
 .v-filterselect-small .v-filterselect-input {
@@ -81,8 +81,8 @@ body textarea.v-textarea-small,
 /*******************************************************************************
  * Big (and big search)
  ******************************************************************************/
-body input.v-textfield-big,
-body textarea.v-textarea-big,
+&.v-app input.v-textfield-big,
+&.v-app textarea.v-textarea-big,
 .v-datefield-big .v-datefield-textfield,
 .v-datefield-big .v-datefield-button,
 .v-filterselect-big .v-filterselect-input {