Merge remote-tracking branch 'origin/master' into grid

Conflicts:
	WebContent/release-notes.html

Change-Id: I7f97cb771665485dbc9130a3c9b0365185615fc5

13 files changed, 78 insertions, 13 deletions

diff --git a/WebContent/VAADIN/themes/base/common/common.scss b/WebContent/VAADIN/themes/base/common/common.scss
index 6ec85e3c6d..0a493e0356 100644
--- a/WebContent/VAADIN/themes/base/common/common.scss
+++ b/WebContent/VAADIN/themes/base/common/common.scss
@@ -11,6 +11,19 @@
 .v-caption {
 	cursor: default;
 }
+/* add box-shadows to overlay elements */
+.v-window {
+  box-shadow: 0 5px 18px 0 rgba(0, 0, 0, .5);
+}
+.v-datefield-popup,
+.v-filterselect-suggestpopup,
+.v-menubar-popup,
+.v-slider-feedback,
+.v-popupview-popup,
+.v-contextmenu  {
+	 box-shadow: 0 2px 6px 0 rgba(0, 0, 0, .5);
+}
+
 body &.v-app .v-app-loading {
 	/* You can use this to provide indication for the user that the application is loading. */
 	/* It is applied to the same element as .v-app */
@@ -115,6 +128,7 @@ body &.v-app .v-app-loading {
 .v-tooltip {
 	cursor: default;
 	background: #fff;
+	box-shadow: 0 2px 6px 0 rgba(0, 0, 0, .5);
 }
 .v-tooltip-text {
 	overflow: auto;
diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.scss b/WebContent/VAADIN/themes/base/datefield/datefield.scss
index d094235c0f..57a691211d 100644
--- a/WebContent/VAADIN/themes/base/datefield/datefield.scss
+++ b/WebContent/VAADIN/themes/base/datefield/datefield.scss
@@ -95,6 +95,9 @@
 }
 .#{$primaryStyleName}-popup {
 	background: #fff;
+	 .v-ie9 &, .v-ie10 &, .v-ie11 & {
+	 	box-shadow: 0 2px 10px 0 rgba(0, 0, 0, .5);
+    }	
 }
 .#{$primaryStyleName}-popupcalendar input.#{$primaryStyleName}-textfield {
 	-webkit-box-sizing: border-box;
diff --git a/WebContent/VAADIN/themes/base/shadow/shadow.scss b/WebContent/VAADIN/themes/base/shadow/shadow.scss
index 47bf4acfde..3c369d3fef 100644
--- a/WebContent/VAADIN/themes/base/shadow/shadow.scss
+++ b/WebContent/VAADIN/themes/base/shadow/shadow.scss
@@ -2,6 +2,12 @@
 
 .#{$primaryStyleName} {
 	position: absolute;
+	display: none;
+	pointer-events: none;
+	
+	.v-ie8 & {
+	  display: block;
+	}
 }
 
 .#{$primaryStyleName} .top-left {
