Browse Source

Reconnect dialog basic css for all themes (#11733)

Change-Id: I070cca17377dc49095481012717bab8931fb375b
tags/7.6.0.alpha5
Artur Signell 8 years ago
parent
commit
d11b90c8ed

+ 2
- 0
WebContent/VAADIN/themes/base/base.scss View File

@@ -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;

BIN
WebContent/VAADIN/themes/base/common/img/reconnect-spinner.gif View File


+ 32
- 0
WebContent/VAADIN/themes/base/common/reconnect-dialog.scss View File

@@ -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;
}
}
}

+ 17
- 3
WebContent/VAADIN/themes/valo/shared/_reconnect-dialog.scss View File

@@ -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 {

+ 5
- 0
client/src/com/vaadin/client/communication/DefaultReconnectDialog.java View File

@@ -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
}
}

+ 1
- 1
client/src/com/vaadin/client/communication/DefaultReconnectDialog.ui.xml View File

@@ -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>

Loading…
Cancel
Save