Updates for Bootstrap 5

FriendsOfCake · Sep 8, 2024 · a3dcf6a · a3dcf6a
1 parent 26807b0
commit a3dcf6a
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/config/asset_compress.ini b/config/asset_compress.ini
@@ -1,13 +1,13 @@
 [crudview.css]
-files[]=https://cdn.jsdelivr.net/npm/bootstrap@4.5/dist/css/bootstrap.min.css
+files[]=https://cdn.jsdelivr.net/npm/bootstrap@5.3/dist/css/bootstrap.min.css
 files[]=https://cdn.jsdelivr.net/npm/[email protected]/dist/flatpickr.min.css
 files[]=https://cdn.jsdelivr.net/npm/[email protected]/dist/css/select2.min.css
-files[]=https://cdn.jsdelivr.net/npm/@ttskch/select2-bootstrap4-theme@1.2/dist/select2-bootstrap4.css
+files[]=https://cdn.jsdelivr.net/npm/select2-bootstrap-5-theme@1.3/dist/select2-bootstrap-5-theme.min.css
 files[]=plugin:CrudView:css/local.css
 
 [crudview_head.js]
-files[]=https://cdn.jsdelivr.net/npm/jquery@3.5/dist/jquery.min.js
-files[]=https://cdn.jsdelivr.net/npm/bootstrap@4.5/dist/js/bootstrap.min.js
+files[]=https://cdn.jsdelivr.net/npm/jquery@3.7/dist/jquery.min.js
+files[]=https://cdn.jsdelivr.net/npm/bootstrap@5.3/dist/js/bootstrap.min.js
 files[]=https://cdn.jsdelivr.net/npm/[email protected]
 files[]=https://cdn.jsdelivr.net/npm/[email protected]
 files[]=https://cdn.jsdelivr.net/npm/[email protected]/jquery.dirtyforms.min.js

diff --git a/templates/element/form.php b/templates/element/form.php
@@ -33,7 +33,7 @@
         <?php endif; ?>
         <div class="row">
             <div class="col-lg-<?= $formSidebarExists ? '8' : '12' ?>">
-                <div class="form-group">
+                <div class="row">
                     <?= $this->element('form/buttons') ?>
                 </div>
             </div>

diff --git a/templates/element/form/buttons.php b/templates/element/form/buttons.php
@@ -1,5 +1,5 @@
 <?php if (!empty($formSubmitExtraLeftButtons)) : ?>
-<div class="float-left">
+<div class="col-md mb-3 order-last order-md-first">
     <?php
     $btns = [];
     foreach ($formSubmitExtraLeftButtons as $button) {
@@ -19,7 +19,7 @@
 </div>
 <?php endif ?>
 
-<div class="float-right">
+<div class="col-md mb-3 text-end">
     <?= $this->Form->button(
         $formSubmitButtonText,
         ['class' => 'btn btn-primary', 'name' => '_save', 'value' => '1']

diff --git a/templates/element/index/bulk_actions/form_end.php b/templates/element/index/bulk_actions/form_end.php
@@ -20,6 +20,6 @@
         'select' => '<div class="col-sm-10"><select name="{{name}}"{{attrs}}>{{content}}</select>' . $submitButton . '</div>',
     ],
     'type' => 'select',
-    'class' => 'no-selectize',
+    'class' => 'no-select2',
 ]);
 echo $this->Form->end();
diff --git a/templates/element/sidebar.php b/templates/element/sidebar.php
@@ -9,7 +9,7 @@
 }
 ?>
 
-<div class="collapse navbar-collapse show navbar-ex1-collapse navbar-left bs-sidebar">
+<div class="show navbar-ex1-collapse">
     <nav>
         <ul class="nav nav-pills flex-column bg-light">
             <?php if ($sidebarNavigation === null) : ?>

diff --git a/templates/layout/default.php b/templates/layout/default.php
@@ -12,7 +12,7 @@
 </head>
 <body>
     <nav class="navbar navbar-light bg-light" role="navigation">
-        <button type="button" class="navbar-toggler mr-2" data-bs-toggle="collapse" data-bs-target=".navbar-ex1-collapse">
+        <button type="button" class="navbar-toggler ms-3 me-3" data-bs-toggle="collapse" data-bs-target=".navbar-ex1-collapse">
             <span class="navbar-toggler-icon"></span>
         </button>
         <?php