From 6164e8b3fafe9886c48788bf5f948d4d5341dfdd Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 3 Apr 2023 23:53:57 -0700 Subject: [PATCH] Changed colors for disabled, removed dupe checkmark Signed-off-by: snipe --- public/css/build/app.css | Bin 22924 -> 23057 bytes public/css/build/overrides.css | Bin 16074 -> 16207 bytes public/css/dist/all.css | Bin 548651 -> 548917 bytes public/mix-manifest.json | 6 +++--- resources/assets/less/overrides.less | 21 +++++++++++---------- resources/views/users/edit.blade.php | 7 +++---- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/public/css/build/app.css b/public/css/build/app.css index a74ffcfc2a1bc7ae7f145743f39d00ba61e82083..558970fa05c157938147a2b1a81e6d23650108a1 100644 GIT binary patch delta 160 zcmeC#%s6oi;|4pQ$w}Tqo4tKzGEcr2B+Z^;41(61ANsp6aVF-aC?x0SUWD6j$m?)EoR delta 59 zcmbQZg|TNd;|4pQ&CWi{m?xhP(%EbkAj&j3GUy7MrKzQfrRiqlU?IlIjX|=LH-}ij K#6E^7umS*#a1>4e diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index 058e30a137754e16df25e3068a44bd777d226ea5..37ec7d15c319c9b7c64bbe52c14595d3e17d441f 100644 GIT binary patch delta 160 zcmX?Ad%kW%jUj7JVp3|(<{HCg%#&p-q}fx9LC|`$yr~NlXJTH8LUMjie$nJ4^Q&wS zsm-<)LX3X;T3QMv8JWcjKva^E3Q?typ9bM%q$X!4uoMUMLvtpH{0xJMw)HYH8 delta 57 zcmX?KcdB+njp61-!)45qc`bA{SD1=2O`dLkh0W5`(!|nqbD@P0F7M2#)7Pc+y&gWTk5|dJMw%-lpSjIg4@l|$d_7r0fwBFtj z%HhJqnV6TNker{BUo>6wD*IJ7h~)Np5gbB{(*vS7SiDLyGK&>}s3ap5qEI0}4Z_Jt zP0miruTX#(kynzMSE7)gr;wTC|0=t}^s|v17BFiH Oue0Y=4R#kQumS)y4tYWV delta 157 zcmdmbKymdx#fBEf7N!>F7M2#)7Pc+y&gZv#oM&IgJpIa5cAf3^m)S*`rpH}nzrt;4 xYH4C=YRy&4r9a*7D!bJ5@N4X!r_a959?AxhnywhbA-0|8276c)#YS+k0szLZH#7hM diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 1ce14addae..1a53ec8e0d 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,8 +1,8 @@ { "/js/build/app.js": "/js/build/app.js?id=7caeae38608edd96421f8ef59d33f5f6", "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374", - "/css/build/overrides.css": "/css/build/overrides.css?id=fcd2390cb449bfb8f93d0cc2342c06ad", - "/css/build/app.css": "/css/build/app.css?id=41f3c631198b89b1319d91200d521dfc", + "/css/build/overrides.css": "/css/build/overrides.css?id=ce23fa22306439befbf49e8e63adb4e0", + "/css/build/app.css": "/css/build/app.css?id=2e40bdf6f6d3d6d6954c391a0a91285e", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dc383f8560a8d4adb51d44fb4043e03b", "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=6f0563e726c2fe4fab4026daaa5bfdf2", "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=f343f659ca1d45534d2c2c3cc30fb619", @@ -18,7 +18,7 @@ "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=0a82a6ae6bb4e58fe62d162c4fb50397", "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=da6c7997d9de2f8329142399f0ce50da", "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=44bf834f2110504a793dadec132a5898", - "/css/dist/all.css": "/css/dist/all.css?id=5c636e1435c3abc16b28184b18c65056", + "/css/dist/all.css": "/css/dist/all.css?id=a637a7360cc5ed945bedda88a468bead", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/webfonts/fa-brands-400.ttf": "/css/webfonts/fa-brands-400.ttf?id=2df05d4beaa48550d71234e8dca79141", diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index fd5a13bfa3..23d87fe6f4 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -704,7 +704,7 @@ label.form-control { font-weight: inherit; } -.form-control--disabled { +label.form-control--disabled { color: #959495; pointer-events:none; cursor: not-allowed; @@ -738,12 +738,12 @@ input[type="checkbox"] { input[type="checkbox"]::before { /** If you want to use the non-checkbox, filled square, use this instead **/ -// content: ""; -// width: 1em; -// height: 1em; -// transform: scale(0); -// transition: 120ms transform ease-in-out; -// box-shadow: inset 1em 1em #428bca; + content: ""; + width: 1em; + height: 1em; + transform: scale(0); + transition: 120ms transform ease-in-out; + box-shadow: inset 1em 1em rgb(211, 211, 211); content: ""; width: 1em; @@ -762,13 +762,13 @@ input[type="checkbox"]:checked::before { transform: scale(1); } -/** This sets the scale of the DISABLED but CHECKED checkbox */ +/** This sets the scale and color of the DISABLED but CHECKED checkbox */ input[type=checkbox]:disabled::before, input[type=radio]:disabled::before { content: ""; width: 1em; height: 1em; transform: scale(1); - box-shadow: inset 1em 1em #959495; + box-shadow: inset 1em 1em rgb(211, 211, 211); } /* This sets the scale and style of a DISABLED checkbox that is NOT checked */ @@ -779,8 +779,9 @@ input[type=checkbox]:disabled:not(:checked)::before, input[type=radio]:disabled: pointer-events:none; } +/** this is the color of the checkbox and content on a disabled, checked box **/ input[type=checkbox]:disabled, input[type=radio]:disabled { - --form-control-color: #959495; + --form-control-color: rgb(211, 211, 211); color: #959495; cursor: not-allowed; pointer-events:none; diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index f36b4a8ebd..d7c956b22f 100755 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -220,8 +220,7 @@ @elseif ($user->id === Auth::user()->id)

{{ trans('admin/users/general.activated_disabled_help_text') }}

@@ -264,7 +263,7 @@ @if (!$user->id)
-
+
@endif - + @include ('partials.forms.edit.image-upload', ['fieldname' => 'avatar', 'image_path' => app('users_upload_path')])