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 4e0d91560e..e0338f02fd 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 b8a6290652..f8a852d665 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 3896858c39..6c1c9cd829 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 c44ff33b1b..6ea397cab7 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 | Bin 18746 -> 18810 bytes public/css/build/overrides.css | Bin 11896 -> 11960 bytes public/css/dist/all.css | Bin 476828 -> 476956 bytes public/css/dist/skins/skin-blue-dark.css | Bin 11508 -> 11508 bytes public/css/dist/skins/skin-blue-dark.min.css | Bin 11508 -> 11508 bytes public/css/dist/skins/skin-blue.css | Bin 5314 -> 5494 bytes public/css/dist/skins/skin-blue.min.css | Bin 5314 -> 5494 bytes public/css/dist/skins/skin-contrast.css | Bin 5176 -> 5176 bytes public/css/dist/skins/skin-contrast.min.css | Bin 5176 -> 5176 bytes public/mix-manifest.json | 18 +++++++++--------- 10 files changed, 9 insertions(+), 9 deletions(-) diff --git a/public/css/build/app.css b/public/css/build/app.css index afbeacb39d85677130b8d783f407372b47790d1d..8bdc40f58fcd26714df10934c3ef97e4b07d25e3 100644 GIT binary patch delta 107 zcmdlriSgGY#tlQ-vvUO7u^U_m`tUzpZv9iqK%#zd;bm5HrveY7lYAywZ hc%CM1%kU delta 61 zcmbQ!Cp)KCwxNZwg{g(Pg{6gc3)}kj({CxV^KRcag>4nC0cI2$?V4nWlz>+je#o?-Moa=l?lq7 z+`u6-c|RN1W>F3|Ha24ea|27$$%%aBY(~bW#%5_irZ9~8oi7rm;5(nvdgCUCRgxV0=b69hN+vk z^YbwV8yJ`vnt0U85>)mNM_`hr51suKxROs WGEx&$pn@O|O%@bV*lZ!VM;ZXvyFeNM diff --git a/public/css/dist/skins/skin-blue-dark.min.css b/public/css/dist/skins/skin-blue-dark.min.css index 86f5fa8ff910fae23cc5cdb20bfd0843abbe9482..465efa7117e9e2dc25db0f3ab31ba165f5660548 100644 GIT binary patch delta 231 zcmewo`6Y5f3Y&4VMM_fg#0_Q}7Z@|M8Jn4>C0cI2$?V4nWlz>+je#o?-Moa=l?lq7 z+`u6-c|RN1W>F3|Ha24ea|27$$%%aBY(~bW#%5_irZ9~8oi7rm;5(nvdgCUCRgxV0=b69hN+vk z^YbwV8yJ`vnt0U85>)mNM_`hr51suKxROs WGEx&$pn@O|O%@bV*lZ!VM;ZXvyFeNM diff --git a/public/css/dist/skins/skin-blue.css b/public/css/dist/skins/skin-blue.css index 2effd1c46cba929df9cdea17417e4b7bdf547b53..c6212ed438a75039d5db4e56184068315f4c003a 100644 GIT binary patch delta 319 zcmX@4`Aus>k${O_Qc0d}N@`kSX-Zc=GUNq(MgK~ZLIVo{})g0f+XiK%H4iX_-Xkd(QxnTZ8NDkC*9 zCAA1BXq;@3l9W7IQAlGlm!L75k)@fDg%OaeFnNQZ#N=v0em2vzM3ZEY3XqU0n}u0Y zVu}S!#b#llbxcW#dc~*qI8|KyM}I=j0>Y KX3bU0#RUL}(`4ZQ delta 147 zcmeySbx3nVk-+4m0k${O_Qc0d}N@`kSX-Zc=GUNq(MgK~ZLIVo{})g0f+XiK%H4iX_-Xkd(QxnTZ8NDkC*9 zCAA1BXq;@3l9W7IQAlGlm!L75k)@fDg%OaeFnNQZ#N=v0em2vzM3ZEY3XqU0n}u0Y zVu}S!#b#llbxcW#dc~*qI8|KyM}I=j0>Y KX3bU0#RUL}(`4ZQ delta 147 zcmeySbx3nVk-+4m0