From 2536b02aced84345261c26bf446d97186a6a51c8 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 23 Jun 2022 18:09:52 -0700 Subject: [PATCH 1/5] Fixed some colors on default skin Signed-off-by: snipe --- resources/assets/less/skins/skin-blue.less | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/resources/assets/less/skins/skin-blue.less b/resources/assets/less/skins/skin-blue.less index 4e0d91560..e0338f02f 100755 --- a/resources/assets/less/skins/skin-blue.less +++ b/resources/assets/less/skins/skin-blue.less @@ -98,15 +98,20 @@ color: #fff; } +.btn-default:link, a.btn-default:hover, .btn-default:visited, +{ + color: @dark-gray; +} + :root { - --button-default: darken(@blue, 15%); + --button-default: @dark-gray; --button-primary: darken(@blue, 25%); --button-hover: darken(@blue, 30%); --header: @blue; /* Use same as Header picker */ --text-main: #BBB; --text-sub: #9b9b9b; - --link: @blue; /* Use same as Header picker, lighten by 70% */ + --link:darken(@blue, 15%); /* Use same as Header picker, lighten by 70% */ --visited-link: lighten(@blue,10%); /* Use same as Header picker, lighten by 70% */ --hover-link: lighten(@blue,20%); /* Use same as Header picker, lighten by 70% */ --nav-link: #FFF; /* Use same as Header picker */ @@ -144,4 +149,9 @@ a:hover { .search-highlight, .search-highlight:hover { background-color: #e9d15b; +} + +// Link colors for the settings page +a.settings_button:link, a.settings_button:visited, a.settings_button:hover { + color: @light-blue; } \ No newline at end of file From 06d5b5f4b1ce66dc4c9bf67ff3d61ad0b8072178 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 23 Jun 2022 18:10:03 -0700 Subject: [PATCH 2/5] Small change to color in overrides Signed-off-by: snipe --- resources/assets/less/overrides.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index b8a629065..f8a852d66 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -197,8 +197,8 @@ a.accordion-header { color: #f0ad4e; } -.btn-danger.btn-outline { - color: #d9534f; +.btn-danger.btn-outline, a.link-danger:link, a.link-danger:visited, a.link-danger:hover { + color: #dd4b39; } .btn-primary.btn-outline:hover, .btn-success.btn-outline:hover, .btn-info.btn-outline:hover, .btn-warning.btn-outline:hover, .btn-danger.btn-outline:hover { From ea254ccc048a03f657ab62d08dcbab9e71253dc0 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 23 Jun 2022 18:10:14 -0700 Subject: [PATCH 3/5] Tweaked default @blue Signed-off-by: snipe --- resources/assets/less/variables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/less/variables.less b/resources/assets/less/variables.less index 3896858c3..6c1c9cd82 100644 --- a/resources/assets/less/variables.less +++ b/resources/assets/less/variables.less @@ -13,7 +13,7 @@ @aqua: #00c0ef; // Warning @yellow: #f39c12; -@blue: #0073b7; +@blue: #3c8dbc; @navy: #001F3F; @teal: #39CCCC; @olive: #3D9970; From 35365882acb6d23cd12178a1226de355547ee6c9 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 23 Jun 2022 18:10:28 -0700 Subject: [PATCH 4/5] Used new settings_button class in settings index Signed-off-by: snipe --- resources/views/settings/index.blade.php | 34 ++++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php index c44ff33b1..6ea397cab 100755 --- a/resources/views/settings/index.blade.php +++ b/resources/views/settings/index.blade.php @@ -50,7 +50,7 @@
- +

{{ trans('admin/settings/general.brand') }} @@ -67,7 +67,7 @@
- +

{{ trans('admin/settings/general.general_settings') }} @@ -84,7 +84,7 @@
- +

{{ trans('admin/settings/general.security') }} @@ -100,7 +100,7 @@
- +

{{ trans('general.groups') }} @@ -117,7 +117,7 @@
- +

{{ trans('admin/settings/general.localization') }} @@ -135,7 +135,7 @@
- +

{{ trans('admin/settings/general.notifications') }} @@ -151,7 +151,7 @@
- +

