Reverted [18907] (fix for #6745 "Connectors for Tree"

 * Moving to 6.7 branch
 * Modifying the selector structure and images in the 6.7 branch, the last fix was not final

svn changeset:18999/svn branch:6.6

6 files changed, 10 insertions, 22 deletions

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 {
diff --git a/WebContent/VAADIN/themes/liferay/tree/tree.css b/WebContent/VAADIN/themes/liferay/tree/tree.css
index 3c3c6abdfe..23fe10f52e 100644
--- a/WebContent/VAADIN/themes/liferay/tree/tree.css
+++ b/WebContent/VAADIN/themes/liferay/tree/tree.css
@@ -1,4 +1,4 @@
-.v-tree .v-tree-node {
+.v-tree-node {
 	background: transparent url(arrows_sprites.png) no-repeat -42px 1px;
 	-background: transparent url(arrows_sprites-ie6.png) no-repeat -42px 1px;
 }
@@ -13,7 +13,7 @@
 	background-position: -14px -30px;
 }
 
-.v-tree .v-tree-node-expanded {
+.v-tree-node-expanded {
 	background-position: -28px -14px;
 }
 
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 {
diff --git a/WebContent/VAADIN/themes/runo/tree/tree.css b/WebContent/VAADIN/themes/runo/tree/tree.css
index c2458bc0b8..bec3b318dd 100644
--- a/WebContent/VAADIN/themes/runo/tree/tree.css
+++ b/WebContent/VAADIN/themes/runo/tree/tree.css
@@ -1,7 +1,7 @@
-.v-tree .v-tree-node {
+.v-tree-node {
 	background: transparent url(img/collapsed.png) no-repeat 2px 1px;
 }
-.v-tree .v-tree-node-expanded {
+.v-tree-node-expanded {
 	background: transparent url(img/expanded.png) no-repeat 2px 1px;
 }
 .v-tree-node-caption {