Merge from 6.6

svn changeset:19412/svn branch:6.7

5 files changed, 16 insertions, 17 deletions

diff --git a/WebContent/VAADIN/themes/base/menubar/img/check.gif b/WebContent/VAADIN/themes/base/menubar/img/check.gif
new file mode 100644
index 0000000000..0a89195168
--- /dev/null
+++ b/WebContent/VAADIN/themes/base/menubar/img/check.gif
diff --git a/WebContent/VAADIN/themes/base/menubar/menubar.css b/WebContent/VAADIN/themes/base/menubar/menubar.css
index d1972ac4ec..042ec15d1d 100644
--- a/WebContent/VAADIN/themes/base/menubar/menubar.css
+++ b/WebContent/VAADIN/themes/base/menubar/menubar.css
@@ -79,4 +79,15 @@
 .v-menubar-popup .popupContent:focus,
 .v-menubar-popup .popupContent .v-menubar-submenu:focus{
 	outline: none;	
-}
\ No newline at end of file
+}
+/* Checkboxes for checkable/checked menu items */
+/* Checked/unchecked requires combined style selected-(un)checked for IE6 */
+.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/check.gif) no-repeat left;
+}
diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-item.png b/WebContent/VAADIN/themes/base/tree/img/connector-item.png
deleted file mode 100644
index a64c209cb1..0000000000
--- a/WebContent/VAADIN/themes/base/tree/img/connector-item.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/base/tree/img/connector.png b/WebContent/VAADIN/themes/base/tree/img/connector.png
deleted file mode 100644
index c56b8f4244..0000000000
--- a/WebContent/VAADIN/themes/base/tree/img/connector.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/base/tree/tree.css b/WebContent/VAADIN/themes/base/tree/tree.css
index 37af1d11a8..9e056dc4d6 100644
--- a/WebContent/VAADIN/themes/base/tree/tree.css
+++ b/WebContent/VAADIN/themes/base/tree/tree.css
@@ -4,29 +4,17 @@
 	padding: 1px 0;
 	outline: none;
 }
-.v-tree .v-tree-node {
+.v-tree-node {
 	background: transparent url(../common/img/sprites.png) no-repeat 5px -37px;
 	padding: 1px 0;
 }
 .v-tree-node-caption:focus {
 	outline: none;
 }
-.v-tree div.v-tree-node-leaf {
-	background: transparent;
-}
-.v-tree-connectors div.v-tree-node-leaf {
-	background: transparent url(img/connector-item.png) no-repeat 8px 0;
-}
-.v-tree-connectors div.v-tree-node-leaf-last {
-	background: transparent url(img/connector-item.png) no-repeat 8px bottom;
-}
-.v-tree .v-tree-node-expanded {
-	background: transparent url(../common/img/sprites.png) no-repeat -5px -10px;
-}
-.v-tree-connectors .v-tree-node-children {
-	background: transparent url(img/connector.png) repeat-y 8px bottom;
+.v-tree-node-expanded {
+	background-position: -5px -10px;
 }
-.v-tree-connectors .v-tree-node-children-last {
+div.v-tree-node-leaf {
 	background: transparent;
 }
 .v-tree-node-caption {