{{ trans('admin/settings/general.slack') }} @@ -166,7 +166,7 @@
- +

{{ trans('general.asset_tags') }} @@ -181,7 +181,7 @@
- +

{{ trans('admin/settings/general.barcodes') }} @@ -196,7 +196,7 @@
- +

{{ trans('admin/settings/general.labels') }} @@ -212,7 +212,7 @@
- +

{{ trans('admin/settings/general.ldap') }} @@ -227,7 +227,7 @@
- +

{{ trans('admin/settings/general.saml') }} @@ -242,7 +242,7 @@
- +

{{ trans('admin/settings/general.backups') }} @@ -258,7 +258,7 @@
- +

{{ trans('admin/settings/general.login') }} @@ -273,7 +273,7 @@
- +

{{ trans('admin/settings/general.oauth') }} @@ -289,7 +289,7 @@
- +

{{ trans('admin/settings/general.php_overview') }} @@ -306,7 +306,7 @@
- +

{{ trans('admin/settings/general.purge') }} From f4c346a57c1d345c863b4d3510cce235894ae02c Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 23 Jun 2022 18:11:42 -0700 Subject: [PATCH 5/5] Small fixes to default blue skin Signed-off-by: snipe --- public/css/build/app.css | 7 +++-- public/css/build/overrides.css | 7 +++-- public/css/dist/all.css | 14 +++++++--- public/css/dist/skins/skin-blue-dark.css | 28 ++++++++++---------- public/css/dist/skins/skin-blue-dark.min.css | 28 ++++++++++---------- public/css/dist/skins/skin-blue.css | 24 ++++++++++++----- public/css/dist/skins/skin-blue.min.css | 24 ++++++++++++----- public/css/dist/skins/skin-contrast.css | 2 +- public/css/dist/skins/skin-contrast.min.css | 2 +- public/mix-manifest.json | 18 ++++++------- 10 files changed, 93 insertions(+), 61 deletions(-) diff --git a/public/css/build/app.css b/public/css/build/app.css index afbeacb39..8bdc40f58 100644 --- a/public/css/build/app.css +++ b/public/css/build/app.css @@ -501,8 +501,11 @@ a.accordion-header { .btn-warning.btn-outline { color: #f0ad4e; } -.btn-danger.btn-outline { - color: #d9534f; +.btn-danger.btn-outline, +a.link-danger:link, +a.link-danger:visited, +a.link-danger:hover { + color: #dd4b39; } .btn-primary.btn-outline:hover, .btn-success.btn-outline:hover, diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index c7b111aac..ec5c50ab0 100644 --- a/public/css/build/overrides.css +++ b/public/css/build/overrides.css @@ -134,8 +134,11 @@ a.accordion-header { .btn-warning.btn-outline { color: #f0ad4e; } -.btn-danger.btn-outline { - color: #d9534f; +.btn-danger.btn-outline, +a.link-danger:link, +a.link-danger:visited, +a.link-danger:hover { + color: #dd4b39; } .btn-primary.btn-outline:hover, .btn-success.btn-outline:hover, diff --git a/public/css/dist/all.css b/public/css/dist/all.css index c1e794512..03d18f5c4 100644 --- a/public/css/dist/all.css +++ b/public/css/dist/all.css @@ -20042,8 +20042,11 @@ a.accordion-header { .btn-warning.btn-outline { color: #f0ad4e; } -.btn-danger.btn-outline { - color: #d9534f; +.btn-danger.btn-outline, +a.link-danger:link, +a.link-danger:visited, +a.link-danger:hover { + color: #dd4b39; } .btn-primary.btn-outline:hover, .btn-success.btn-outline:hover, @@ -21103,8 +21106,11 @@ a.accordion-header { .btn-warning.btn-outline { color: #f0ad4e; } -.btn-danger.btn-outline { - color: #d9534f; +.btn-danger.btn-outline, +a.link-danger:link, +a.link-danger:visited, +a.link-danger:hover { + color: #dd4b39; } .btn-primary.btn-outline:hover, .btn-success.btn-outline:hover, diff --git a/public/css/dist/skins/skin-blue-dark.css b/public/css/dist/skins/skin-blue-dark.css index 86f5fa8ff..465efa711 100644 --- a/public/css/dist/skins/skin-blue-dark.css +++ b/public/css/dist/skins/skin-blue-dark.css @@ -3,7 +3,7 @@ * ---------- */ .skin-blue-dark .main-header .navbar { - background-color: #0073b7; + background-color: #3c8dbc; } .skin-blue-dark .main-header .navbar .nav > li > a { color: #fff; @@ -29,7 +29,7 @@ color: #fff; } .skin-blue-dark .main-header .navbar .sidebar-toggle:hover { - background-color: #00639e; + background-color: #367fa9; } @media (max-width: 767px) { .skin-blue-dark .main-header .navbar .dropdown-menu li.divider { @@ -40,12 +40,12 @@ color: #fff; } .skin-blue-dark .main-header .navbar .dropdown-menu li a:hover { - background: #00639e; + background: #367fa9; color: #fff; } } .skin-blue-dark .main-header li.user-header { - background-color: #0073b7; + background-color: #3c8dbc; } .skin-blue-dark .content-header { background: transparent; @@ -70,7 +70,7 @@ .skin-blue-dark .sidebar-menu > li.active > a { color: #fff; background: #1e282c; - border-left-color: #0073b7; + border-left-color: #3c8dbc; } .skin-blue-dark .sidebar-menu > li > .treeview-menu { margin: 0 1px; @@ -135,24 +135,24 @@ .btn:hover.btn-primary, .btn .btn-primary:link, .btn:hover .btn-primary:link { - background-color: #005384; + background-color: #307095; border-color: #FFF; color: #FFF; } .btna.btn-primary:hover, .btn:hovera.btn-primary:hover { - background-color: #003351; - border-color: #003351; + background-color: #23536f; + border-color: #23536f; color: #fff; } .btn.btn-white:link, .btn:hover.btn-white:link { - background-color: #005384; + background-color: #307095; color: #fff; } .btn.btn-white:hover, .btn:hover.btn-white:hover { - background-color: #00131e; + background-color: #173648; color: #fff; } a:hover { @@ -169,10 +169,10 @@ a:visited { --back-main: #333; --back-sub: #272727; --back-sub-alt: rgba(0, 0, 0, 0.36); - --button-default: #00436b; - --button-primary: #002338; - --button-hover: #00131e; - --header: #0073b7; + --button-default: #296282; + --button-primary: #1d455b; + --button-hover: #173648; + --header: #3c8dbc; /* Use same as Header picker */ --text-main: #BBB; --text-sub: #9b9b9b; diff --git a/public/css/dist/skins/skin-blue-dark.min.css b/public/css/dist/skins/skin-blue-dark.min.css index 86f5fa8ff..465efa711 100644 --- a/public/css/dist/skins/skin-blue-dark.min.css +++ b/public/css/dist/skins/skin-blue-dark.min.css @@ -3,7 +3,7 @@ * ---------- */ .skin-blue-dark .main-header .navbar { - background-color: #0073b7; + background-color: #3c8dbc; } .skin-blue-dark .main-header .navbar .nav > li > a { color: #fff; @@ -29,7 +29,7 @@ color: #fff; } .skin-blue-dark .main-header .navbar .sidebar-toggle:hover { - background-color: #00639e; + background-color: #367fa9; } @media (max-width: 767px) { .skin-blue-dark .main-header .navbar .dropdown-menu li.divider { @@ -40,12 +40,12 @@ color: #fff; } .skin-blue-dark .main-header .navbar .dropdown-menu li a:hover { - background: #00639e; + background: #367fa9; color: #fff; } } .skin-blue-dark .main-header li.user-header { - background-color: #0073b7; + background-color: #3c8dbc; } .skin-blue-dark .content-header { background: transparent; @@ -70,7 +70,7 @@ .skin-blue-dark .sidebar-menu > li.active > a { color: #fff; background: #1e282c; - border-left-color: #0073b7; + border-left-color: #3c8dbc; } .skin-blue-dark .sidebar-menu > li > .treeview-menu { margin: 0 1px; @@ -135,24 +135,24 @@ .btn:hover.btn-primary, .btn .btn-primary:link, .btn:hover .btn-primary:link { - background-color: #005384; + background-color: #307095; border-color: #FFF; color: #FFF; } .btna.btn-primary:hover, .btn:hovera.btn-primary:hover { - background-color: #003351; - border-color: #003351; + background-color: #23536f; + border-color: #23536f; color: #fff; } .btn.btn-white:link, .btn:hover.btn-white:link { - background-color: #005384; + background-color: #307095; color: #fff; } .btn.btn-white:hover, .btn:hover.btn-white:hover { - background-color: #00131e; + background-color: #173648; color: #fff; } a:hover { @@ -169,10 +169,10 @@ a:visited { --back-main: #333; --back-sub: #272727; --back-sub-alt: rgba(0, 0, 0, 0.36); - --button-default: #00436b; - --button-primary: #002338; - --button-hover: #00131e; - --header: #0073b7; + --button-default: #296282; + --button-primary: #1d455b; + --button-hover: #173648; + --header: #3c8dbc; /* Use same as Header picker */ --text-main: #BBB; --text-sub: #9b9b9b; diff --git a/public/css/dist/skins/skin-blue.css b/public/css/dist/skins/skin-blue.css index 2effd1c46..c6212ed43 100644 --- a/public/css/dist/skins/skin-blue.css +++ b/public/css/dist/skins/skin-blue.css @@ -172,19 +172,24 @@ a.btn-danger:hover, .btn-danger:visited { color: #fff; } +.btn-default:link, +a.btn-default:hover, +.btn-default:visited { + color: #505156; +} :root { - --button-default: #00436b; - --button-primary: #002338; - --button-hover: #00131e; - --header: #0073b7; + --button-default: #505156; + --button-primary: #1d455b; + --button-hover: #173648; + --header: #3c8dbc; /* Use same as Header picker */ --text-main: #BBB; --text-sub: #9b9b9b; - --link: #0073b7; + --link: #296282; /* Use same as Header picker, lighten by 70% */ - --visited-link: #0093ea; + --visited-link: #5fa4cc; /* Use same as Header picker, lighten by 70% */ - --hover-link: #1eabff; + --hover-link: #86bad8; /* Use same as Header picker, lighten by 70% */ --nav-link: #FFF; /* Use same as Header picker */ @@ -223,4 +228,9 @@ a:hover { .search-highlight:hover { background-color: #e9d15b; } +a.settings_button:link, +a.settings_button:visited, +a.settings_button:hover { + color: #3c8dbc; +} diff --git a/public/css/dist/skins/skin-blue.min.css b/public/css/dist/skins/skin-blue.min.css index 2effd1c46..c6212ed43 100644 --- a/public/css/dist/skins/skin-blue.min.css +++ b/public/css/dist/skins/skin-blue.min.css @@ -172,19 +172,24 @@ a.btn-danger:hover, .btn-danger:visited { color: #fff; } +.btn-default:link, +a.btn-default:hover, +.btn-default:visited { + color: #505156; +} :root { - --button-default: #00436b; - --button-primary: #002338; - --button-hover: #00131e; - --header: #0073b7; + --button-default: #505156; + --button-primary: #1d455b; + --button-hover: #173648; + --header: #3c8dbc; /* Use same as Header picker */ --text-main: #BBB; --text-sub: #9b9b9b; - --link: #0073b7; + --link: #296282; /* Use same as Header picker, lighten by 70% */ - --visited-link: #0093ea; + --visited-link: #5fa4cc; /* Use same as Header picker, lighten by 70% */ - --hover-link: #1eabff; + --hover-link: #86bad8; /* Use same as Header picker, lighten by 70% */ --nav-link: #FFF; /* Use same as Header picker */ @@ -223,4 +228,9 @@ a:hover { .search-highlight:hover { background-color: #e9d15b; } +a.settings_button:link, +a.settings_button:visited, +a.settings_button:hover { + color: #3c8dbc; +} diff --git a/public/css/dist/skins/skin-contrast.css b/public/css/dist/skins/skin-contrast.css index 71ed3137b..b5d7fc4e9 100644 --- a/public/css/dist/skins/skin-contrast.css +++ b/public/css/dist/skins/skin-contrast.css @@ -211,7 +211,7 @@ input::-ms-input-placeholder { color: #37383c !important; } .callout.callout-info { - background-color: #003351 !important; + background-color: #23536f !important; } .fixed-table-container tbody .selected td { background-color: #fff8af; diff --git a/public/css/dist/skins/skin-contrast.min.css b/public/css/dist/skins/skin-contrast.min.css index 71ed3137b..b5d7fc4e9 100644 --- a/public/css/dist/skins/skin-contrast.min.css +++ b/public/css/dist/skins/skin-contrast.min.css @@ -211,7 +211,7 @@ input::-ms-input-placeholder { color: #37383c !important; } .callout.callout-info { - background-color: #003351 !important; + background-color: #23536f !important; } .fixed-table-container tbody .selected td { background-color: #fff8af; diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 24b222eba..387c027b4 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,12 +1,12 @@ { "/js/build/app.js": "/js/build/app.js?id=8b75d505c1bee38e15573e394b96f249", - "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f577ce74b0dc04d0ec2bdc31b6b57e54", - "/css/build/overrides.css": "/css/build/overrides.css?id=2921802af70bd9f0c247e5dd4e23c442", - "/css/build/app.css": "/css/build/app.css?id=6c9a6e04ac7d56ee6fdb027488627b3c", + "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=71977934351d63b126c6b3573baf3349", + "/css/build/overrides.css": "/css/build/overrides.css?id=850778acc6fa9f9ba0c399c026608d4d", + "/css/build/app.css": "/css/build/app.css?id=d7704c35fe632144a1c62703a7441a1f", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dc383f8560a8d4adb51d44fb4043e03b", "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=0715caf11a30f0756768c093ee3a5a8f", "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=c17de79571bc6dc421127b87cab2e2dc", - "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=d7326fc67c3ca143b9233b7a43051840", + "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=e8c9cf22560dcdec04ec955198160463", "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=8b9d88179519a78562f039983f31e093", "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=47021aa27f4112d4abb6ba9ca371ded3", "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=d8ff93a7b6938b2bf01c12d3c11d1a76", @@ -16,9 +16,9 @@ "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=924fd5e1d5d41ffc483841a628eb9c58", "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=ad668346fb0a97b86491ce33d995c9b6", "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=407f83d58689706f303a83e195f6c041", - "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=6a9d0ac448c28b88e5d6fcff8c440044", + "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=8e538625ebd4b8096e150d1aa483547b", "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=c17879493dcd86dbb6c1701082bec9f7", - "/css/dist/all.css": "/css/dist/all.css?id=a183b0847d54643c0936b906d72cef13", + "/css/dist/all.css": "/css/dist/all.css?id=e96c361789791e57cb4510157fd914f6", "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f2122815b2e4b150", "/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b2414bd51dac5", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7", @@ -31,8 +31,8 @@ "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=ad668346fb0a97b86491ce33d995c9b6", "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=924fd5e1d5d41ffc483841a628eb9c58", "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=81f5e6c7216d0fe56425e158a5446ce0", - "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=f577ce74b0dc04d0ec2bdc31b6b57e54", - "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=d7326fc67c3ca143b9233b7a43051840", + "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=71977934351d63b126c6b3573baf3349", + "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=e8c9cf22560dcdec04ec955198160463", "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=47021aa27f4112d4abb6ba9ca371ded3", "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=8b9d88179519a78562f039983f31e093", "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=c17879493dcd86dbb6c1701082bec9f7", @@ -41,5 +41,5 @@ "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=d8ff93a7b6938b2bf01c12d3c11d1a76", "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=0715caf11a30f0756768c093ee3a5a8f", "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=c17de79571bc6dc421127b87cab2e2dc", - "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=6a9d0ac448c28b88e5d6fcff8c440044" + "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=8e538625ebd4b8096e150d1aa483547b" }