MenuBar fixes:

 * Fixes #2849: Deprecate MenuBar.setSubmenuIcon method, and provide the same functionality via CSS
 * Fixes #2821: Sumbenu icon is not aligned with the menu item's text
 * Fixes #3482: MenuItem: Subitem is wrongly marked as selected

Deprecated setCollapse method at the same time, redundant method (the feature should always be enabled).

svn changeset:9675/svn branch:6.2

1 files changed, 19 insertions, 8 deletions

diff --git a/WebContent/VAADIN/themes/base/menubar/menubar.css b/WebContent/VAADIN/themes/base/menubar/menubar.css
index e39598d7f2..610fb4d9b4 100644
--- a/WebContent/VAADIN/themes/base/menubar/menubar.css
+++ b/WebContent/VAADIN/themes/base/menubar/menubar.css
@@ -1,23 +1,20 @@
 .v-menubar table {
-	white-space: nowrap;
-	border-collapse: collapse;
-	padding: 0;
-	margin: 0;
-}
-.v-menubar table {
-	white-space: nowrap;
 	border-collapse: collapse;
 	padding: 0;
 	margin: 0;
 }
 .v-menubar .menuitem {
 	cursor: default;
+	vertical-align: middle;
+	white-space: nowrap;
+}
+.v-menubar .menuitem * {
+	vertical-align: middle;
 }
 .v-menubar-submenu {
 	background: #fff;
 }
 .v-menubar-submenu table {
-	white-space: nowrap;
 	border-collapse: collapse;
 	padding: 0;
 	margin: 0;
@@ -34,4 +31,18 @@
 }
 .v-menubar-submenu .menuitem { 
 	cursor: default;
+	vertical-align: middle;
+	white-space: nowrap;
+}
+.v-menubar-submenu .menuitem * { 
+	vertical-align: middle;
+}
+.v-menubar .v-menubar-submenu-indicator {
+	display: none;
+}
+.v-menubar-submenu .v-menubar-submenu-indicator {
+	margin-left: 1em;
+	float: right;
+	height: 100%;
+	font-size: 0.9em;
 }
\ No newline at end of file