Reconnect dialog basic css for all themes (#11733)

Change-Id: I070cca17377dc49095481012717bab8931fb375b

diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss
index d40ac1a7bfacee3738f13fb0f61b98233806ff87..56b2e311c6d5cd562157059855217fbaeba08fd9 100644 (file)
--- 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 (file)
index 0000000..bc1a496
Binary files /dev/null and b/WebContent/VAADIN/themes/base/common/img/reconnect-spinner.gif differ

diff --git a/WebContent/VAADIN/themes/base/common/reconnect-dialog.scss b/WebContent/VAADIN/themes/base/common/reconnect-dialog.scss
new file mode 100644 (file)
index 0000000..cde587c
--- /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 81077efcc40a22e5262a482d55d74709664fa0f5..583cc4d11c046766c72e5caeca90e4be5717034e 100644 (file)
--- 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 {

diff --git a/client/src/com/vaadin/client/communication/DefaultReconnectDialog.java b/client/src/com/vaadin/client/communication/DefaultReconnectDialog.java
index 60ecce8ae035d86b5a674f85ef4a33809415e851..301967495bdd9b9d5d9de63675c84efb4836c014 100644 (file)
--- a/client/src/com/vaadin/client/communication/DefaultReconnectDialog.java
+++ b/client/src/com/vaadin/client/communication/DefaultReconnectDialog.java
@@ -82,4 +82,9 @@ public class DefaultReconnectDialog extends VOverlay implements ReconnectDialog
         setOwner(connection.getUIConnector().getWidget());
         show();
     }
+
+    @Override
+    public void setPopupPosition(int left, int top) {
+        // Don't set inline styles for position, handle it in the theme
+    }
 }

diff --git a/client/src/com/vaadin/client/communication/DefaultReconnectDialog.ui.xml b/client/src/com/vaadin/client/communication/DefaultReconnectDialog.ui.xml
index 885588f8a5ae76ed05c554d240318cd0cf7b13ad..90e92eaeb67086ec8a85351a733502eee6f48297 100644 (file)
--- a/client/src/com/vaadin/client/communication/DefaultReconnectDialog.ui.xml
+++ b/client/src/com/vaadin/client/communication/DefaultReconnectDialog.ui.xml
@@ -3,9 +3,9 @@
 
        <g:HTMLPanel>
 
+               <div class="spinner" />
                <g:Label ui:field="label" styleName="text"
                        text="Server connection lost, trying to reconnect..." />
-               <div class="spinner" />
        </g:HTMLPanel>
 
 </ui:UiBinder>