MenuBar fixes (again)

 * Fix submenu indicators for IE
 * Fixes #3678: enhancement: MenuBar needs a separator item

svn changeset:9722/svn branch:6.2

6 files changed, 74 insertions, 6 deletions

diff --git a/WebContent/VAADIN/themes/base/menubar/menubar.css b/WebContent/VAADIN/themes/base/menubar/menubar.css
index e3e6becd6c..45170ff99f 100644
--- a/WebContent/VAADIN/themes/base/menubar/menubar.css
+++ b/WebContent/VAADIN/themes/base/menubar/menubar.css
@@ -56,10 +56,22 @@
 	margin-right: 0;
 	margin-top: -2px;
 }
+.v-ie7 .v-menubar-submenu .v-menubar-submenu-indicator {
+	position: relative;
+	margin-left: 0;
+}
 .v-menubar-menuitem-disabled {
 	color: #999;
 }
 .v-menubar-more-menuitem {
 	/* Arial has the most coverage for geometric entity characters */
 	font-family: arial, helvetica, sans-serif;
+}
+.v-menubar-separator span {
+	display: block;
+	text-indent: -9999px;
+	height: 1px;
+	margin: 3px 0;
+	overflow: hidden;
+	background: #ddd;
 }
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index 6d075d5c50..5908dcec9f 100644
--- a/WebContent/VAADIN/themes/base/styles.css
+++ b/WebContent/VAADIN/themes/base/styles.css
@@ -679,6 +679,10 @@ div.v-app-loading {
 	margin-right: 0;
 	margin-top: -2px;
 }
+.v-ie7 .v-menubar-submenu .v-menubar-submenu-indicator {
+	position: relative;
+	margin-left: 0;
+}
 .v-menubar-menuitem-disabled {
 	color: #999;
 }
@@ -686,6 +690,14 @@ div.v-app-loading {
 	/* Arial has the most coverage for geometric entity characters */
 	font-family: arial, helvetica, sans-serif;
 }
