Merge from 6.6

svn changeset:19412/svn branch:6.7

15 files changed, 23 insertions, 3 deletions

diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png
deleted file mode 100644
index 90a73be23f..0000000000
--- a/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites.png b/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites.png
deleted file mode 100644
index 744ca30d64..0000000000
--- a/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png
deleted file mode 100644
index 8ccaa56edd..0000000000
--- a/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/button-sprites.png b/WebContent/VAADIN/themes/reindeer/button/img/button-sprites.png
deleted file mode 100644
index 5087e8e957..0000000000
--- a/WebContent/VAADIN/themes/reindeer/button/img/button-sprites.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png
deleted file mode 100644
index 84c52dbf4c..0000000000
--- a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites.png b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites.png
deleted file mode 100644
index 387abf2d4b..0000000000
--- a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/common/img/horizontal-sprites.png b/WebContent/VAADIN/themes/reindeer/common/img/horizontal-sprites.png
deleted file mode 100644
index 7980a5aa18..0000000000
--- a/WebContent/VAADIN/themes/reindeer/common/img/horizontal-sprites.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png
deleted file mode 100644
index a7ace8b131..0000000000
--- a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites.png b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites.png
deleted file mode 100644
index 31571144df..0000000000
--- a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/menubar/img/checked-selected.png b/WebContent/VAADIN/themes/reindeer/menubar/img/checked-selected.png
new file mode 100644
index 0000000000..192c404617
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/menubar/img/checked-selected.png
diff --git a/WebContent/VAADIN/themes/reindeer/menubar/img/checked.png b/WebContent/VAADIN/themes/reindeer/menubar/img/checked.png
new file mode 100644
index 0000000000..418e951166
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/menubar/img/checked.png
diff --git a/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked-selected.png b/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked-selected.png
new file mode 100644
index 0000000000..bac6587c20
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked-selected.png
diff --git a/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked.png b/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked.png
new file mode 100644
index 0000000000..92a2b582c5
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked.png
diff --git a/WebContent/VAADIN/themes/reindeer/menubar/menubar.css b/WebContent/VAADIN/themes/reindeer/menubar/menubar.css
index f3e620353a..e5e337725e 100644
--- a/WebContent/VAADIN/themes/reindeer/menubar/menubar.css
+++ b/WebContent/VAADIN/themes/reindeer/menubar/menubar.css
@@ -49,4 +49,24 @@
 }
 .v-menubar-submenu .v-menubar-menuitem-selected .v-menubar-submenu-indicator {
 	background-image: url(img/submenu-icon-hover.png);
-}
\ No newline at end of file
+}
+
+/* Checkboxes for checkable/checked menu items */
+.v-menubar-submenu-check-column .v-menubar-menuitem {
+	padding-left: 6px;
+}
+.v-menubar-submenu-check-column .v-menubar-menuitem-caption {
+	padding-left: 18px;
+}
+.v-menubar-submenu .v-menubar-menuitem-checked .v-menubar-menuitem-caption { 
+	background: transparent url(img/checked.png) no-repeat left;
+}
+.v-menubar-submenu .v-menubar-menuitem-unchecked .v-menubar-menuitem-caption {
+	background: transparent url(img/unchecked.png) no-repeat left;
+}
+.v-menubar-submenu .v-menubar-menuitem-selected-checked .v-menubar-menuitem-caption { 
+	background: transparent url(img/checked-selected.png) no-repeat left;
+}
+.v-menubar-submenu .v-menubar-menuitem-selected-unchecked .v-menubar-menuitem-caption {
+	background: transparent url(img/unchecked-selected.png) no-repeat left;
+}
diff --git a/WebContent/VAADIN/themes/reindeer/tree/tree.css b/WebContent/VAADIN/themes/reindeer/tree/tree.css
index 4f31d43960..3f77bd991d 100644
--- a/WebContent/VAADIN/themes/reindeer/tree/tree.css
+++ b/WebContent/VAADIN/themes/reindeer/tree/tree.css
@@ -1,4 +1,4 @@
-.v-tree .v-tree-node {
+.v-tree-node {
 	background: transparent url(img/arrows.png) no-repeat 6px -10px;
 }
 .v-ie6 .v-tree-node {
@@ -8,7 +8,7 @@
 .v-ie6 div.v-tree-node-leaf {
 	background: transparent;
 }
-.v-tree .v-tree-node-expanded {
+.v-tree-node-expanded {
 	background-position: -7px 5px;
 }
 .v-tree-node-caption {