Merge pull request #686 from karelhala/HAWKULAR-775_modalFix

HAWKULAR-775
hawkular · Nov 30, 2015 · 2921a8d · 2921a8d
2 parents 2b7eaa9 + 06d2249
commit 2921a8d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/console/src/main/scripts/plugins/accounts/less/accounts.less b/console/src/main/scripts/plugins/accounts/less/accounts.less
@@ -38,7 +38,12 @@
   font-weight: bold;
 }
 
-body.inactivity-modal-open #main, body.inactivity-modal-open .navbar, body.inactivity-modal-open #idle, body.inactivity-modal-open .screen-content {
+body.inactivity-modal-open #main,
+body.inactivity-modal-open .navbar,
+body.inactivity-modal-open #idle,
+body.inactivity-modal-open .screen-content,
+body.inactivity-modal-open .modal:not(.time-out-dialog)
+{
   filter: blur(5px);
   /* Webkit */
   -webkit-filter: blur(5px);

diff --git a/console/src/main/scripts/plugins/accounts/ts/accountsPlugin.ts b/console/src/main/scripts/plugins/accounts/ts/accountsPlugin.ts
@@ -61,7 +61,8 @@ module HawkularAccounts {
         $modal.open({
           templateUrl: 'plugins/accounts/html/inactivityModal.html',
           backdrop: 'static',
-          keyboard: false
+          keyboard: false,
+          windowClass: 'time-out-dialog'
         }).opened.then(() => {
             HawtioKeycloak.keycloak.clearToken();
           });