+.v-menubar-separator span {
+	display: block;
+	text-indent: -9999px;
+	height: 1px;
+	margin: 3px 0;
+	overflow: hidden;
+	background: #ddd;
+}
 
 .v-Notification {
 	background: #999;
diff --git a/WebContent/VAADIN/themes/reindeer/menubar/menubar.css b/WebContent/VAADIN/themes/reindeer/menubar/menubar.css
index 13f4fa72b0..e109a04681 100644
--- a/WebContent/VAADIN/themes/reindeer/menubar/menubar.css
+++ b/WebContent/VAADIN/themes/reindeer/menubar/menubar.css
@@ -41,12 +41,17 @@
 	background-image: url(img/menu-sel-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */
 }
 .v-menubar-submenu .v-menubar-submenu-indicator {
-	background: transparent url(img/submenu-icon.png) no-repeat right bottom;
+	background: transparent url(img/submenu-icon.png) no-repeat right 70%;
 	width: 16px;
 	margin: 0 -20px 0 5px;
 	text-indent: -999px;
 	vertical-align: middle;
 }
+.v-ie7 .v-menubar-submenu .v-menubar-submenu-indicator {
+	margin: 0 -20px 0 0;
+	position: relative;
+	right: -4px;
+}
 .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
diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index 010a2f51ba..1aa84f88d3 100644
--- a/WebContent/VAADIN/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/styles.css
@@ -679,6 +679,10 @@ div.v-app-loading {
 	margin-right: 0;
 	margin-top: -2px;
 }
+.v-ie7 .v-menubar-submenu .v-menubar-submenu-indicator {
+	position: relative;
+	margin-left: 0;
+}
 .v-menubar-menuitem-disabled {
 	color: #999;
 }
@@ -686,6 +690,14 @@ div.v-app-loading {
 	/* Arial has the most coverage for geometric entity characters */
 	font-family: arial, helvetica, sans-serif;
 }
+.v-menubar-separator span {
+	display: block;
+	text-indent: -9999px;
+	height: 1px;
+	margin: 3px 0;
+	overflow: hidden;
+	background: #ddd;
+}
 
 .v-Notification {
 	background: #999;
@@ -3058,12 +3070,17 @@ td.v-datefield-calendarpanel-nextyear {
   background-position: left -423px;
 }
 .v-menubar-submenu .v-menubar-submenu-indicator {
-	background: transparent url(menubar/img/submenu-icon.png) no-repeat right bottom;
+	background: transparent url(menubar/img/submenu-icon.png) no-repeat right 70%;
 	width: 16px;
 	margin: 0 -20px 0 5px;
 	text-indent: -999px;
 	vertical-align: middle;
 }
+.v-ie7 .v-menubar-submenu .v-menubar-submenu-indicator {
+	margin: 0 -20px 0 0;
+	position: relative;
+	right: -4px;
+}
 .v-menubar-submenu .v-menubar-menuitem-selected .v-menubar-submenu-indicator {
 	background-image: url(menubar/img/submenu-icon-hover.png);
 }
diff --git a/WebContent/VAADIN/themes/runo/menubar/menubar.css b/WebContent/VAADIN/themes/runo/menubar/menubar.css
index 55890d686f..324713db6e 100644
--- a/WebContent/VAADIN/themes/runo/menubar/menubar.css
+++ b/WebContent/VAADIN/themes/runo/menubar/menubar.css
@@ -24,12 +24,17 @@
 	border-left: 1px solid #d0d4d5;
 }
 .v-menubar-submenu .v-menubar-menuitem {
-	padding: 2px 10px;
+	padding: 2px 16px 2px 10px;
 }
 .v-menubar-submenu .v-menubar-menuitem-selected {
 	color: #fff;
 	background: #5daee8;
 }
 .v-menubar-submenu .v-menubar-submenu-indicator {
-	margin-right: -3px;
+	margin-right: -12px;
+	height: 14px;
+}
+.v-ie7 .v-menubar-submenu .v-menubar-submenu-indicator {
+	margin-right: -12px;
+	right: -3px;
 }
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css
index 6d58d82006..e2a5dd418f 100644
--- a/WebContent/VAADIN/themes/runo/styles.css
+++ b/WebContent/VAADIN/themes/runo/styles.css
@@ -679,6 +679,10 @@ div.v-app-loading {
 	margin-right: 0;
 	margin-top: -2px;
 }
+.v-ie7 .v-menubar-submenu .v-menubar-submenu-indicator {
+	position: relative;
+	margin-left: 0;
+}
 .v-menubar-menuitem-disabled {
 	color: #999;
 }
@@ -686,6 +690,14 @@ div.v-app-loading {
 	/* Arial has the most coverage for geometric entity characters */
 	font-family: arial, helvetica, sans-serif;
 }
+.v-menubar-separator span {
+	display: block;
+	text-indent: -9999px;
+	height: 1px;
+	margin: 3px 0;
+	overflow: hidden;
+	background: #ddd;
+}
 
 .v-Notification {
 	background: #999;
@@ -2177,14 +2189,19 @@ div.v-tree-node-leaf {
 	border-left: 1px solid #d0d4d5;
 }
 .v-menubar-submenu .v-menubar-menuitem {
-	padding: 2px 10px;
+	padding: 2px 16px 2px 10px;
 }
 .v-menubar-submenu .v-menubar-menuitem-selected {
 	color: #fff;
 	background: #5daee8;
 }
 .v-menubar-submenu .v-menubar-submenu-indicator {
-	margin-right: -3px;
+	margin-right: -12px;
+	height: 14px;
+}
+.v-ie7 .v-menubar-submenu .v-menubar-submenu-indicator {
+	margin-right: -12px;
+	right: -3px;
 }
 
 .v-Notification {