diff options
| author | Artur Signell <artur@vaadin.com> | 2013-06-25 22:40:48 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-06-26 07:41:21 +0000 |
| commit | 172d704fe372885e81cc83fe768281e40decfb3a (patch) | |
| tree | cd879a10506127758152df2e87411c8157691318 | |
| parent | c4ec786dba90eac9e41f87d2f31cd93b38935185 (diff) | |
| download | vaadin-framework-172d704fe372885e81cc83fe768281e40decfb3a.tar.gz vaadin-framework-172d704fe372885e81cc83fe768281e40decfb3a.zip | |
Actually show loading indicator during loading (#12128)
* Add theme name already during bootstrap
Change-Id: I78da3029b818ced51714d385cd77f5ba9bfce625
| -rw-r--r-- | WebContent/VAADIN/themes/base/common/common.scss | 2 | ||||
| -rw-r--r-- | server/src/com/vaadin/server/BootstrapHandler.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/WebContent/VAADIN/themes/base/common/common.scss b/WebContent/VAADIN/themes/base/common/common.scss index 48890488fb..c32116cda8 100644 --- a/WebContent/VAADIN/themes/base/common/common.scss +++ b/WebContent/VAADIN/themes/base/common/common.scss @@ -11,7 +11,7 @@ .v-caption { cursor: default; } -body &.v-app-loading { +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 */ background-image: url(img/loading-indicator.gif); diff --git a/server/src/com/vaadin/server/BootstrapHandler.java b/server/src/com/vaadin/server/BootstrapHandler.java index dddfb385a6..b21fdb0b74 100644 --- a/server/src/com/vaadin/server/BootstrapHandler.java +++ b/server/src/com/vaadin/server/BootstrapHandler.java @@ -363,6 +363,7 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler { Element mainDiv = new Element(Tag.valueOf("div"), ""); mainDiv.attr("id", context.getAppId()); mainDiv.addClass("v-app"); + mainDiv.addClass(context.getThemeName()); if (style != null && style.length() != 0) { mainDiv.attr("style", style); } |