safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-10-31 00:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Smooth dialog show animation, clean dialogs.

Browse Source
This commit is contained in:
Michael Jumper
2013-11-11 11:41:49 -08:00
parent e8d1b7de6f
commit 77da265979
2 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
guacamole/src/main/webapp/scripts/client-ui.js
View File

@@ -702,13 +702,13 @@ GuacUI.Client.attach = function(guac) {
// Connecting // Connecting
case 1: case 1:
GuacUI.Client.showStatus("Connecting", "Connecting to server..."); GuacUI.Client.showStatus("Connecting", "Connecting to Guacamole...");
GuacUI.Client.titlePrefix = "[Connecting...]"; GuacUI.Client.titlePrefix = "[Connecting...]";
break; break;
// Connected + waiting // Connected + waiting
case 2: case 2:
GuacUI.Client.showStatus("Waiting", "Connected. Waiting for first frame..."); GuacUI.Client.showStatus("Connecting", "Connected to Guacamole. Waiting for response...");
GuacUI.Client.titlePrefix = "[Waiting...]"; GuacUI.Client.titlePrefix = "[Waiting...]";
break; break;

38
guacamole/src/main/webapp/styles/client.css
View File

@@ -65,27 +65,6 @@ div.dialogMiddle {
vertical-align: middle; vertical-align: middle;
} }
div.dialog {
padding: 1em;
max-width: 75%;
text-align: left;
display: inline-block;
}
div.dialog h1 {
margin: 0;
margin-bottom: 0.25em;
text-align: center;
}
div.dialog div.buttons {
margin: 0;
margin-top: 0.5em;
text-align: center;
}
button { button {
border-style: solid; border-style: solid;
@@ -257,29 +236,35 @@ div#viewportClone {
} }
@keyframes show-dialog { @keyframes show-dialog {
0% {transform: scale(0.5); } 0% {transform: scale(0.75); }
100% {transform: scale(1); } 100% {transform: scale(1); }
} }
@-webkit-keyframes show-dialog { @-webkit-keyframes show-dialog {
0% {-webkit-transform: scale(0.5); } 0% {-webkit-transform: scale(0.75); }
100% {-webkit-transform: scale(1); } 100% {-webkit-transform: scale(1); }
} }
.dialog { .dialog {
animation-name: show-dialog; animation-name: show-dialog;
animation-timing-function: linear;
animation-duration: 0.125s; animation-duration: 0.125s;
-webkit-animation-name: show-dialog; -webkit-animation-name: show-dialog;
-webkit-animation-timing-function: linear;
-webkit-animation-duration: 0.125s; -webkit-animation-duration: 0.125s;
max-width: 75%;
max-height: none; max-height: none;
width: 4in; width: 4in;
font-size: 0.75em;
-moz-border-radius: 0.2em; -moz-border-radius: 0.2em;
-webkit-border-radius: 0.2em; -webkit-border-radius: 0.2em;
-khtml-border-radius: 0.2em; -khtml-border-radius: 0.2em;
border-radius: 0.2em; border-radius: 0.2em;
padding: 0.5em;
text-align: left;
} }
.guac-error .dialog { .guac-error .dialog {
@@ -294,6 +279,11 @@ div#viewportClone {
margin-bottom: 0.5em; margin-bottom: 0.5em;
} }
.dialog .status {
padding: 0.5em;
font-size: 0.8em;
}
p.hint { p.hint {
border: 0.25em solid rgba(255, 255, 255, 0.25); border: 0.25em solid rgba(255, 255, 255, 0.25);