Merge with 6.2

svn changeset:9833/svn branch:portlet_2.0

5 files changed, 170 insertions, 34 deletions

diff --git a/WebContent/VAADIN/themes/base/menubar/menubar.css b/WebContent/VAADIN/themes/base/menubar/menubar.css
index e39598d7f2..45170ff99f 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 {
+.v-menubar .v-menubar-menuitem {
+	cursor: default;
+	vertical-align: middle;
 	white-space: nowrap;
-	border-collapse: collapse;
-	padding: 0;
-	margin: 0;
 }
-.v-menubar .menuitem {
-	cursor: default;
+.v-menubar .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;
@@ -27,11 +24,54 @@
 	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 .v-menubar-menuitem * { 
+	vertical-align: middle;
+}
+.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-ie6 .v-menubar-submenu .v-menubar-submenu-indicator {
+	position: absolute;
+	right: 0;
+	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/notification/notification.css b/WebContent/VAADIN/themes/base/notification/notification.css
index 6ab069b08c..9455c25a36 100644
--- a/WebContent/VAADIN/themes/base/notification/notification.css
+++ b/WebContent/VAADIN/themes/base/notification/notification.css
@@ -4,6 +4,8 @@
 	cursor: pointer;
 	overflow: hidden;
 	padding: 1em;
+	max-width:85%;
+	
 }
 .v-Notification h1,
 .v-Notification p,
@@ -12,7 +14,6 @@
 .v-Notification-warning h1,
 .v-Notification-warning p {
 	display: inline;
-	white-space: nowrap;
 	margin: 0 0.5em 0 0;
 }
 .v-Notification-warning {
@@ -36,6 +37,3 @@
 	display: block;

 	margin: 0;

 }

-.v-Notification-system p {

-	white-space: nowrap;

-}
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/base/shadow/shadow.css b/WebContent/VAADIN/themes/base/shadow/shadow.css
index bc67f3cc59..209dd0e235 100644
--- a/WebContent/VAADIN/themes/base/shadow/shadow.css
+++ b/WebContent/VAADIN/themes/base/shadow/shadow.css
@@ -80,6 +80,6 @@
 .v-ie6 .v-shadow {
 	background: #000;
 	filter: progid:DXImageTransform.Microsoft.Blur(pixelRadius=2) alpha(opacity=20);
-	margin-top: -3px;
-	margin-left: -4px;
+	margin-top: -2px;
+	margin-left: -2px;
 }  
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index a1b560ec23..e0908ddd88 100644
--- a/WebContent/VAADIN/themes/base/styles.css
+++ b/WebContent/VAADIN/themes/base/styles.css
@@ -622,25 +622,22 @@ div.v-app-loading {
 }
 
 .v-menubar table {
-	white-space: nowrap;
 	border-collapse: collapse;
 	padding: 0;
 	margin: 0;
 }
-.v-menubar table {
+.v-menubar .v-menubar-menuitem {
+	cursor: default;
+	vertical-align: middle;
 	white-space: nowrap;
-	border-collapse: collapse;
-	padding: 0;
-	margin: 0;
 }
-.v-menubar .menuitem {
-	cursor: default;
+.v-menubar .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;
@@ -650,13 +647,56 @@ 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 .v-menubar-menuitem * { 
+	vertical-align: middle;
+}
+.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-ie6 .v-menubar-submenu .v-menubar-submenu-indicator {
+	position: absolute;
+	right: 0;
+	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;
 }
 
 .v-Notification {
@@ -665,6 +705,8 @@ div.v-app-loading {
 	cursor: pointer;
 	overflow: hidden;
 	padding: 1em;
+	max-width:85%;
+	
 }
 .v-Notification h1,
 .v-Notification p,
@@ -673,7 +715,6 @@ div.v-app-loading {
 .v-Notification-warning h1,
 .v-Notification-warning p {
 	display: inline;
-	white-space: nowrap;
 	margin: 0 0.5em 0 0;
 }
 .v-Notification-warning {
@@ -697,9 +738,6 @@ div.v-app-loading {
 	display: block;
 	margin: 0;
 }
-.v-Notification-system p {
-	white-space: nowrap;
-}
 
 .v-orderedlayout-margin-top,
 .v-horizontallayout-margin-top,
@@ -1049,8 +1087,8 @@ div.v-progressindicator-indeterminate-disabled {
 .v-ie6 .v-shadow {
 	background: #000;
 	filter: progid:DXImageTransform.Microsoft.Blur(pixelRadius=2) alpha(opacity=20);
-	margin-top: -3px;
-	margin-left: -4px;
+	margin-top: -2px;
+	margin-left: -2px;
 }  
 
 .v-slider {
@@ -1349,6 +1387,9 @@ div.v-progressindicator-indeterminate-disabled {
 .v-ff2 .v-tabsheet-scroller {
 	position: relative;
 }
+.v-disabled .v-tabsheet-scroller {
+	display: none;
+}
 .v-tabsheet-scrollerPrev,
 .v-tabsheet-scrollerNext,
 .v-tabsheet-scrollerPrev-disabled,
@@ -1368,6 +1409,33 @@ 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;
+	text-align: center;
+	font-weight: bold;
+	cursor: pointer;
+	vertical-align: middle;
+	user-select: none;
+	-khtml-user-select: none;
+	-ms-user-select: none;
+	-moz-user-select: none;
+	-webkit-user-select: none;
+}
+.v-tabsheet .v-disabled .v-tabsheet-caption-close {
+	cursor: default;
+	visibility: hidden;
+}
+.v-tabsheet-tabitemcell:hover .v-tabsheet-caption-close,
+.v-ie6 .v-tabsheet-caption-close {
+	visibility: visible;
+}
+.v-ie6 .v-tabsheet-caption-close {
+	float: right;
+}
 .v-tabsheet-tabitem {
 	border: 1px solid #aaa;
 	border-right: none;
diff --git a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
index 8520f35913..6fd1f1470a 100644
--- a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
+++ b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
@@ -39,6 +39,9 @@
 .v-ff2 .v-tabsheet-scroller {
 	position: relative;
 }
+.v-disabled .v-tabsheet-scroller {
+	display: none;
+}
 .v-tabsheet-scrollerPrev,
 .v-tabsheet-scrollerNext,
 .v-tabsheet-scrollerPrev-disabled,
@@ -58,6 +61,33 @@
 .v-tabsheet-tabs .v-caption span {
 	white-space: nowrap;
 }
+.v-tabsheet-caption-close {
+	display: inline;
+	display: inline-block;
+	zoom: 1;
+	width: 16px;
+	height: 16px;
+	text-align: center;
+	font-weight: bold;
+	cursor: pointer;
+	vertical-align: middle;
+	user-select: none;
+	-khtml-user-select: none;
+	-ms-user-select: none;
+	-moz-user-select: none;
+	-webkit-user-select: none;
+}
+.v-tabsheet .v-disabled .v-tabsheet-caption-close {
+	cursor: default;
+	visibility: hidden;
+}
+.v-tabsheet-tabitemcell:hover .v-tabsheet-caption-close,
+.v-ie6 .v-tabsheet-caption-close {
+	visibility: visible;
+}
+.v-ie6 .v-tabsheet-caption-close {
+	float: right;
+}
 .v-tabsheet-tabitem {
 	border: 1px solid #aaa;
 	border-right: none;