4 files changed, 51 insertions, 3 deletions
diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss
index d40ac1a7bf..56b2e311c6 100644
--- a/WebContent/VAADIN/themes/base/base.scss
+++ b/WebContent/VAADIN/themes/base/base.scss
@@ -17,6 +17,7 @@ $v-line-height: $line-height !default;
 @import "caption/caption.scss";
 @import "colorpicker/colorpicker.scss";
 @import "common/common.scss";
+@import "common/reconnect-dialog.scss";
 @import "csslayout/csslayout.scss";
 @import "customcomponent/customcomponent.scss";
 @import "customlayout/customlayout.scss";
@@ -89,6 +90,7 @@ $v-line-height: $line-height !default;
 
 	// here for now to preserve old semantics
 	@include base-common;
+	@include base-reconnect-dialog;
 
 	@include base-layout;
 	@include base-csslayout;
diff --git a/WebContent/VAADIN/themes/base/common/img/reconnect-spinner.gif b/WebContent/VAADIN/themes/base/common/img/reconnect-spinner.gif
new file mode 100644
index 0000000000..bc1a496d11
--- /dev/null
+++ b/WebContent/VAADIN/themes/base/common/img/reconnect-spinner.gif
diff --git a/WebContent/VAADIN/themes/base/common/reconnect-dialog.scss b/WebContent/VAADIN/themes/base/common/reconnect-dialog.scss
new file mode 100644
index 0000000000..cde587cfe9
--- /dev/null
+++ b/WebContent/VAADIN/themes/base/common/reconnect-dialog.scss
@@ -0,0 +1,32 @@
+@mixin base-reconnect-dialog {
+  .v-reconnect-dialog {
+    color: white;
+    top: 12px;
+    right: 12px;
+    max-width: 100%;
+    border-radius: 0;
+    @include box-shadow(0 0 20px 0 rgba(0,0,0,0.25));
+    padding: 10px;
+
+    background-color: #444;
+    text-align: center;
+
+    .text {
+        display: inline-block;
+        padding-left: 10px;
+    }
+
+    .spinner {
+        background-image: url(img/reconnect-spinner.gif);
+        width: 31px;
+        height: 31px;
+        display: inline-block;
+        visibility: hidden;
+        vertical-align: middle;
+    }
+
+    &.active .spinner {
+        visibility: visible;
+    }
+  }
+}
+\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/valo/shared/_reconnect-dialog.scss b/WebContent/VAADIN/themes/valo/shared/_reconnect-dialog.scss
index 81077efcc4..583cc4d11c 100644
--- a/WebContent/VAADIN/themes/valo/shared/_reconnect-dialog.scss
+++ b/WebContent/VAADIN/themes/valo/shared/_reconnect-dialog.scss
@@ -1,14 +1,28 @@
 @mixin valo-reconnect-dialog {
   .v-reconnect-dialog {
     color: white;
-    @include valo-notification-bar-style("v-reconnect-dialog");
-    @include valo-notification-system-style("v-reconnect-dialog");
+    top: $v-layout-spacing-vertical;
+    right: $v-layout-spacing-horizontal;
+    max-width: 100%;
+    border-radius: 0;
+    @include box-shadow(0 0 20px 0 rgba(0,0,0,0.25));
+    padding: round($v-unit-size/3) round($v-unit-size/2.5);
+
+    background-color: #444;
+    background-color: rgba(#444, .9);
+    line-height: round($v-font-size * 1.4);
+
     text-align: center;
+    .text {
+        display: inline-block;
+        padding-left: 10px;
+    }
+
     .spinner {
       @include valo-spinner;
       display: inline-block;
-      margin-top: 10px;
       visibility: hidden;
+      vertical-align: middle;
     }
 
     &.active .spinner {