#7053 Do not explicitly import base theme, fix paths for Chameleon loading indicator...

svn changeset:20017/svn branch:6.7

diff --git a/WebContent/VAADIN/themes/chameleon/common/common.css b/WebContent/VAADIN/themes/chameleon/common/common.css
index fba860110a767d4453ee5871a09605759fe4af83..e1a5bdce7a1341d92dee551d60561339426e712a 100644 (file)
--- a/WebContent/VAADIN/themes/chameleon/common/common.css
+++ b/WebContent/VAADIN/themes/chameleon/common/common.css
@@ -1,4 +1,7 @@
-@import "../../base/styles.css";
+/*
+ * Base theme is automatically included in the compiled theme.
+ * @import "../../base/styles.css";
+ */
 
 /*******************************************************************************
  * App background & tooltip
@@ -85,7 +88,7 @@
 .v-contextmenu,
 .v-Notification,
 .v-menubar-submenu {
-       background: #fff url(img/grad-light-top.png) repeat-x;
+       background: #fff url(../img/grad-light-top.png) repeat-x;
        background-color: rgba(255,255,255,.85);
        border: 1px solid #adadad;
        border-color: rgba(0,0,0,.4);
@@ -147,7 +150,7 @@
 .v-errorindicator {
        width: 13px;
        height: 1.4em;
-       background: transparent url(img/error-indicator.png) no-repeat right 50%;
+       background: transparent url(../img/error-indicator.png) no-repeat right 50%;
        }
 
 .v-caption-small .v-errorindicator {
@@ -161,5 +164,5 @@
 .v-tooltip .v-errormessage {
        color: #b2320b;
        padding-left: 14px;
-       background: transparent url(img/error-indicator.png) no-repeat 0 50%;
+       background: transparent url(../img/error-indicator.png) no-repeat 0 50%;
        }
\ No newline at end of file