#7053 copy two icons from reindeer to chameleon

svn changeset:20027/svn branch:6.7

diff --git a/WebContent/VAADIN/themes/chameleon/components/table/table.css b/WebContent/VAADIN/themes/chameleon/components/table/table.css
index 74b9c88223ff35b80aadeb4e43ae9198bc394922..ae1ada07932c93212c36711b7f629b4f69c35a99 100644 (file)
--- 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 (file)
index 0000000..f0a0b1b
Binary files /dev/null and b/WebContent/VAADIN/themes/chameleon/icons/bullet-white.png differ

diff --git a/WebContent/VAADIN/themes/chameleon/icons/bullet.png b/WebContent/VAADIN/themes/chameleon/icons/bullet.png
new file mode 100644 (file)
index 0000000..5047f6b
Binary files /dev/null and b/WebContent/VAADIN/themes/chameleon/icons/bullet.png differ

diff --git a/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java b/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java
index dd4e1c75ac585c6a23349855dc9f5c8edf4fb79d..2c4867e7730195b0e64db7661e83c79702dacc57 100644 (file)
--- 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);
     }