diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-07-08 11:32:54 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-07-08 11:32:54 +0300 |
| commit | 770b5b5aced652cd7eed9d49e6c477908a9d7efb (patch) | |
| tree | c4b2b7a6335f919510f323af419c79da74fdf7c7 /shared | |
| parent | ec205707eacb1187ab8f21e7e7c5150944ef349b (diff) | |
| parent | 8c36375edb9cadfec64a67f034d2a6828242df6f (diff) | |
| download | vaadin-framework-770b5b5aced652cd7eed9d49e6c477908a9d7efb.tar.gz vaadin-framework-770b5b5aced652cd7eed9d49e6c477908a9d7efb.zip | |
Merge remote-tracking branch 'origin/master' into grid
Conflicts:
WebContent/release-notes.html
Change-Id: I7f97cb771665485dbc9130a3c9b0365185615fc5
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/src/com/vaadin/shared/ui/ui/UIState.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/shared/src/com/vaadin/shared/ui/ui/UIState.java b/shared/src/com/vaadin/shared/ui/ui/UIState.java index abdc105ba7..3c3785b7d5 100644 --- a/shared/src/com/vaadin/shared/ui/ui/UIState.java +++ b/shared/src/com/vaadin/shared/ui/ui/UIState.java @@ -62,7 +62,6 @@ public class UIState extends TabIndexState { * Configuration for the push channel */ public PushConfigurationState pushConfiguration = new PushConfigurationState(); - public String theme; { primaryStyleName = "v-ui"; // Default is 1 for legacy reasons @@ -96,7 +95,7 @@ public class UIState extends TabIndexState { NotificationRole role) { this.prefix = prefix; this.postfix = postfix; - notificationRole = role; + this.notificationRole = role; } } |