summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes
diff options
context:
space:
mode:
authorHenri Sara <henri.sara@itmill.com>2011-07-29 08:11:29 +0000
committerHenri Sara <henri.sara@itmill.com>2011-07-29 08:11:29 +0000
commite03ef4cc2db66d0904e323dfc660bd18eb450abb (patch)
treeff209b4eec793c25da8e779be2e0d97c27516504 /WebContent/VAADIN/themes
parent2cfdbc9becea1f9f26db1542a4cc4c7198d2225e (diff)
downloadvaadin-framework-e03ef4cc2db66d0904e323dfc660bd18eb450abb.tar.gz
vaadin-framework-e03ef4cc2db66d0904e323dfc660bd18eb450abb.zip
#7053 Do not explicitly import base theme, fix paths for Chameleon loading indicator images
svn changeset:20017/svn branch:6.7
Diffstat (limited to 'WebContent/VAADIN/themes')
-rw-r--r--WebContent/VAADIN/themes/chameleon/common/common.css11
1 files changed, 7 insertions, 4 deletions
diff --git a/WebContent/VAADIN/themes/chameleon/common/common.css b/WebContent/VAADIN/themes/chameleon/common/common.css
index fba860110a..e1a5bdce7a 100644
--- 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