diff --git a/WebContent/VAADIN/themes/base/window/window.scss b/WebContent/VAADIN/themes/base/window/window.scss
index 05f3b115ad..4e414379cf 100644
--- a/WebContent/VAADIN/themes/base/window/window.scss
+++ b/WebContent/VAADIN/themes/base/window/window.scss
@@ -125,6 +125,12 @@ div.#{$primaryStyleName}-header {
 /* Shadow for window */
 .v-shadow-window {
 	position: absolute;
+	display: none;
+	pointer-events: none;
+	
+	.v-ie8 & {
+	  display: block;
+	}
 }
 .v-shadow-window .top-left {
     position: absolute; overflow: hidden;
diff --git a/WebContent/VAADIN/themes/chameleon/common/common.scss b/WebContent/VAADIN/themes/chameleon/common/common.scss
index 382dff3325..7bee2f529c 100644
--- a/WebContent/VAADIN/themes/chameleon/common/common.scss
+++ b/WebContent/VAADIN/themes/chameleon/common/common.scss
@@ -91,8 +91,6 @@ $chameleon-line-height: 1.4;
 	.v-contextmenu,
 	.v-Notification,
 	.v-menubar-submenu {
-		background: #fff url(../img/grad-light-top.png) repeat-x;
-		background-color: rgba(255,255,255,.85);
 		border: 1px solid #adadad;
 		border-color: rgba(0,0,0,.4);
 		border-radius: 4px;
@@ -100,7 +98,14 @@ $chameleon-line-height: 1.4;
 		-moz-border-radius: 4px;
 		overflow: hidden;
 		}
-	
+	.v-window,
+	.v-popupview-popup,
+	.v-filterselect-suggestpopup,
+	.v-datefield-popup,
+	.v-contextmenu,
+	.v-menubar-submenu{
+    	background: rgba(232,232,232,.90) url(../img/grad-light-top.png) repeat-x;
+    	}
 	.v-filterselect-suggestpopup,
 	.v-contextmenu,
 	.v-menubar-submenu {
diff --git a/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.scss b/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.scss
index 0531d0c9b5..0db478855d 100644
--- a/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.scss
+++ b/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.scss
@@ -25,5 +25,7 @@
 	background-image: url(../../img/grad-light-top2.png);
 	background-position: 0 -1px;
 	}
-
+.#{$primaryStyleName}-popup {
+	border-radius: 5px;
+ }
 }
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/chameleon/components/window/window.scss b/WebContent/VAADIN/themes/chameleon/components/window/window.scss
index 92ada43c90..16de81a785 100644
--- a/WebContent/VAADIN/themes/chameleon/components/window/window.scss
+++ b/WebContent/VAADIN/themes/chameleon/components/window/window.scss
@@ -1,5 +1,8 @@
 @mixin chameleon-window($primaryStyleName : v-window) {
 
+.#{$primaryStyleName} {
+	 border-radius: 3px;
+}
 .#{$primaryStyleName}-closebox,
 .#{$primaryStyleName}-restorebox,
 .#{$primaryStyleName}-maximizebox {
diff --git a/WebContent/VAADIN/themes/liferay/menubar/menubar.scss b/WebContent/VAADIN/themes/liferay/menubar/menubar.scss
index 448d7569c8..dd31608e79 100644
--- a/WebContent/VAADIN/themes/liferay/menubar/menubar.scss
+++ b/WebContent/VAADIN/themes/liferay/menubar/menubar.scss
@@ -58,7 +58,9 @@
 	text-shadow: 1px 1px #000;
 	background-color: #5b677d;
 }
-
+.v-menubar-popup {
+	border-radius: 5px;
+ }
 .v-menubar-menuitem-disabled,
 .v-menubar-submenu .v-menubar-menuitem-disabled,
 .v-menubar span.v-menubar-menuitem-disabled:hover,
diff --git a/WebContent/VAADIN/themes/liferay/window/window.scss b/WebContent/VAADIN/themes/liferay/window/window.scss
index 583a81d9e4..d78c69a72f 100644
--- a/WebContent/VAADIN/themes/liferay/window/window.scss
+++ b/WebContent/VAADIN/themes/liferay/window/window.scss
@@ -5,7 +5,6 @@
 }
 
 .v-window-wrap {
-	border: 1px solid #c8c9ca;
 	-webkit-border-radius: 4px;
 	-moz-border-radius: 4px;
 	border-radius: 4px;
diff --git a/WebContent/VAADIN/themes/reindeer/window/window.scss b/WebContent/VAADIN/themes/reindeer/window/window.scss
index 57bd2d4c12..66c80c6a44 100644
--- a/WebContent/VAADIN/themes/reindeer/window/window.scss
+++ b/WebContent/VAADIN/themes/reindeer/window/window.scss
@@ -2,9 +2,9 @@
 
 .#{$primaryStyleName} {
 	background: transparent;
+	border: 1px solid #808386;
 }
 .#{$primaryStyleName}-wrap {
