aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--WebContent/VAADIN/themes/chameleon/components/table/table.css4
-rw-r--r--WebContent/VAADIN/themes/chameleon/icons/bullet-white.pngbin0 -> 154 bytes
-rw-r--r--WebContent/VAADIN/themes/chameleon/icons/bullet.pngbin0 -> 218 bytes
-rw-r--r--build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java2
4 files changed, 2 insertions, 4 deletions
diff --git a/WebContent/VAADIN/themes/chameleon/components/table/table.css b/WebContent/VAADIN/themes/chameleon/components/table/table.css
index 74b9c88223..ae1ada0793 100644
--- a/WebContent/VAADIN/themes/chameleon/components/table/table.css
+++ b/WebContent/VAADIN/themes/chameleon/components/table/table.css
@@ -67,7 +67,7 @@ div.v-table-focus-slot-right {
.v-contextmenu .v-on,
.v-contextmenu .v-off {
display: block;
- background: transparent url(../../../reindeer/common/icons/bullet.png) no-repeat 0 4px;
+ background: transparent url(../../icons/bullet.png) no-repeat 0 4px;
padding-left: 12px;
}
@@ -77,7 +77,7 @@ div.v-table-focus-slot-right {
}
.v-contextmenu .gwt-MenuItem-selected .v-on {
- background-image: url(../../../reindeer/common/icons/bullet-white.png);
+ background-image: url(../../icons/bullet-white.png);
}
.v-table-scrollposition {
diff --git a/WebContent/VAADIN/themes/chameleon/icons/bullet-white.png b/WebContent/VAADIN/themes/chameleon/icons/bullet-white.png
new file mode 100644
index 0000000000..f0a0b1bfba
--- /dev/null
+++ b/WebContent/VAADIN/themes/chameleon/icons/bullet-white.png
Binary files differ
diff --git a/WebContent/VAADIN/themes/chameleon/icons/bullet.png b/WebContent/VAADIN/themes/chameleon/icons/bullet.png
new file mode 100644
index 0000000000..5047f6b27c
--- /dev/null
+++ b/WebContent/VAADIN/themes/chameleon/icons/bullet.png
Binary files differ
diff --git a/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java b/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java
index dd4e1c75ac..2c4867e773 100644
--- a/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java
+++ b/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java
@@ -46,8 +46,6 @@ public class CompileDefaultTheme {
combineTheme(new String[] { BASE, RUNO }, false, ver);
combineTheme(new String[] { BASE, REINDEER }, true, ver);
combineTheme(new String[] { BASE, LIFERAY }, false, ver);
- // Chameleon uses some images from reindeer but does not require
- // compilation together with it
combineTheme(new String[] { BASE, CHAMELEON }, false, ver);
}