From bef5377371c3f34253e3ad44ff378b2ba1926fcb Mon Sep 17 00:00:00 2001 From: Mirko Arena Date: Sun, 5 Mar 2017 11:52:38 +0100 Subject: [PATCH 1/2] Fixes #1660 moving navbar z-index to 1000, overlay z-index to 999, so both under bootstrap modal fader 1050 (used over reboots/shutdown and login screen) Signed-off-by: Mirko Arena --- .../storageadmin/static/storageadmin/css/style.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/rockstor/storageadmin/static/storageadmin/css/style.css b/src/rockstor/storageadmin/static/storageadmin/css/style.css index b4d8e62c6..23adec5ec 100644 --- a/src/rockstor/storageadmin/static/storageadmin/css/style.css +++ b/src/rockstor/storageadmin/static/storageadmin/css/style.css @@ -140,6 +140,7 @@ select, textarea, input[type="text"], input[type="password"], input[type="dateti margin-bottom: 0px; box-shadow: none; border-radius: 0; + z-index: 1000; } .navbar-outer { box-shadow: 0px 0px 12px rgb(85, 85, 85); } .navbar-inner { min-height: 60px; } @@ -796,13 +797,13 @@ label.error { font-size: 12px; color: #b94a48; } #breadcrumbs h3 { color: #005580; padding: 0; margin: 0;} -#appliance-name, #local-time , #direct-shell { +#appliance-name, #local-time, #direct-shell, #shutdown-status { color: #FFFFFF; font-family: Roboto-Light; font-size: 12px; } -#local-time, #direct-shell { +#local-time, #direct-shell, #shutdown-status { padding-left: 20px; display: inline-block; } @@ -2733,7 +2734,7 @@ This file is generated by `grunt build`, do not edit it by hand. bottom:0; background-color:rgba(0, 0, 0, 0.57); background: url(data:;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAABl0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuNUmK/OAAAAATSURBVBhXY2RgYNgHxGAAYuwDAA78AjwwRoQYAAAAAElFTkSuQmCC) repeat scroll transparent\9; /* ie fallback png background image */ - z-index:9999; + z-index:999; color:white; } From e34d4f05be7862f72442030c9442fa61a8cf12f0 Mon Sep 17 00:00:00 2001 From: Mirko Arena Date: Sun, 5 Mar 2017 11:55:11 +0100 Subject: [PATCH 2/2] On #1660 removing unrequired changes from another branch Signed-off-by: Mirko Arena --- src/rockstor/storageadmin/static/storageadmin/css/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rockstor/storageadmin/static/storageadmin/css/style.css b/src/rockstor/storageadmin/static/storageadmin/css/style.css index 23adec5ec..e8fb5cd3a 100644 --- a/src/rockstor/storageadmin/static/storageadmin/css/style.css +++ b/src/rockstor/storageadmin/static/storageadmin/css/style.css @@ -797,13 +797,13 @@ label.error { font-size: 12px; color: #b94a48; } #breadcrumbs h3 { color: #005580; padding: 0; margin: 0;} -#appliance-name, #local-time, #direct-shell, #shutdown-status { +#appliance-name, #local-time, #direct-shell { color: #FFFFFF; font-family: Roboto-Light; font-size: 12px; } -#local-time, #direct-shell, #shutdown-status { +#local-time, #direct-shell { padding-left: 20px; display: inline-block; }