From c40b8334fc625a589782f49b7c36043793211c8d Mon Sep 17 00:00:00 2001 From: ThoBur <70443365+ThoBur@users.noreply.github.com> Date: Wed, 3 Feb 2021 20:59:05 +0100 Subject: [PATCH 1/4] Update edit.blade.php (#8876) Fix issue #8518 --- resources/views/hardware/edit.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php index f047bab5d..4d86a13f6 100755 --- a/resources/views/hardware/edit.blade.php +++ b/resources/views/hardware/edit.blade.php @@ -229,13 +229,13 @@ var auto_tag = $("#asset_tag").val().replace(/[^\d]/g, ''); var box_html = ''; - + const zeroPad = (num, places) => String(num).padStart(places, '0'); // Check that we haven't exceeded the max number of asset fields if (x < max_fields) { if (auto_tag!='') { - auto_tag = parseInt(auto_tag) + parseInt(x); + auto_tag = zeroPad(parseInt(auto_tag) + parseInt(x),auto_tag.length); } else { auto_tag = ''; } From 5edbb4b2295d2bd74139921d465ce2321ca7b6e2 Mon Sep 17 00:00:00 2001 From: Giuseppe Iannello Date: Wed, 3 Feb 2021 20:59:55 +0100 Subject: [PATCH 2/4] Support Google Cloud IAP (#8768) Following up on https://github.com/snipe/snipe-it/commit/7c2da8170028b2616b99ddf4483c956c057de31b, this extends the logic, adding support for Google Cloud IAP. --- app/Http/Controllers/Auth/LoginController.php | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index f71c12406..c143a2721 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -157,9 +157,26 @@ class LoginController extends Controller if (Setting::getSettings()->login_remote_user_enabled == "1" && isset($remote_user) && !empty($remote_user)) { Log::debug("Authenticating via HTTP header $header_name."); - $pos = strpos($remote_user, '\\'); + $strip_prefixes = [ + // IIS/AD + // https://github.com/snipe/snipe-it/pull/5862 + '\\', + + // Google Cloud IAP + // https://cloud.google.com/iap/docs/identity-howto#getting_the_users_identity_with_signed_headers + 'accounts.google.com:', + ]; + + $pos = 0; + foreach ($strip_prefixes as $needle) { + if (($pos = strpos($remote_user, $needle)) !== FALSE) { + $pos += strlen($needle); + break; + } + } + if ($pos > 0) { - $remote_user = substr($remote_user, $pos + 1); + $remote_user = substr($remote_user, $pos); }; try { From 49415806e1527e66f3576116ad3be935eb51db7a Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 3 Feb 2021 14:56:26 -0800 Subject: [PATCH 3/4] Nicer formatting of the page if custom logout [ch15660] --- resources/lang/en/auth/general.php | 1 + resources/views/auth/passwords/email.blade.php | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/resources/lang/en/auth/general.php b/resources/lang/en/auth/general.php index 33630310d..78b678092 100644 --- a/resources/lang/en/auth/general.php +++ b/resources/lang/en/auth/general.php @@ -8,6 +8,7 @@ return [ 'login' => 'Login', 'login_prompt' => 'Please Login', 'forgot_password' => 'I forgot my password', + 'ldap_reset_password' => 'Please click here to reset your LDAP password', 'remember_me' => 'Remember Me', 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php index 9b78ba9fd..8e2f6560a 100644 --- a/resources/views/auth/passwords/email.blade.php +++ b/resources/views/auth/passwords/email.blade.php @@ -4,12 +4,22 @@ {{-- Page content --}} @section('content') + @if ($snipeSettings->custom_forgot_pass_url) - - {{ trans('auth/general.forgot_password') }} - + +
+
+

+ + {{ trans('auth/general.ldap_reset_password') }} + +

+
+
+ @else +
{!! csrf_field() !!}
From 0bbe0c85d7a78364bc8531ccfefb8ad4ed01baea Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 3 Feb 2021 15:17:31 -0800 Subject: [PATCH 4/4] Small improvement to topnav dropdown text colors in dark skins --- public/css/dist/skins/skin-black-dark.css | 83 +++++++++++----- public/css/dist/skins/skin-black-dark.min.css | 83 +++++++++++----- public/css/dist/skins/skin-blue-dark.css | 4 +- public/css/dist/skins/skin-blue-dark.min.css | 4 +- public/css/dist/skins/skin-green-dark.css | 4 +- public/css/dist/skins/skin-green-dark.min.css | 4 +- public/css/dist/skins/skin-orange-dark.css | 4 +- .../css/dist/skins/skin-orange-dark.min.css | 4 +- public/css/dist/skins/skin-purple-dark.css | 4 +- .../css/dist/skins/skin-purple-dark.min.css | 4 +- public/css/dist/skins/skin-red-dark.css | 4 +- public/css/dist/skins/skin-red-dark.min.css | 4 +- public/css/dist/skins/skin-yellow-dark.css | 4 +- .../css/dist/skins/skin-yellow-dark.min.css | 4 +- public/mix-manifest.json | 28 +++--- .../assets/less/skins/skin-black-dark.less | 94 +++++++++++++------ .../assets/less/skins/skin-blue-dark.less | 4 +- .../assets/less/skins/skin-green-dark.less | 4 +- .../assets/less/skins/skin-orange-dark.less | 4 +- .../assets/less/skins/skin-purple-dark.less | 4 +- .../assets/less/skins/skin-red-dark.less | 4 +- .../assets/less/skins/skin-yellow-dark.less | 4 +- 22 files changed, 230 insertions(+), 130 deletions(-) diff --git a/public/css/dist/skins/skin-black-dark.css b/public/css/dist/skins/skin-black-dark.css index 55158a422..21f676fa9 100644 --- a/public/css/dist/skins/skin-black-dark.css +++ b/public/css/dist/skins/skin-black-dark.css @@ -170,12 +170,19 @@ a:visited { --background: #222; --back-main: #333; --back-sub: #444; + --button-default: #000000; + --button-primary: #000000; + --button-hover: #000000; --header: #111; /* Use same as Header picker */ - --text-main: #FFF; - --text-sub: #BBB; - --link: #919191; - /* Use same as Header picker */ + --text-main: #BBB; + --text-sub: #9b9b9b; + --link: #5e5e5e; + /* Use same as Header picker, lighten by 70% */ + --visited-link: #777777; + /* Use same as Header picker, lighten by 70% */ + --hover-link: #848484; + /* Use same as Header picker, lighten by 70% */ --nav-link: #FFF; /* Use same as Header picker */ --light-link: #fff; @@ -188,6 +195,10 @@ a:visited { background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%); border-color: var(--header); } +.bootstrap-table .fixed-table-container .table thead th .sortable { + color: var(--nav-link); +} +.thead, .navbar-nav > li > a:link { color: var(--nav-link); } @@ -195,17 +206,26 @@ a:visited { background-color: var(--back-main); color: var(--text-main); } -.popover { - background-color: var(--back-main); +a:link { + color: var(--link); } -.popover-title { - background-color: #111; +a:visited { + color: var(--nav-link); +} +a:hover { + color: var(--hover-link); } -a, -a:link, -a:visited, .btn-primary.hover { - color: var(--text-main); + color: var(--nav-link); +} +.small-box h3, +.small-box p { + color: var(--nav-link) !important; +} +.small-box h3 a:hover, +.small-box p a:hover { + text-decoration: none; + color: var(--nav-link) !important; } #accessoriesTable > tbody > tr > td > nobr > a > i.fa { color: var(--text-main); @@ -228,28 +248,32 @@ body { .box-footer, .box-header { background-color: var(--back-sub); - color: var(--text-main); + color: var(--header); } .btn-default { - background-color: var(--back-main); - color: var(--text-main); + background-color: var(--button-default); + color: var(--link); +} +.btn-default dropdown-toggle { + background-color: var(--button-default); + color: var(--link); } .btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active { - background-color: var(--back-sub); - color: var(--header); + background-color: var(--button-hover); + color: var(--link); } .btn-primary, .btn-primary.hover, .btn-primary:active, -.text-blue { +.text-black { color: var(--text-main) !important; } .btn-primary:hover { - background-color: var(--back-main); - color: var(--header) !important; + background-color: var(--button-primary); + color: var(--link) !important; } #componentsTable > tbody > tr > td > nobr > a > i.fa { color: var(--text-main); @@ -282,11 +306,11 @@ body { .dropdown-menu, .dropdown-menu > li > a { background-color: var(--back-sub); - color: var(--text-main); + color: var(--text-main) !important; } .dropdown-menu > li > a:hover { background-color: var(--back-main); - color: var(--text-main); + color: var(--nav-link); } .form-control { background-color: var(--back-main); @@ -401,20 +425,27 @@ input[type=search] { .table-striped > tbody > tr:nth-of-type(odd) { background-color: var(--back-sub); } -#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa { +#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa, +.box-body, +.box-footer, +.box-header { color: var(--text-main); } +.box-header.with-border { + border-bottom: #000; +} a { color: var(--link); } a:link { - color: var(--text-main); + color: var(--link); } a:hover { - color: var(--light-link); + color: var(--hover-link); + text-decoration: underline; } a:visited { - color: var(--text-sub); + color: var(--visited-link); } .row-striped { vertical-align: top; diff --git a/public/css/dist/skins/skin-black-dark.min.css b/public/css/dist/skins/skin-black-dark.min.css index 55158a422..21f676fa9 100644 --- a/public/css/dist/skins/skin-black-dark.min.css +++ b/public/css/dist/skins/skin-black-dark.min.css @@ -170,12 +170,19 @@ a:visited { --background: #222; --back-main: #333; --back-sub: #444; + --button-default: #000000; + --button-primary: #000000; + --button-hover: #000000; --header: #111; /* Use same as Header picker */ - --text-main: #FFF; - --text-sub: #BBB; - --link: #919191; - /* Use same as Header picker */ + --text-main: #BBB; + --text-sub: #9b9b9b; + --link: #5e5e5e; + /* Use same as Header picker, lighten by 70% */ + --visited-link: #777777; + /* Use same as Header picker, lighten by 70% */ + --hover-link: #848484; + /* Use same as Header picker, lighten by 70% */ --nav-link: #FFF; /* Use same as Header picker */ --light-link: #fff; @@ -188,6 +195,10 @@ a:visited { background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%); border-color: var(--header); } +.bootstrap-table .fixed-table-container .table thead th .sortable { + color: var(--nav-link); +} +.thead, .navbar-nav > li > a:link { color: var(--nav-link); } @@ -195,17 +206,26 @@ a:visited { background-color: var(--back-main); color: var(--text-main); } -.popover { - background-color: var(--back-main); +a:link { + color: var(--link); } -.popover-title { - background-color: #111; +a:visited { + color: var(--nav-link); +} +a:hover { + color: var(--hover-link); } -a, -a:link, -a:visited, .btn-primary.hover { - color: var(--text-main); + color: var(--nav-link); +} +.small-box h3, +.small-box p { + color: var(--nav-link) !important; +} +.small-box h3 a:hover, +.small-box p a:hover { + text-decoration: none; + color: var(--nav-link) !important; } #accessoriesTable > tbody > tr > td > nobr > a > i.fa { color: var(--text-main); @@ -228,28 +248,32 @@ body { .box-footer, .box-header { background-color: var(--back-sub); - color: var(--text-main); + color: var(--header); } .btn-default { - background-color: var(--back-main); - color: var(--text-main); + background-color: var(--button-default); + color: var(--link); +} +.btn-default dropdown-toggle { + background-color: var(--button-default); + color: var(--link); } .btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active { - background-color: var(--back-sub); - color: var(--header); + background-color: var(--button-hover); + color: var(--link); } .btn-primary, .btn-primary.hover, .btn-primary:active, -.text-blue { +.text-black { color: var(--text-main) !important; } .btn-primary:hover { - background-color: var(--back-main); - color: var(--header) !important; + background-color: var(--button-primary); + color: var(--link) !important; } #componentsTable > tbody > tr > td > nobr > a > i.fa { color: var(--text-main); @@ -282,11 +306,11 @@ body { .dropdown-menu, .dropdown-menu > li > a { background-color: var(--back-sub); - color: var(--text-main); + color: var(--text-main) !important; } .dropdown-menu > li > a:hover { background-color: var(--back-main); - color: var(--text-main); + color: var(--nav-link); } .form-control { background-color: var(--back-main); @@ -401,20 +425,27 @@ input[type=search] { .table-striped > tbody > tr:nth-of-type(odd) { background-color: var(--back-sub); } -#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa { +#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa, +.box-body, +.box-footer, +.box-header { color: var(--text-main); } +.box-header.with-border { + border-bottom: #000; +} a { color: var(--link); } a:link { - color: var(--text-main); + color: var(--link); } a:hover { - color: var(--light-link); + color: var(--hover-link); + text-decoration: underline; } a:visited { - color: var(--text-sub); + color: var(--visited-link); } .row-striped { vertical-align: top; diff --git a/public/css/dist/skins/skin-blue-dark.css b/public/css/dist/skins/skin-blue-dark.css index 5228907c9..c36ac72a4 100644 --- a/public/css/dist/skins/skin-blue-dark.css +++ b/public/css/dist/skins/skin-blue-dark.css @@ -306,11 +306,11 @@ body { .dropdown-menu, .dropdown-menu > li > a { background-color: var(--back-sub); - color: var(--text-main); + color: var(--text-main) !important; } .dropdown-menu > li > a:hover { background-color: var(--back-main); - color: var(--text-main); + color: var(--nav-link); } .form-control { background-color: var(--back-main); diff --git a/public/css/dist/skins/skin-blue-dark.min.css b/public/css/dist/skins/skin-blue-dark.min.css index 5228907c9..c36ac72a4 100644 --- a/public/css/dist/skins/skin-blue-dark.min.css +++ b/public/css/dist/skins/skin-blue-dark.min.css @@ -306,11 +306,11 @@ body { .dropdown-menu, .dropdown-menu > li > a { background-color: var(--back-sub); - color: var(--text-main); + color: var(--text-main) !important; } .dropdown-menu > li > a:hover { background-color: var(--back-main); - color: var(--text-main); + color: var(--nav-link); } .form-control { background-color: var(--back-main); diff --git a/public/css/dist/skins/skin-green-dark.css b/public/css/dist/skins/skin-green-dark.css index 162243e79..62d7ef197 100644 --- a/public/css/dist/skins/skin-green-dark.css +++ b/public/css/dist/skins/skin-green-dark.css @@ -306,11 +306,11 @@ body { .dropdown-menu, .dropdown-menu > li > a { background-color: var(--back-sub); - color: var(--text-main); + color: var(--text-main) !important; } .dropdown-menu > li > a:hover { background-color: var(--back-main); - color: var(--text-main); + color: var(--nav-link); } .form-control { background-color: var(--back-main); diff --git a/public/css/dist/skins/skin-green-dark.min.css b/public/css/dist/skins/skin-green-dark.min.css index 162243e79..62d7ef197 100644 --- a/public/css/dist/skins/skin-green-dark.min.css +++ b/public/css/dist/skins/skin-green-dark.min.css @@ -306,11 +306,11 @@ body { .dropdown-menu, .dropdown-menu > li > a { background-color: var(--back-sub); - color: var(--text-main); + color: var(--text-main) !important; } .dropdown-menu > li > a:hover { background-color: var(--back-main); - color: var(--text-main); + color: var(--nav-link); } .form-control { background-color: var(--back-main); diff --git a/public/css/dist/skins/skin-orange-dark.css b/public/css/dist/skins/skin-orange-dark.css index a8cf66a28..688e7fc66 100644 --- a/public/css/dist/skins/skin-orange-dark.css +++ b/public/css/dist/skins/skin-orange-dark.css @@ -306,11 +306,11 @@ body { .dropdown-menu, .dropdown-menu > li > a { background-color: var(--back-sub); - color: var(--text-main); + color: var(--text-main) !important; } .dropdown-menu > li > a:hover { background-color: var(--back-main); - color: var(--text-main); + color: var(--nav-link); } .form-control { background-color: var(--back-main); diff --git a/public/css/dist/skins/skin-orange-dark.min.css b/public/css/dist/skins/skin-orange-dark.min.css index a8cf66a28..688e7fc66 100644 --- a/public/css/dist/skins/skin-orange-dark.min.css +++ b/public/css/dist/skins/skin-orange-dark.min.css @@ -306,11 +306,11 @@ body { .dropdown-menu, .dropdown-menu > li > a { background-color: var(--back-sub); - color: var(--text-main); + color: var(--text-main) !important; } .dropdown-menu > li > a:hover { background-color: var(--back-main); - color: var(--text-main); + color: var(--nav-link); } .form-control { background-color: var(--back-main); diff --git a/public/css/dist/skins/skin-purple-dark.css b/public/css/dist/skins/skin-purple-dark.css index ad7d26f46..f65d5cabb 100644 --- a/public/css/dist/skins/skin-purple-dark.css +++ b/public/css/dist/skins/skin-purple-dark.css @@ -306,11 +306,11 @@ body { .dropdown-menu, .dropdown-menu > li > a { background-color: var(--back-sub); - color: var(--text-main); + color: var(--text-main) !important; } .dropdown-menu > li > a:hover { background-color: var(--back-main); - color: var(--text-main); + color: var(--nav-link); } .form-control { background-color: var(--back-main); diff --git a/public/css/dist/skins/skin-purple-dark.min.css b/public/css/dist/skins/skin-purple-dark.min.css index ad7d26f46..f65d5cabb 100644 --- a/public/css/dist/skins/skin-purple-dark.min.css +++ b/public/css/dist/skins/skin-purple-dark.min.css @@ -306,11 +306,11 @@ body { .dropdown-menu, .dropdown-menu > li > a { background-color: var(--back-sub); - color: var(--text-main); + color: var(--text-main) !important; } .dropdown-menu > li > a:hover { background-color: var(--back-main); - color: var(--text-main); + color: var(--nav-link); } .form-control { background-color: var(--back-main); diff --git a/public/css/dist/skins/skin-red-dark.css b/public/css/dist/skins/skin-red-dark.css index 6cbbaa26d..e5f8d0bcf 100644 --- a/public/css/dist/skins/skin-red-dark.css +++ b/public/css/dist/skins/skin-red-dark.css @@ -306,11 +306,11 @@ body { .dropdown-menu, .dropdown-menu > li > a { background-color: var(--back-sub); - color: var(--text-main); + color: var(--text-main) !important; } .dropdown-menu > li > a:hover { background-color: var(--back-main); - color: var(--text-main); + color: var(--nav-link); } .form-control { background-color: var(--back-main); diff --git a/public/css/dist/skins/skin-red-dark.min.css b/public/css/dist/skins/skin-red-dark.min.css index 6cbbaa26d..e5f8d0bcf 100644 --- a/public/css/dist/skins/skin-red-dark.min.css +++ b/public/css/dist/skins/skin-red-dark.min.css @@ -306,11 +306,11 @@ body { .dropdown-menu, .dropdown-menu > li > a { background-color: var(--back-sub); - color: var(--text-main); + color: var(--text-main) !important; } .dropdown-menu > li > a:hover { background-color: var(--back-main); - color: var(--text-main); + color: var(--nav-link); } .form-control { background-color: var(--back-main); diff --git a/public/css/dist/skins/skin-yellow-dark.css b/public/css/dist/skins/skin-yellow-dark.css index 31411c7d0..8fb3ad5bd 100644 --- a/public/css/dist/skins/skin-yellow-dark.css +++ b/public/css/dist/skins/skin-yellow-dark.css @@ -306,11 +306,11 @@ body { .dropdown-menu, .dropdown-menu > li > a { background-color: var(--back-sub); - color: var(--text-main); + color: var(--text-main) !important; } .dropdown-menu > li > a:hover { background-color: var(--back-main); - color: var(--text-main); + color: var(--nav-link); } .form-control { background-color: var(--back-main); diff --git a/public/css/dist/skins/skin-yellow-dark.min.css b/public/css/dist/skins/skin-yellow-dark.min.css index 31411c7d0..8fb3ad5bd 100644 --- a/public/css/dist/skins/skin-yellow-dark.min.css +++ b/public/css/dist/skins/skin-yellow-dark.min.css @@ -306,11 +306,11 @@ body { .dropdown-menu, .dropdown-menu > li > a { background-color: var(--back-sub); - color: var(--text-main); + color: var(--text-main) !important; } .dropdown-menu > li > a:hover { background-color: var(--back-main); - color: var(--text-main); + color: var(--nav-link); } .form-control { background-color: var(--back-main); diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 8d26a8572..aac2fc32a 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -7,27 +7,27 @@ "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=9f62f7b52ce7bc11ddfd", "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=cf23e72b9c963c5ab23a", "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=77ce26763889742cbb58", - "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=df7904b384eef51b4431", + "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=97a05b4e3c6f0e31b895", "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=87b54289d2c1370974d1", - "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=789c0a0fb854092dcfb7", - "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=8a63f9f05840754366c7", + "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=c2d8517bfd68b3bf3509", + "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=51a2ad946665800523fb", "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=3e904c2867143e27aebf", - "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=1407068073f380de9439", + "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=7af6dbd5a265f3fe205e", "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=11813086909e31b3d753", - "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=26ddfee6c70b470c926c", - "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=ae3535bb344876d7b067", - "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=4429cb055e04857b61ae", + "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=36169e10a1d74507c371", + "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=86ff7070f892baa764c7", + "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=f12f9af189df0ff1c615", "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=d1cda85cbff0723be5f7", "/css/dist/all.css": "/css/dist/all.css?id=fc64989106daf3be016b", "/css/blue.png": "/css/blue.png?id=4c85d6a97173123bd14a", "/css/blue@2x.png": "/css/blue@2x.png?id=62c67c6a822439e8a4ac", - "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=df7904b384eef51b4431", - "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=789c0a0fb854092dcfb7", - "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=ae3535bb344876d7b067", - "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=26ddfee6c70b470c926c", - "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=8a63f9f05840754366c7", - "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=1407068073f380de9439", - "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=4429cb055e04857b61ae", + "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=97a05b4e3c6f0e31b895", + "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=c2d8517bfd68b3bf3509", + "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=86ff7070f892baa764c7", + "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=36169e10a1d74507c371", + "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=51a2ad946665800523fb", + "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=7af6dbd5a265f3fe205e", + "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=f12f9af189df0ff1c615", "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=cf23e72b9c963c5ab23a", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced", "/css/build/signature-pad.min.css": "/css/build/signature-pad.min.css?id=d41d8cd98f00b204e980", diff --git a/resources/assets/less/skins/skin-black-dark.less b/resources/assets/less/skins/skin-black-dark.less index 80bc31a8b..a39df366a 100644 --- a/resources/assets/less/skins/skin-black-dark.less +++ b/resources/assets/less/skins/skin-black-dark.less @@ -108,10 +108,15 @@ a { --background: #222; --back-main: #333; --back-sub: #444; + --button-default: darken(@black, 15%); + --button-primary: darken(@black, 25%); + --button-hover: darken(@black, 30%); --header: @black; /* Use same as Header picker */ - --text-main: #FFF; - --text-sub: #BBB; - --link: lighten(@black, 50%); /* Use same as Header picker */ + --text-main: #BBB; + --text-sub: #9b9b9b; + --link: lighten(@black, 30%); /* Use same as Header picker, lighten by 70% */ + --visited-link: lighten(@black, 40%); /* Use same as Header picker, lighten by 70% */ + --hover-link: lighten(@black, 45%); /* Use same as Header picker, lighten by 70% */ --nav-link: #FFF; /* Use same as Header picker */ --light-link: #fff; /* Use same as Header picker */ } @@ -123,7 +128,11 @@ a { border-color: var(--header); } -.navbar-nav>li>a:link { +.bootstrap-table .fixed-table-container .table thead th .sortable { + color: var(--nav-link); +} + +.thead, .navbar-nav>li>a:link { color: var(--nav-link); } @@ -131,22 +140,39 @@ a { background-color: var(--back-main); color: var(--text-main); } -.popover { - background-color:var(--back-main); -} -.popover-title { - background-color: #111; + +a:link { + color: var(--link); } -a, a:link, a:visited, .btn-primary.hover { - color: var(--text-main); +a:visited { + color: var(--nav-link); } + +a:hover { + color: var(--hover-link); +} + +.btn-primary.hover { + color: var(--nav-link); +} + +.small-box h3, .small-box p { + color: var(--nav-link) !important; + a:hover { + text-decoration: none; + color: var(--nav-link) !important; + } +} + + #accessoriesTable>tbody>tr>td>nobr>a>i.fa { color: var(--text-main); } #assetsListingTable>tbody>tr>td>nobr>a>i.fa { color: var(--text-main); } + #assetsListingTable>tbody>tr.selected>td { background-color: var(--back-main); } @@ -158,23 +184,29 @@ body { border-top-color: var(--header); } .box-body, .box-footer, .box-header { - background-color: var(--back-sub); - color: var(--text-main); -} -.btn-default{ - background-color: var(--back-main); - color: var(--text-main); -} -.btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active { background-color: var(--back-sub); color: var(--header); } -.btn-primary, .btn-primary.hover, .btn-primary:active, .text-blue { +.btn-default{ + background-color: var(--button-default); + color: var(--link); +} + +.btn-default dropdown-toggle { + background-color: var(--button-default); + color: var(--link); +} + +.btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active { + background-color: var(--button-hover); + color: var(--link); +} +.btn-primary, .btn-primary.hover, .btn-primary:active, .text-black { color: var(--text-main)!important; } .btn-primary:hover { - background-color: var(--back-main); - color: var(--header)!important; + background-color: var(--button-primary); + color: var(--link)!important; } #componentsTable>tbody>tr>td>nobr>a>i.fa { color: var(--text-main); @@ -201,11 +233,11 @@ body { } .dropdown-menu, .dropdown-menu>li>a { background-color: var(--back-sub); - color: var(--text-main); + color: var(--text-main) !important; } .dropdown-menu>li>a:hover { background-color: var(--back-main); - color: var(--text-main); + color: var(--nav-link); } .form-control { background-color: var(--back-main); @@ -303,19 +335,25 @@ input[type=text], input[type=search] { .table-striped>tbody>tr:nth-of-type(odd) { background-color: var(--back-sub); } -#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa { +#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header { color: var(--text-main); } +.box-header.with-border { + border-bottom: #000; +} + a { color: var(--link); + &:link { - color: var(--text-main) } + color: var(--link) } &:hover { - color: var(--light-link); + color: var(--hover-link); + text-decoration: underline; } &:visited { - color: var(--text-sub) + color: var(--visited-link) } } diff --git a/resources/assets/less/skins/skin-blue-dark.less b/resources/assets/less/skins/skin-blue-dark.less index 61c7e6b20..0c6f76cd5 100644 --- a/resources/assets/less/skins/skin-blue-dark.less +++ b/resources/assets/less/skins/skin-blue-dark.less @@ -233,11 +233,11 @@ body { } .dropdown-menu, .dropdown-menu>li>a { background-color: var(--back-sub); - color: var(--text-main); + color: var(--text-main) !important; } .dropdown-menu>li>a:hover { background-color: var(--back-main); - color: var(--text-main); + color: var(--nav-link); } .form-control { background-color: var(--back-main); diff --git a/resources/assets/less/skins/skin-green-dark.less b/resources/assets/less/skins/skin-green-dark.less index fda451ca6..355cac4ad 100644 --- a/resources/assets/less/skins/skin-green-dark.less +++ b/resources/assets/less/skins/skin-green-dark.less @@ -233,11 +233,11 @@ body { } .dropdown-menu, .dropdown-menu>li>a { background-color: var(--back-sub); - color: var(--text-main); + color: var(--text-main) !important; } .dropdown-menu>li>a:hover { background-color: var(--back-main); - color: var(--text-main); + color: var(--nav-link); } .form-control { background-color: var(--back-main); diff --git a/resources/assets/less/skins/skin-orange-dark.less b/resources/assets/less/skins/skin-orange-dark.less index 780013d40..d54ef3faf 100644 --- a/resources/assets/less/skins/skin-orange-dark.less +++ b/resources/assets/less/skins/skin-orange-dark.less @@ -233,11 +233,11 @@ body { } .dropdown-menu, .dropdown-menu>li>a { background-color: var(--back-sub); - color: var(--text-main); + color: var(--text-main) !important; } .dropdown-menu>li>a:hover { background-color: var(--back-main); - color: var(--text-main); + color: var(--nav-link); } .form-control { background-color: var(--back-main); diff --git a/resources/assets/less/skins/skin-purple-dark.less b/resources/assets/less/skins/skin-purple-dark.less index 04cdecfc8..eabc939ce 100644 --- a/resources/assets/less/skins/skin-purple-dark.less +++ b/resources/assets/less/skins/skin-purple-dark.less @@ -233,11 +233,11 @@ body { } .dropdown-menu, .dropdown-menu>li>a { background-color: var(--back-sub); - color: var(--text-main); + color: var(--text-main) !important; } .dropdown-menu>li>a:hover { background-color: var(--back-main); - color: var(--text-main); + color: var(--nav-link); } .form-control { background-color: var(--back-main); diff --git a/resources/assets/less/skins/skin-red-dark.less b/resources/assets/less/skins/skin-red-dark.less index e67845983..847050368 100644 --- a/resources/assets/less/skins/skin-red-dark.less +++ b/resources/assets/less/skins/skin-red-dark.less @@ -233,11 +233,11 @@ body { } .dropdown-menu, .dropdown-menu>li>a { background-color: var(--back-sub); - color: var(--text-main); + color: var(--text-main) !important; } .dropdown-menu>li>a:hover { background-color: var(--back-main); - color: var(--text-main); + color: var(--nav-link); } .form-control { background-color: var(--back-main); diff --git a/resources/assets/less/skins/skin-yellow-dark.less b/resources/assets/less/skins/skin-yellow-dark.less index bc8ca2e1f..07408dc59 100644 --- a/resources/assets/less/skins/skin-yellow-dark.less +++ b/resources/assets/less/skins/skin-yellow-dark.less @@ -233,11 +233,11 @@ body { } .dropdown-menu, .dropdown-menu>li>a { background-color: var(--back-sub); - color: var(--text-main); + color: var(--text-main) !important; } .dropdown-menu>li>a:hover { background-color: var(--back-main); - color: var(--text-main); + color: var(--nav-link); } .form-control { background-color: var(--back-main);