diff options
| author | Leif Åstrand <leif@vaadin.com> | 2014-07-22 12:59:14 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2014-07-22 12:59:32 +0300 |
| commit | 86e1c718578f8c81323b47e3efed03178d123c03 (patch) | |
| tree | 9eaf3779ce79b67963c9fcb3a43c7fd6c39f25fd /WebContent | |
| parent | aca2902c9cafcb02db19a0cdd42b1488786c0f56 (diff) | |
| parent | 6ae7843e46ee906adfc99bde71ded5f296caea74 (diff) | |
| download | vaadin-framework-86e1c718578f8c81323b47e3efed03178d123c03.tar.gz vaadin-framework-86e1c718578f8c81323b47e3efed03178d123c03.zip | |
Merge branch 'master' into grid
Change-Id: I6878b3c64eb5c98174537f4e5864e2ff2cb1863f
Diffstat (limited to 'WebContent')
4 files changed, 10 insertions, 2 deletions
diff --git a/WebContent/VAADIN/themes/base/common/common.scss b/WebContent/VAADIN/themes/base/common/common.scss index 0a493e0356..77248c0c96 100644 --- a/WebContent/VAADIN/themes/base/common/common.scss +++ b/WebContent/VAADIN/themes/base/common/common.scss @@ -146,6 +146,12 @@ body &.v-app .v-app-loading { border: 0; margin: 0; } + +.v-contextmenu .gwt-MenuBar { + overflow-y: auto; + overflow-x: hidden; +} + .v-contextmenu .gwt-MenuItem div { cursor: pointer; vertical-align: middle; diff --git a/WebContent/VAADIN/themes/chameleon/components/notification/notification.scss b/WebContent/VAADIN/themes/chameleon/components/notification/notification.scss index fbf78d40c4..783e4bcc1f 100644 --- a/WebContent/VAADIN/themes/chameleon/components/notification/notification.scss +++ b/WebContent/VAADIN/themes/chameleon/components/notification/notification.scss @@ -8,6 +8,7 @@ div.#{$primaryStyleName} { -webkit-box-shadow: 0 2px 5px rgba(0,0,0,.7); -moz-box-shadow: 0 2px 5px rgba(0,0,0,.7); box-shadow: 0 2px 5px rgba(0,0,0,.7); + background:rgba(255,255,255,.90) url(../img/grad-light-top.png) repeat-x; } .#{$primaryStyleName} p { diff --git a/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.scss b/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.scss index dfa1c51c3a..d7f968fe43 100644 --- a/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.scss +++ b/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.scss @@ -89,6 +89,7 @@ .#{$primaryStyleName}-scrollerNext-disabled, .#{$primaryStyleName}-scrollerPrev-disabled:active, .#{$primaryStyleName}-scrollerNext-disabled:active { + padding-top: 12px; border: 1px solid #b3b3b3; border-width: 0; background: transparent url(../../img/tab-arrows.png) no-repeat 6px 50%; diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index fb2ddbd998..9ca5be2bdf 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -118,11 +118,11 @@ <param-name>pushmode</param-name> <param-value>automatic</param-value> </init-param> - <async-supported>true</async-supported> <init-param> <param-name>org.atmosphere.cpr.scanClassPath</param-name> <param-value>false</param-value> </init-param> + <async-supported>true</async-supported> </servlet> <!-- For testing GAE - the deployment script changes this to use GAEVaadinServlet --> @@ -133,11 +133,11 @@ <param-name>UI</param-name> <param-value>com.vaadin.tests.integration.ServletIntegrationUI</param-value> </init-param> - <async-supported>true</async-supported> <init-param> <param-name>org.atmosphere.cpr.scanClassPath</param-name> <param-value>false</param-value> </init-param> + <async-supported>true</async-supported> </servlet> <servlet-mapping> |