-	border: 1px solid #808386;
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
@@ -48,8 +48,8 @@
 	height: 15px;
 }
 .#{$primaryStyleName}-closebox {
-	top: 12px;
-	right: 10px;
+	top: 11px;
+	right: 9px;
 	width: 15px;
 	height: 16px;
 	background: transparent;
@@ -63,8 +63,8 @@
 }
 .#{$primaryStyleName}-maximizebox,
 .#{$primaryStyleName}-restorebox {
-	top: 12px;
-	right: 28px;
+	top: 11px;
+	right: 27px;
 	width: 15px;
 	height: 16px;
 	background: transparent;
@@ -166,7 +166,9 @@
 /**
  Black style window -----------------------------
 **/
-
+.#{$primaryStyleName}-black {
+	border-radius: 8px;
+}
 .#{$primaryStyleName}-black {
 	.#{$primaryStyleName}-wrap {
 		border-color: #2e3030;
diff --git a/WebContent/VAADIN/themes/runo/common/common.scss b/WebContent/VAADIN/themes/runo/common/common.scss
index 36447d9593..207660c08e 100644
--- a/WebContent/VAADIN/themes/runo/common/common.scss
+++ b/WebContent/VAADIN/themes/runo/common/common.scss
@@ -38,6 +38,15 @@
 .v-window select {
 	padding: 0;
 }
+.v-window
+.v-datefield-popup,
+.v-filterselect-suggestpopup,
+.v-menubar-popup,
+.v-slider-feedback,
+.v-popupview-popup,
+.v-contextmenu  {
+	box-shadow: 0 2px 5px 0 rgba(0,0,0, .28);
+}
 /* Custom tooltip */
 .v-tooltip {
 	background-color: #fffcdd;
diff --git a/WebContent/VAADIN/themes/runo/window/window.scss b/WebContent/VAADIN/themes/runo/window/window.scss
index 1a7cfd3b01..bf2081674c 100644
--- a/WebContent/VAADIN/themes/runo/window/window.scss
+++ b/WebContent/VAADIN/themes/runo/window/window.scss
@@ -1,5 +1,10 @@
 @mixin runo-window($primaryStyleName : v-window) {
 
+/* add box-shadows to an overlay element */
+.#{$primaryStyleName} {
+	box-shadow: 0 10px 24px 0 rgba(42, 45, 46, .4);
+	border-radius: 10px;
+}
 .#{$primaryStyleName} {
 	color: #464f52;
 	font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 268fe1ea66..fb2ddbd998 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -44,6 +44,11 @@
         <async-supported>true</async-supported>
     </servlet>
     <servlet>
+        <servlet-name>GwtRpcTest</servlet-name>
+        <servlet-class>com.vaadin.tests.widgetset.server.gwtrpc.GwtRpcServletTest</servlet-class>
+    </servlet>
+
+    <servlet>
         <servlet-name>UI provider app</servlet-name>
         <servlet-class>com.vaadin.server.VaadinServlet</servlet-class>
         <init-param>
@@ -134,15 +139,19 @@
             <param-value>false</param-value>
         </init-param>
     </servlet>
+
     <servlet-mapping>
         <servlet-name>Embed App 1</servlet-name>
         <url-pattern>/embed1/*</url-pattern>
     </servlet-mapping>
-
     <servlet-mapping>
         <servlet-name>Embed App 2</servlet-name>
         <url-pattern>/embed2/*</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>GwtRpcTest</servlet-name>
+        <url-pattern>/VAADIN/widgetsets/com.vaadin.tests.widgetset.TestingWidgetSet/GwtRpcTest/*</url-pattern>
+    </servlet-mapping>
 
     <servlet-mapping>
         <servlet-name>UI provider app</servlet-name>