From f2e58e4aa59fbe082e4e7ac1867f06c4b8e1e511 Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Fri, 29 Jul 2011 12:55:12 +0000
Subject: [PATCH] #7053 copy two icons from reindeer to chameleon

svn changeset:20027/svn branch:6.7
---
 .../themes/chameleon/components/table/table.css   |   4 ++--
 .../themes/chameleon/icons/bullet-white.png       | Bin 0 -> 154 bytes
 .../VAADIN/themes/chameleon/icons/bullet.png      | Bin 0 -> 218 bytes
 .../vaadin/buildhelpers/CompileDefaultTheme.java  |   2 --
 4 files changed, 2 insertions(+), 4 deletions(-)
 create mode 100644 WebContent/VAADIN/themes/chameleon/icons/bullet-white.png
 create mode 100644 WebContent/VAADIN/themes/chameleon/icons/bullet.png

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 0000000000000000000000000000000000000000..f0a0b1bfbae7e352fcdc441e8839ca57eae1bec0
GIT binary patch
literal 154
zcmeAS@N?(olHy`uVBq!ia0vp^Y#_`5A|IT2?*XJFOI#yLg7ec#$`gxH85~pclTsBt
za}(23gHjVyDhp4h+5i>Vc)B=-RNPAX_5Z)Uw7_<TkHQ*k8*fT9xcsj7xxhE6qSf`0
zs4z1h!=xGAt~HFzS3bol)bSlvFq3v@U}RWuEOJ@><BwKAa~M2b{an^LB{Ts5W0W!N

literal 0
HcmV?d00001

diff --git a/WebContent/VAADIN/themes/chameleon/icons/bullet.png b/WebContent/VAADIN/themes/chameleon/icons/bullet.png
new file mode 100644
index 0000000000000000000000000000000000000000..5047f6b27c40393593bd45d74505c8d05d92544e
GIT binary patch
literal 218
zcmeAS@N?(olHy`uVBq!ia0vp^Y#_`5A|IT2?*XJFOI#yLg7ec#$`gxH85~pclTsBt
za}(23gHjVyDhp4h+5i>Rc)B=-RNPA9;p|UKPDoh6{D_5(BZA?GuTK5HKUq(nJzV+V
z$rG0Dy8r+7{(3!K|BQ}~&YF`xK4*CB>;Ex%H{4J#oVLIIzfsNaUsD++|NQ>m-}v<R
z_VvY*k~6g?sQ&x^e|tk@h|i-B|NsBr`Tx()#T-ZC8!E0{Uw?lUBNGq9#-GLq*sfHt
Q0Nugh>FVdQ&MBb@0Q|6BDgXcg

literal 0
HcmV?d00001

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);
     }
 
-- 
2.39.5