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, 49 insertions, 28 deletions

diff --git a/WebContent/VAADIN/themes/reindeer/menubar/menubar.css b/WebContent/VAADIN/themes/reindeer/menubar/menubar.css
index ae156fa596..787453d15c 100644
--- a/WebContent/VAADIN/themes/reindeer/menubar/menubar.css
+++ b/WebContent/VAADIN/themes/reindeer/menubar/menubar.css
@@ -10,7 +10,7 @@
 	margin: 0 8px;
 	height: 23px;
 }
-.v-menubar .menuitem {
+.v-menubar .v-menubar-menuitem {
 	padding: 3px 8px;
 	height: 17px;
 	line-height: 16px;
@@ -25,31 +25,28 @@
 	overflow: hidden;
 	padding: 4px 0;
 }
-.v-menubar-submenu .menuitem {
+.v-menubar-submenu .v-menubar-menuitem {
 	padding: 1px 15px 1px 10px;
 	height: 16px;
 	line-height: 16px;
 }
-.v-menubar .menuitem-selected,
-.v-menubar-submenu .menuitem-selected {
+.v-menubar .v-menubar-menuitem-selected,
+.v-menubar-submenu .v-menubar-menuitem-selected {
 	background: #4d749f repeat-x;
 	background-image: url(../common/img/sel-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */
 	color: #fff;
 	text-shadow: #3b5a7a 0 1px 0;
 }
-.v-menubar .menuitem-selected {
+.v-menubar .v-menubar-menuitem-selected {
 	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 50%;
-	display: inline;
-	display: inline-block;
-	zoom: 1;
 	width: 16px;
 	margin: 0 -15px 0 5px;
 	text-indent: -999px;
 	vertical-align: middle;
 }
-.v-menubar-submenu .menuitem-selected .v-menubar-submenu-indicator {
+.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 ad09f5b1e5..02fbb27d08 100644
--- a/WebContent/VAADIN/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/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;
 }
@@ -2993,7 +3017,7 @@ td.v-datefield-calendarpanel-nextyear {
 	margin: 0 8px;
 	height: 23px;
 }
-.v-menubar .menuitem {
+.v-menubar .v-menubar-menuitem {
 	padding: 3px 8px;
 	height: 17px;
 	line-height: 16px;
@@ -3008,13 +3032,13 @@ td.v-datefield-calendarpanel-nextyear {
 	overflow: hidden;
 	padding: 4px 0;
 }
-.v-menubar-submenu .menuitem {
+.v-menubar-submenu .v-menubar-menuitem {
 	padding: 1px 15px 1px 10px;
 	height: 16px;
 	line-height: 16px;
 }
-.v-menubar .menuitem-selected,
-.v-menubar-submenu .menuitem-selected {
+.v-menubar .v-menubar-menuitem-selected,
+.v-menubar-submenu .v-menubar-menuitem-selected {
 	background: #4d749f repeat-x;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
@@ -3022,22 +3046,19 @@ td.v-datefield-calendarpanel-nextyear {
 	color: #fff;
 	text-shadow: #3b5a7a 0 1px 0;
 }
-.v-menubar .menuitem-selected {
+.v-menubar .v-menubar-menuitem-selected {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
   background-position: left -423px;
 }
 .v-menubar-submenu .v-menubar-submenu-indicator {
 	background: transparent url(menubar/img/submenu-icon.png) no-repeat right 50%;
-	display: inline;
-	display: inline-block;
-	zoom: 1;
 	width: 16px;
 	margin: 0 -15px 0 5px;
 	text-indent: -999px;
 	vertical-align: middle;
 }
-.v-menubar-submenu .menuitem-selected .v-menubar-submenu-indicator {
+.v-menubar-submenu .v-menubar-menuitem-selected .v-menubar-submenu-indicator {
 	background-image: url(menubar/img/submenu-icon-hover.png);
 }
 
@@ -3965,6 +3986,9 @@ td.v-datefield-calendarpanel-nextyear {
 	height: 16px;
 	line-height: 16px;
 }
+.v-tabsheet-caption-close {
+	
+}
 .v-tabsheet-tabitemcell-selected {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);