MenuBar fixes & enhancements

 * fixes #3507: Menubar.MenuItem needs setEnabled()
 * "More" menuitem now presented as an arrow
 * menu opening/closing now more intuitive
 * client side stylename for menuitems changed to v-menuitem

svn changeset:9688/svn branch:6.2

2 files changed, 48 insertions, 24 deletions

diff --git a/WebContent/VAADIN/themes/runo/menubar/menubar.css b/WebContent/VAADIN/themes/runo/menubar/menubar.css
index 6ef4b93fc6..55890d686f 100644
--- a/WebContent/VAADIN/themes/runo/menubar/menubar.css
+++ b/WebContent/VAADIN/themes/runo/menubar/menubar.css
@@ -1,14 +1,14 @@
 .v-menubar {
 	color: #464f52;
-	border: 1px solid #c6cbcc;
-	border-right: none;
+	border-left: 1px solid #c6cbcc;
 }
-.v-menubar .menuitem {
+.v-menubar .v-menubar-menuitem {
 	padding: 0 10px;
 	margin: 0 10px;
-	border-right: 1px solid #c6cbcc;
+	border: 1px solid #c6cbcc;
+	border-left: none;
 }
-.v-menubar .menuitem-selected {
+.v-menubar .v-menubar-menuitem-selected {
 	color: #fff;
 	background: #5daee8;
 }
@@ -23,10 +23,10 @@
 	border-top: 1px solid #d0d4d5;
 	border-left: 1px solid #d0d4d5;
 }
-.v-menubar-submenu .menuitem {
+.v-menubar-submenu .v-menubar-menuitem {
 	padding: 2px 10px;
 }
-.v-menubar-submenu .menuitem-selected {
+.v-menubar-submenu .v-menubar-menuitem-selected {
 	color: #fff;
 	background: #5daee8;
 }
diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css
index 815d09cdc3..cb949ff131 100644
--- a/WebContent/VAADIN/themes/runo/styles.css
+++ b/WebContent/VAADIN/themes/runo/styles.css
@@ -626,12 +626,12 @@ div.v-app-loading {
 	padding: 0;
 	margin: 0;
 }
-.v-menubar .menuitem {
+.v-menubar .v-menubar-menuitem {
 	cursor: default;
 	vertical-align: middle;
 	white-space: nowrap;
 }
-.v-menubar .menuitem * {
+.v-menubar .v-menubar-menuitem * {
 	vertical-align: middle;
 }
 .v-menubar-submenu {
@@ -647,28 +647,39 @@ div.v-app-loading {
 	padding: 0;
 	margin: 0;
 }
-.v-menubar .menuitem-selected,
-.v-menubar-submenu .menuitem-selected {
+.v-menubar-menuitem-selected{
 	background: #333;
 	color: #fff;
 }
-.v-menubar-submenu .menuitem { 
+.v-menubar-submenu .v-menubar-menuitem { 
 	cursor: default;
 	vertical-align: middle;
 	white-space: nowrap;
 }
-.v-menubar-submenu .menuitem * { 
+.v-menubar-submenu .v-menubar-menuitem * { 
 	vertical-align: middle;
 }
-.v-menubar .v-menubar-submenu-indicator {
+.v-menubar-submenu-indicator {
 	display: none;
+	/* Arial has the most coverage for geometric entity characters */
+	font-family: arial, helvetica, sans-serif;
 }
 .v-menubar-submenu .v-menubar-submenu-indicator {
+	display: inline;
+	display: inline-block;
+	zoom: 1;
 	margin-left: 1em;
 	float: right;
 	height: 100%;
 	font-size: 0.9em;
 }
+.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-Notification {
 	background: #999;
@@ -1377,6 +1388,19 @@ div.v-progressindicator-indeterminate-disabled {
 .v-tabsheet-tabs .v-caption span {
 	white-space: nowrap;
 }
+.v-tabsheet-caption-close {
+	display: inline;
+	display: inline-block;
+	zoom: 1;
+	width: 16px;
+	height: 16px;
+	background: url(../base/common/img/close.png) no-repeat;
+	cursor: pointer;
+	vertical-align: middle;
+}
+.v-disabled .v-tabsheet-caption-close {
+	cursor: default;
+}
 .v-tabsheet-tabitem {
 	border: 1px solid #aaa;
 	border-right: none;
@@ -1600,9 +1624,9 @@ div.v-tree-node-leaf {
 	position: absolute;
 	top: 0;
 	right: 0;
-	width: 1em;
-	height: 1em;
-	background: red;
+	width: 16px;
+	height: 16px;
+	background: url(../base/common/img/close.png) no-repeat;
 	cursor: pointer;
 	overflow: hidden;
 }
@@ -2123,15 +2147,15 @@ div.v-tree-node-leaf {
 
 .v-menubar {
 	color: #464f52;
-	border: 1px solid #c6cbcc;
-	border-right: none;
+	border-left: 1px solid #c6cbcc;
 }
-.v-menubar .menuitem {
+.v-menubar .v-menubar-menuitem {
 	padding: 0 10px;
 	margin: 0 10px;
-	border-right: 1px solid #c6cbcc;
+	border: 1px solid #c6cbcc;
+	border-left: none;
 }
-.v-menubar .menuitem-selected {
+.v-menubar .v-menubar-menuitem-selected {
 	color: #fff;
 	background: #5daee8;
 }
@@ -2146,10 +2170,10 @@ div.v-tree-node-leaf {
 	border-top: 1px solid #d0d4d5;
 	border-left: 1px solid #d0d4d5;
 }
-.v-menubar-submenu .menuitem {
+.v-menubar-submenu .v-menubar-menuitem {
 	padding: 2px 10px;
 }
-.v-menubar-submenu .menuitem-selected {
+.v-menubar-submenu .v-menubar-menuitem-selected {
 	color: #fff;
 	background: #5daee8;
 }