diff options
| author | Jouni Koivuviita <jouni@vaadin.com> | 2014-06-16 10:29:28 +0300 |
|---|---|---|
| committer | Jouni Koivuviita <jouni@vaadin.com> | 2014-06-16 10:30:24 +0300 |
| commit | 7a92b54724133328998e7c7178b5c298bc88fcd0 (patch) | |
| tree | 54f340a8ee21e0407fe790e1113881ed947de3cc /WebContent | |
| parent | 7a4d0003e9bb6fd920bb879eaff1c24cd6f1f3e7 (diff) | |
| parent | ccdc34051d6c74292ce981f66c31c160620a04da (diff) | |
| download | vaadin-framework-7a92b54724133328998e7c7178b5c298bc88fcd0.tar.gz vaadin-framework-7a92b54724133328998e7c7178b5c298bc88fcd0.zip | |
Merge branch 'master' into valo
Conflicts:
build.properties
Change-Id: I2477f2b420506d1b41d29d9bb1e361d66bedb68d
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/VAADIN/themes/tests-responsive/styles.css | 9 | ||||
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 7 |
2 files changed, 16 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/tests-responsive/styles.css b/WebContent/VAADIN/themes/tests-responsive/styles.css index 4bfc6dd768..db92a2a2fc 100644 --- a/WebContent/VAADIN/themes/tests-responsive/styles.css +++ b/WebContent/VAADIN/themes/tests-responsive/styles.css @@ -90,3 +90,12 @@ .description[width-range="701px-"] { font-size: 30px; } + +/* Styles for ResponsiveWidthAndHeight test. */ +.v-csslayout-width-and-height[width-range~="0-599px"][height-range~="0-499px"] { + background: blue; + color: #fff; +} +.v-csslayout-width-and-height[height-range~="500px-"][width-range~="600px-"] { + background: red; +}
\ No newline at end of file diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index f98b7c78d1..7d86cf7cc2 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -25,6 +25,7 @@ <param-value>com.vaadin.tests.components.button.Buttons</param-value> </init-param> <async-supported>true</async-supported> + <load-on-startup>1</load-on-startup> </servlet> <servlet> <servlet-name>Embed App 2</servlet-name> @@ -34,6 +35,7 @@ <param-value>com.vaadin.tests.components.label.MarginsInLabels</param-value> </init-param> <async-supported>true</async-supported> + <load-on-startup>2</load-on-startup> </servlet> <servlet> <servlet-name>UI provider app</servlet-name> @@ -47,6 +49,7 @@ <param-value>com.vaadin.tests.VerifyAssertionsEnabled</param-value> </init-param> <async-supported>true</async-supported> + <load-on-startup>3</load-on-startup> </servlet> <servlet> @@ -74,6 +77,7 @@ <param-value>42</param-value> </init-param> <async-supported>true</async-supported> + <load-on-startup>4</load-on-startup> </servlet> <servlet> @@ -84,6 +88,7 @@ --> <servlet-name>VaadinApplicationRunnerWithTimeoutRedirect</servlet-name> <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class> + <load-on-startup>5</load-on-startup> </servlet> <servlet> @@ -94,6 +99,7 @@ <param-value>automatic</param-value> </init-param> <async-supported>true</async-supported> + <load-on-startup>6</load-on-startup> </servlet> <!-- For testing GAE - the deployment script changes this to use GAEVaadinServlet --> @@ -105,6 +111,7 @@ <param-value>com.vaadin.tests.integration.ServletIntegrationUI</param-value> </init-param> <async-supported>true</async-supported> + <load-on-startup>7</load-on-startup> </servlet> <servlet-mapping> <servlet-name>Embed App 1</servlet-name> |