Repository: guacamole-client Updated Branches: refs/heads/master 0484a4e48 -> af0f8ea27
GUACAMOLE-598: Ensure fatal error message is hidden by default, shown only when a fatal error has actually occurred. Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/0cc5c366 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/0cc5c366 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/0cc5c366 Branch: refs/heads/master Commit: 0cc5c3667b747d58850c0edf09f1ed9fdf76e692 Parents: 7d822df Author: Michael Jumper <mjum...@apache.org> Authored: Fri Sep 7 13:37:06 2018 -0700 Committer: Michael Jumper <mjum...@apache.org> Committed: Fri Sep 7 13:37:06 2018 -0700 ---------------------------------------------------------------------- .../webapp/app/index/styles/fatal-page-error.css | 15 +++++++++++++++ guacamole/src/main/webapp/index.html | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/0cc5c366/guacamole/src/main/webapp/app/index/styles/fatal-page-error.css ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/app/index/styles/fatal-page-error.css b/guacamole/src/main/webapp/app/index/styles/fatal-page-error.css index a6e28ba..9a50e9c 100644 --- a/guacamole/src/main/webapp/app/index/styles/fatal-page-error.css +++ b/guacamole/src/main/webapp/app/index/styles/fatal-page-error.css @@ -59,3 +59,18 @@ margin: 0 0.25em; 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; +} http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/0cc5c366/guacamole/src/main/webapp/index.html ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/index.html b/guacamole/src/main/webapp/index.html index ff920db..1d51606 100644 --- a/guacamole/src/main/webapp/index.html +++ b/guacamole/src/main/webapp/index.html @@ -58,7 +58,7 @@ </div> <!-- 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"> <h1 translate="APP.DIALOG_HEADER_ERROR"></h1>