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

GUACAMOLE-598: Merge show fatal error message only after a fatal error has occurred.

Browse Source
This commit is contained in:
Nick Couchman
2018-09-07 19:09:38 -04:00
parent 0484a4e485 0cc5c3667b
commit af0f8ea27f
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
guacamole/src/main/webapp/app/index/styles/fatal-page-error.css
View File

@@ -59,3 +59,18 @@
margin: 0 0.25em; margin: 0 0.25em;
margin-bottom: -0.2em; margin-bottom: -0.2em;
} }
/* Ensure fatal error is initially hidden, fading the error message in when
* needed */
.fatal-page-error-outer {
visibility: hidden;
opacity: 0;
transition: opacity, visibility;
transition-duration: 0.25s;
}
.shown.fatal-page-error-outer {
visibility: visible;
opacity: 1;
}

2
guacamole/src/main/webapp/index.html
View File

@@ -58,7 +58,7 @@
</div> </div>
<!-- Absolute fatal error --> <!-- Absolute fatal error -->
<div ng-if="fatalError" class="fatal-page-error-outer"> <div ng-if="fatalError" ng-class="{shown: fatalError}" class="fatal-page-error-outer">
<div class="fatal-page-error-middle"> <div class="fatal-page-error-middle">
<div class="fatal-page-error"> <div class="fatal-page-error">
<h1 translate="APP.DIALOG_HEADER_ERROR"></h1> <h1 translate="APP.DIALOG_HEADER_ERROR"></h1>