From 744f43676d51ee8b8cb06f2f690305dacd350563 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 22 Aug 2024 12:53:16 +0100
Subject: [PATCH 1/2] Fixed checkbox layout on modal from #15296

Signed-off-by: snipe <snipe@snipe.net>
---
 public/css/build/app.css                   | Bin 27588 -> 27637 bytes
 public/css/build/overrides.css             | Bin 20738 -> 20787 bytes
 public/css/dist/all.css                    | Bin 514110 -> 514208 bytes
 public/js/build/app.js                     | Bin 1008666 -> 1007743 bytes
 public/js/dist/all.js                      | Bin 2777019 -> 2776096 bytes
 public/mix-manifest.json                   |  10 +++++-----
 resources/assets/less/overrides.less       |   4 ++++
 resources/views/settings/backups.blade.php |   8 +++++---
 8 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/public/css/build/app.css b/public/css/build/app.css
index 01822563280cfce28dab20039e566ff797c3e866..66a22ebf9bc31ec27c7dee3767d9d64ed86240b9 100644
GIT binary patch
delta 59
zcmX?do$>2+#tq)4I=T5Ni8;FEiA8ytdFcvz5N<|lPJu!-mx4laeolUom4b3wTAD>-
K+GaP?Ix_&h7Ztkz

