diff options
| author | Henri Sara <hesara@vaadin.com> | 2014-07-07 14:09:42 +0300 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2014-07-07 14:10:19 +0300 |
| commit | be819fcbe19750fc0c390fbb55819376af047188 (patch) | |
| tree | e35e6a889f2e261f645de1c1fb04f82b2fbda29c /WebContent | |
| parent | a91d4ed98b86fbf61138723d5903c63867194d12 (diff) | |
| parent | 8c36375edb9cadfec64a67f034d2a6828242df6f (diff) | |
| download | vaadin-framework-7.3.0.beta1.tar.gz vaadin-framework-7.3.0.beta1.zip | |
Merge branch 'master' into 7.37.3.0.beta1
Change-Id: I0efe8538f2472d1a6cf5ec10aadcde13ed39f9ad
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/VAADIN/themes/base/datefield/datefield.scss | 3 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/chameleon/common/common.scss | 11 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/runo/common/common.scss | 5 | ||||
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 11 |
4 files changed, 23 insertions, 7 deletions
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/chameleon/common/common.scss b/WebContent/VAADIN/themes/chameleon/common/common.scss index b8233fc53b..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/runo/common/common.scss b/WebContent/VAADIN/themes/runo/common/common.scss index c33b490411..207660c08e 100644 --- a/WebContent/VAADIN/themes/runo/common/common.scss +++ b/WebContent/VAADIN/themes/runo/common/common.scss @@ -41,9 +41,8 @@ .v-window .v-datefield-popup, .v-filterselect-suggestpopup, -.v-menubar-menuitem, -.v-slider-popup, -.v-tooltip-text, +.v-menubar-popup, +.v-slider-feedback, .v-popupview-popup, .v-contextmenu { box-shadow: 0 2px 5px 0 rgba(0,0,0, .28); 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> |