Bootstrap 5 upgrade

commit 599f4de Author: Sam Poyigi <[email protected]> Date: Wed Apr 20 08:26:53 2022 +0100 wip Signed-off-by: Sam Poyigi <[email protected]> commit 8c862cf Author: Sam Poyigi <[email protected]> Date: Mon Apr 18 21:22:05 2022 +0100 wip Signed-off-by: Sam Poyigi <[email protected]> Signed-off-by: Sam Poyigi <[email protected]>
tastyigniter · Apr 27, 2022 · ce5e106 · ce5e106
1 parent 992d1ed
commit ce5e106
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 20 deletions.
diff --git a/components/account/login.blade.php b/components/account/login.blade.php
@@ -15,9 +15,7 @@ class="form-control input-lg"
             autofocus=""
             required
         />
-        <span class="input-group-addon">
-            <span class="input-group-text">@</span>
-        </span>
+        <span class="input-group-text">@</span>
     </div>
     {!! form_error('email', '<span class="text-danger">', '</span>') !!}
 </div>
@@ -32,24 +30,22 @@ class="form-control input-lg"
             placeholder="@lang('igniter.user::default.login.label_password')"
             required
         />
-        <span class="input-group-addon">
-            <span class="input-group-text"><i class="fa fa-lock"></i></span>
-        </span>
+        <span class="input-group-text"><i class="fa fa-lock"></i></span>
     </div>
     {!! form_error('password', '<span class="text-danger">', '</span>') !!}
 </div>
 
 <div class="form-group">
-    <div class="custom-control custom-checkbox">
+    <div class="form-check">
         <input
             id="rememberLogin"
             type="checkbox"
             name="newsletter"
             value="1"
-            class="custom-control-input"
+            class="form-check-input"
             {!! set_checkbox('remember', '1') !!}
         >
-        <label class="custom-control-label" for="rememberLogin">
+        <label class="form-check-label" for="rememberLogin">
             @lang('igniter.user::default.login.label_remember')
         </label>
     </div>
@@ -67,4 +63,4 @@ class="btn btn-primary btn-block btn-lg"
     </div>
 </div>
 
-{!! form_close() !!}
+{!! form_close() !!}
diff --git a/components/account/register.blade.php b/components/account/register.blade.php
@@ -82,16 +82,16 @@ class="form-control input-lg"
     </div>
 
     <div class="form-group">
-        <div class="custom-control custom-checkbox">
+        <div class="form-check">
             <input
                 id="newsletter"
                 type="checkbox"
                 name="newsletter"
                 value="1"
-                class="custom-control-input"
+                class="form-check-input"
                 {!! set_checkbox('newsletter', '1') !!}
             >
-            <label class="custom-control-label" for="newsletter">
+            <label class="form-check-label" for="newsletter">
                 @lang('igniter.user::default.login.label_newsletter')
             </label>
         </div>
@@ -100,16 +100,16 @@ class="custom-control-input"
 
     @if ($requireRegistrationTerms && $registrationTermsSlug = $account->getRegistrationTermsPageSlug())
         <div class="form-group">
-            <div class="custom-control custom-checkbox">
+            <div class="form-check">
                 <input
                     id="agree-terms"
                     type="checkbox"
                     name="terms"
                     value="1"
-                    class="custom-control-input"
+                    class="form-check-input"
                     {!! set_checkbox('terms', '1') !!}
                 >
-                <label class="custom-control-label" for="agree-terms">
+                <label class="form-check-label" for="agree-terms">
                     {!! sprintf(lang('igniter.user::default.login.label_terms'), url($registrationTermsSlug)) !!}
                 </label>
             </div>

diff --git a/components/account/settings.blade.php b/components/account/settings.blade.php
@@ -60,16 +60,16 @@ class="form-control"
     </div>
 
     <div class="form-group">
-        <div class="custom-control custom-checkbox">
+        <div class="form-check">
             <input
                 type="checkbox"
                 name="newsletter"
                 id="newsletter"
-                class="custom-control-input"
+                class="form-check-input"
                 value="1"
                 {!! set_checkbox('newsletter', '1', (bool)$customer->newsletter) !!}
             >
-            <label for="newsletter" class="custom-control-label">
+            <label for="newsletter" class="form-check-label">
                 @lang('igniter.user::default.settings.label_newsletter')
             </label>
         </div>

diff --git a/components/addressbook/form.blade.php b/components/addressbook/form.blade.php
@@ -75,7 +75,7 @@ class="form-control"
 
     <div class="form-group">
         <label>@lang('igniter.user::default.account.label_country')</label>
-        <select name="address[country_id]" class="form-control">
+        <select name="address[country_id]" class="form-select">
             @foreach (countries() as $key => $value)
                 <option
                     value="{{ $key }}"