delta 14
Vcmex*o$<(Z#tq)4n`=xf%>X$^2CV=9

diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css
index bb8a8b5901b7a6f96d408d5f078bb30cdd65e0fc..75265025237a20fa74ea52e58c1a3002d5af51bd 100644
GIT binary patch
delta 59
zcmZo##JG78<AzQto!tDC#2nr7#G<^+ymSRU2sa}&r$C{aOF<zyKPSJ)N<ld-EzKe^
KZF7rMof!a+>J<|J

delta 14
VcmdnIh_PuA<AzSD&AX&3%>XaS1_b~B

diff --git a/public/css/dist/all.css b/public/css/dist/all.css
index c43fb47e59b8187a45776f0c86a99ace1ddc2b98..dbe027dcdad0614a6db457869fa2a329b265e8c3 100644
GIT binary patch
delta 95
zcmdnDL4LtT`Gyw87N!>F7M2#)7Pc+ypLwP$Sh0$W<`gJYb15h!=jY@XSt%%|rKMRU
Urfom4kiE`qdyX@EWE??d0Pk`ij{pDw

delta 81
zcmZ3mQGVYB`Gyw87N!>F7M2#)7Pc+ypLwQ#yUZ>-Jz)nM_w<GfY&_Eq&a+8wFImK{
OW43*+GkatlZg~I^bsq`<

diff --git a/public/js/build/app.js b/public/js/build/app.js
index c5c6a5cd6b0dce71db851fb5ce9a652f2ec09342..c188a713b4e222dacb98670f4844e3b51818c8ff 100644
GIT binary patch
delta 279
zcmbPr!uJ0G+YM6$1XMKAO7oISGV}8kG&B{exh5xyNKC#jAj8NtdAYEP5JEDwEUyHt
zV4H}-<duR}lZ8apCJPD~PA(MHWmVBoS5BVXETl4dwUEu^*FrjzrG=HbiZk-dtrSX%
zN>isZDzl4B&*5R`V$_^0AR-GieZQD8F4J#`m>`=zd6B5f<Wr)Sli9_zC!2{WU^SOn
z)0(R}S)x5zf)R+BfS4JGS%8=oh}nRc9f&!Am=lP(fS4PId4QM~i21fBOYm>^1^}aj
BQqlkb

delta 1082
zcmcIj&x_MQ6lT?RxAn)iX;cI)PdAXXmUIOLcWXtd9z-bURXoIG>PC~9kW5<RQug3s
z58fQ1;9ucwK|FXY9t4lxJ$Usd2<ppBTbEV#q8>g1Z{ED`n=jw{@wWYP+<x_<bkpjk
z)a5>-U>OZa2<JY1kknwK2+((8=&&$ilu({P8#ab5EdMImA@iI-oru?^>e)XW+AgC#
zKMwDZgtM544_n7Z(3zX>k^m<fmdTy_0WoX&WJO8(Q#x4!Fx|j+ADL?~(<%!V=~J$h
z0*IwDh;!vDBCOQKv+_mprhNW*J`ov~W5wN3O2oHHRcP8((bZPO6U|)A+mdxQ7=8b=
zaB}qZdErz;K2*tx3H3;fT4(I4V$G;OmW&%p^xcWndz0r(#>9lDF_oU?T<ZSX<SQR3
z8;9bZcKXa79$qH_;s4jd)yk!v7K$$wtB`9pJcm1?s$CFWy(u!?_-ofbYs;Je#I;rt
zEo|27xsi3a7DbpAM@Bl~PRt=<KIQ6g7G3a2&!?CDX<L>6OF6I}1kCY3>S_RaOx#qq
zFdAgA?nDuxi7jU}#rxG0o0JTG--lh1w`%q@F)HMHUQ+*f*PS8eX;`x!-cCuJHDKUV
zj}7dEuJ{r0xjkFkR?)CL=B6QTP|oUj*^ULrz&;)8TVs6=u@A8yaR4!oIEYw4EFubs
TBH|F@FyaW}==NA&+P?J@NK0NT

diff --git a/public/js/dist/all.js b/public/js/dist/all.js
index f82e4d678cb1bd1824f6dbfd4f5ae7f018b897f0..9fa488f37ffeddfaaeade801dd6a30cb7b7bb003 100644
GIT binary patch
delta 374
zcmaLQJ4?fG6ozqPQ>`&c|A|qnr`4FmHt_;FD0rE4R9syggi=w26g1Vr!45CDxHz5F
z(T-lAf`XsH$<>eIK?gy^;kP~TJim6do2QP}hK3&Gpd*i7^r3)$7#M&F3pR>SaNuGP
z9)>WC5tJ~Bu}4}oRTS^H(t38-O#L|V&kcSvsl;uQ%9_D@E_u9LB<21@jng#y3U?Iw
z{1KAQ+ZHYHgQ6<mTeQHgLv#5ku7!1uY>IfxrZv8@X_jAX3XPM4=Gls$9k&{My&iaM
z6#_#`_^wEm?`8P^?LyJ~uN!YT@;P#7nQtAM;dh7pKR>x-)wt9>5@k^l<6=ViVp0Sm
T6p@$`RZ$bMNV>W=-QD~IpHgNy

delta 1169
zcmcIjJ#Q015LF;RVtlswa&Xo$llb7ymSqQlB@`1R6eth{f;LKV_}1jedG~a;wlR?v
zijfd4%{EBTrUMDdNEG=4DX6LV2NC~(y*t~W@X-Lp)9Ges-@JJ{^X9|u)W^Nusb@Ha
zNAM_4<1svrCvXO5F@YyBi5jLbjTt<Jr|}G)#dDa&IXsU!oPSU1$vbAN!<xe33{1TO
z0TsewkAf0xCjh#Z4{N;baYmU4U=_9p4Hf<#s<ydpx$%iyPm;poFHWmX&RUM&en11k
zefjlDJ}W=HBh&YE>MBm%G=%lgrA8^_j*HUnxL_0lFq*E@+%i^RqBaVcw97=S6+pgC
z5|H~zazm!lq%12Msml$GT+W8Hs!Y+36wtL;k9?IT1xZpQC-*gC$ODZmhrh;5m>+EN
zo_zgfDJO@knS3Q`JQn9uW>a4&pJ<6A=0wQTB++ljJ*<zEZ;ZMd@%U79d={A;7K;g1
zM&GFCC~+XSQe;6T{ABsq)LYc0;(vSkIYq7=@>IS|6LU7yuG^Nd<eo;Z%7Zki$@vV?
z|JuP9DN@||Ck{3e%FbH39GY5&o1Uiz$%^JZ5SA~%;|>$?;lyOHY0F{PopD+}0NxS6
zTi|lbhDcWh=o8xPL@AuPeb}@-kFuZ|an&TRlery6d%u6Wcps=)s*dL;UVuMdir)M1
zoq-yzLCJi4zeD|g1$qv%d9NC<WyhnAs7{u;k<d+>H#=>$U13$r?*Fj<YJ8tN8KRI^
iSWqY^Tu=aoMTI4WqJpk)QQ?w;p<pVMhEAqDy!#CVNNgnl

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 3cedb083c8..42b5760910 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,9 +1,9 @@
 {
-    "/js/build/app.js": "/js/build/app.js?id=5030f4cb69d0d0b87b7fe6ba1b9eece9",
+    "/js/build/app.js": "/js/build/app.js?id=1d7c22e5a4811c37a9d70bf354ae1e9d",
     "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=f0b08873a06bb54daeee176a9459f4a9",
     "/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=f4397c717b99fce41a633ca6edd5d1f4",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=b4888ad2f6b8e7bdf012279808908c90",
-    "/css/build/app.css": "/css/build/app.css?id=e413bd66bd54cdd31219e148c3d70155",
+    "/css/build/overrides.css": "/css/build/overrides.css?id=9265dbc8adc38d13abec7f8ff0374dce",
+    "/css/build/app.css": "/css/build/app.css?id=76584ef562c22532ffa84748f18e3a65",
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=4ea0068716c1bb2434d87a16d51b98c9",
     "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=7b315b9612b8fde8f9c5b0ddb6bba690",
     "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=393aaa7b368b0670fc42434c8cca7dc7",
@@ -19,7 +19,7 @@
     "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374",
     "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=0640e45bad692dcf62873c6e85904899",
     "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb",
-    "/css/dist/all.css": "/css/dist/all.css?id=d0d01ea8f03fe60b1ea549854d582a0c",
+    "/css/dist/all.css": "/css/dist/all.css?id=0978d9f0ba8d47527c248074b757b03d",
     "/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",
     "/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",
@@ -111,5 +111,5 @@
     "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=393d720a0f9aba560094fbc8d3b0c0f0",
     "/js/build/vendor.js": "/js/build/vendor.js?id=c1c24b883f48dc3d16b817aed0b457cc",
     "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=6660df122e24940d42d03c06775fec7b",
-    "/js/dist/all.js": "/js/dist/all.js?id=05654cea82a7a1b78cb20e449d004268"
+    "/js/dist/all.js": "/js/dist/all.js?id=9fe982072b024cb5b1c41764713de1f7"
 }
diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less
index 735791b4cd..096d67f75c 100644
--- a/resources/assets/less/overrides.less
+++ b/resources/assets/less/overrides.less
@@ -358,6 +358,10 @@ body {
   white-space: normal;
 }
 
+.modal-warning .modal-help {
+  color: #fff8af;
+}
+
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading {
   z-index: 0 !important;
 }
diff --git a/resources/views/settings/backups.blade.php b/resources/views/settings/backups.blade.php
index d4791deeb4..f495795d61 100644
--- a/resources/views/settings/backups.blade.php
+++ b/resources/views/settings/backups.blade.php
@@ -33,10 +33,12 @@
                     </div>
                     <div class="modal-body">
                         <p>{{ trans('admin/settings/message.backup.restore_warning') }}</p>
-                        <p><label><input type="checkbox"
-                                         name="clean" {{ config('backup.sanitize_by_default') ? "checked='checked'" : "" }}>{{ trans('admin/settings/general.backups_clean') }}
+                        <div class="form-group">
+                            <label class="form-control">
+                                <input type="checkbox" name="clean" {{ config('backup.sanitize_by_default') ? "checked='checked'" : "" }}>{{ trans('admin/settings/general.backups_clean') }}
                             </label></p>
-                        <p>{{ trans('admin/settings/general.backups_clean_helptext') }}</p>
+                            <p class="help-block modal-help">{{ trans('admin/settings/general.backups_clean_helptext') }}</p>
+                        </div>
                     </div>
                     <div class="modal-footer">
                         {{ csrf_field() }}

From 8b5d3f7fbd082621abb222565b9268e254ae694c Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 22 Aug 2024 12:56:32 +0100
Subject: [PATCH 2/2] Fixed extra closing p tag

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/settings/backups.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/settings/backups.blade.php b/resources/views/settings/backups.blade.php
index f495795d61..6313a6e404 100644
--- a/resources/views/settings/backups.blade.php
+++ b/resources/views/settings/backups.blade.php
@@ -36,7 +36,7 @@
                         <div class="form-group">
                             <label class="form-control">
                                 <input type="checkbox" name="clean" {{ config('backup.sanitize_by_default') ? "checked='checked'" : "" }}>{{ trans('admin/settings/general.backups_clean') }}
-                            </label></p>
+                            </label>
                             <p class="help-block modal-help">{{ trans('admin/settings/general.backups_clean_helptext') }}</p>
                         </div>
                     </div>