From e57226f2354dea77b43776c8fb4362c3fdff149e Mon Sep 17 00:00:00 2001
From: Andy Duong <andyduong1920@gmail.com>
Date: Fri, 7 Jul 2023 11:52:30 +0700
Subject: [PATCH 1/2] [#393] Update the Bootstrap vendor fiel

---
 .../stylesheets/vendor/_bootstrap.scss        | 74 ++++++++++---------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/.template/addons/bootstrap/stylesheets/vendor/_bootstrap.scss b/.template/addons/bootstrap/stylesheets/vendor/_bootstrap.scss
index 89072d36c..3591b455c 100644
--- a/.template/addons/bootstrap/stylesheets/vendor/_bootstrap.scss
+++ b/.template/addons/bootstrap/stylesheets/vendor/_bootstrap.scss
@@ -1,53 +1,55 @@
-// By default every component is imported
-// But DO NOT import the whole framework but instead
-// pick what the project requires
-// and comment out the rest.
-
-// Configuration
+// 1. Include functions first (so you can manipulate colors, SVGs, calc, etc)
 @import 'bootstrap/scss/functions';
+
+// 2. Include remainder of required Bootstrap stylesheets (including any separate color mode stylesheets)
 @import 'bootstrap/scss/variables';
 @import 'bootstrap/scss/variables-dark';
-@import 'bootstrap/scss/maps';
-// @import 'sass_maps'; // Optional Sass map overrides here (See: https://getbootstrap.com/docs/5.2/migration/#new-_mapsscss)
-// e.g., $theme-colors: map-merge($theme-colors, $custom-theme-colors);
 
+// 3. Include remainder of required parts
+@import 'bootstrap/scss/maps';
 @import 'bootstrap/scss/mixins';
+@import 'bootstrap/scss/root';
 @import 'bootstrap/scss/utilities';
 
-// Layout & components
-@import 'bootstrap/scss/root';
-@import 'bootstrap/scss/reboot';
-@import 'bootstrap/scss/type';
-@import 'bootstrap/scss/images';
-@import 'bootstrap/scss/containers';
-@import 'bootstrap/scss/grid';
-@import 'bootstrap/scss/tables';
-@import 'bootstrap/scss/forms';
+// 4. Optionally include any other parts as needed
+// By default every component is imported
+// But DO NOT import the whole framework but instead
+// pick what the project requires
+// and comment out the rest.
+@import 'bootstrap/scss/alert';
+@import 'bootstrap/scss/badge';
+@import 'bootstrap/scss/breadcrumb';
+@import 'bootstrap/scss/button-group';
 @import 'bootstrap/scss/buttons';
-@import 'bootstrap/scss/transitions';
+@import 'bootstrap/scss/card';
+@import 'bootstrap/scss/carousel';
+@import 'bootstrap/scss/close';
+@import 'bootstrap/scss/code';
+@import 'bootstrap/scss/custom-forms';
+@import 'bootstrap/scss/containers';
 @import 'bootstrap/scss/dropdown';
-@import 'bootstrap/scss/button-group';
+@import 'bootstrap/scss/forms';
+@import 'bootstrap/scss/grid';
+@import 'bootstrap/scss/helpers';
+@import 'bootstrap/scss/images';
+@import 'bootstrap/scss/input-group';
+@import 'bootstrap/scss/jumbotron';
+@import 'bootstrap/scss/list-group';
+@import 'bootstrap/scss/media';
+@import 'bootstrap/scss/modal';
 @import 'bootstrap/scss/nav';
 @import 'bootstrap/scss/navbar';
-@import 'bootstrap/scss/card';
-@import 'bootstrap/scss/accordion';
-@import 'bootstrap/scss/breadcrumb';
 @import 'bootstrap/scss/pagination';
-@import 'bootstrap/scss/badge';
-@import 'bootstrap/scss/alert';
+@import 'bootstrap/scss/popover';
 @import 'bootstrap/scss/progress';
-@import 'bootstrap/scss/list-group';
-@import 'bootstrap/scss/close';
+@import 'bootstrap/scss/reboot';
+@import 'bootstrap/scss/root';
+@import 'bootstrap/scss/spinners';
+@import 'bootstrap/scss/tables';
 @import 'bootstrap/scss/toasts';
-@import 'bootstrap/scss/modal';
 @import 'bootstrap/scss/tooltip';
-@import 'bootstrap/scss/popover';
-@import 'bootstrap/scss/carousel';
-@import 'bootstrap/scss/spinners';
-@import 'bootstrap/scss/offcanvas';
-
-// Helpers
-@import 'bootstrap/scss/helpers';
+@import 'bootstrap/scss/transitions';
+@import 'bootstrap/scss/type';
 
-// Utilities
+// 5. Optionally include utilities API last to generate classes based on the Sass map in `_utilities.scss`
 @import 'bootstrap/scss/utilities/api';

From d89b31765de3c261298a37318b012f7344e46677 Mon Sep 17 00:00:00 2001
From: Andy Duong <andyduong1920@gmail.com>
Date: Fri, 7 Jul 2023 13:08:03 +0700
Subject: [PATCH 2/2] [#393] Correct the Bootstrap package

---
 .../addons/bootstrap/stylesheets/vendor/_bootstrap.scss   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.template/addons/bootstrap/stylesheets/vendor/_bootstrap.scss b/.template/addons/bootstrap/stylesheets/vendor/_bootstrap.scss
index 3591b455c..2ab59fbf8 100644
--- a/.template/addons/bootstrap/stylesheets/vendor/_bootstrap.scss
+++ b/.template/addons/bootstrap/stylesheets/vendor/_bootstrap.scss
@@ -16,6 +16,7 @@
 // But DO NOT import the whole framework but instead
 // pick what the project requires
 // and comment out the rest.
+@import 'bootstrap/scss/accordion';
 @import 'bootstrap/scss/alert';
 @import 'bootstrap/scss/badge';
 @import 'bootstrap/scss/breadcrumb';
@@ -24,22 +25,19 @@
 @import 'bootstrap/scss/card';
 @import 'bootstrap/scss/carousel';
 @import 'bootstrap/scss/close';
-@import 'bootstrap/scss/code';
-@import 'bootstrap/scss/custom-forms';
 @import 'bootstrap/scss/containers';
 @import 'bootstrap/scss/dropdown';
 @import 'bootstrap/scss/forms';
 @import 'bootstrap/scss/grid';
 @import 'bootstrap/scss/helpers';
 @import 'bootstrap/scss/images';
-@import 'bootstrap/scss/input-group';
-@import 'bootstrap/scss/jumbotron';
 @import 'bootstrap/scss/list-group';
-@import 'bootstrap/scss/media';
 @import 'bootstrap/scss/modal';
 @import 'bootstrap/scss/nav';
 @import 'bootstrap/scss/navbar';
+@import 'bootstrap/scss/offcanvas';
 @import 'bootstrap/scss/pagination';
+@import 'bootstrap/scss/placeholders';
 @import 'bootstrap/scss/popover';
 @import 'bootstrap/scss/progress';
 @import 'bootstrap/scss/reboot';