From 489e7b6798b817430b8e6d4d9ab57bd3bf45f335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Poupard?= <ffoodd@users.noreply.github.com>
Date: Mon, 22 Feb 2021 07:49:38 +0100
Subject: fix(card): siblings card links in RTL (#33154)

Fixes a bug mentionned in [#32330](https://github.com/twbs/bootstrap/issues/32330#issuecomment-782001326).

Co-authored-by: XhmikosR <xhmikosr@gmail.com>
---
 scss/_card.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/_card.scss b/scss/_card.scss
index 4b2eebf13..e3314219f 100644
--- a/scss/_card.scss
+++ b/scss/_card.scss
@@ -69,7 +69,7 @@
   }
 
   + .card-link {
-    margin-left: $card-spacer-x #{"/* rtl:ignore */"};
+    margin-left: $card-spacer-x;
   }
 }
 
-- 
cgit v1.2.3


From d983744d12be0937bb1aaef06057385d9b553e0c Mon Sep 17 00:00:00 2001
From: Rohit Sharma <rohit2sharma95@gmail.com>
Date: Mon, 22 Feb 2021 12:27:21 +0530
Subject: Remove the default positioning from `.dropup` (#33120)

---
 scss/_dropdown.scss | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'scss')

diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
index b71058c58..209843fac 100644
--- a/scss/_dropdown.scss
+++ b/scss/_dropdown.scss
@@ -70,14 +70,11 @@
 // Allow for dropdowns to go bottom up (aka, dropup-menu)
 // Just add .dropup after the standard .dropdown class and you're set.
 .dropup {
-  .dropdown-menu {
+  .dropdown-menu[data-bs-popper] {
     top: auto;
     bottom: 100%;
-
-    &[data-bs-popper] {
-      margin-top: 0;
-      margin-bottom: $dropdown-spacer;
-    }
+    margin-top: 0;
+    margin-bottom: $dropdown-spacer;
   }
 
   .dropdown-toggle {
-- 
cgit v1.2.3


From ac3a1069b139c12d95ca1b6ac2798e56cf01a83e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Poupard?= <ffoodd@users.noreply.github.com>
Date: Fri, 26 Feb 2021 10:10:02 +0100
Subject: fix(forms): validated controls in input-group

---
 scss/mixins/_forms.scss | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'scss')

diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss
index e3f8061e9..a1e0849df 100644
--- a/scss/mixins/_forms.scss
+++ b/scss/mixins/_forms.scss
@@ -123,5 +123,12 @@
       margin-left: .5em;
     }
   }
+
+  .input-group .form-control,
+  .input-group .form-select {
+    @include form-validation-state-selector($state) {
+      z-index: 3;
+    }
+  }
 }
 // scss-docs-end form-validation-mixins
-- 
cgit v1.2.3


From 0bdf9315077d22022a1f35b60b830398825098ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Poupard?= <ffoodd@users.noreply.github.com>
Date: Fri, 26 Feb 2021 09:29:40 +0100
Subject: fix(list-group): properly set a color on list-group-items

---
 scss/_variables.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/_variables.scss b/scss/_variables.scss
index 3fcba715b..723f5a86b 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -1299,7 +1299,7 @@ $progress-bar-transition:           width .6s ease !default;
 // List group
 
 // scss-docs-start list-group-variables
-$list-group-color:                  null !default;
+$list-group-color:                  $gray-900 !default;
 $list-group-bg:                     $white !default;
 $list-group-border-color:           rgba($black, .125) !default;
 $list-group-border-width:           $border-width !default;
-- 
cgit v1.2.3


From bed8fc8381be8f9aad7ac95727be4ab8975b4f94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Poupard?= <ffoodd@users.noreply.github.com>
Date: Fri, 26 Feb 2021 11:59:28 +0100
Subject: fix(navs): ensure button will grow in fill/justified nav

---
 scss/_nav.scss | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'scss')

diff --git a/scss/_nav.scss b/scss/_nav.scss
index 2534f7f77..ffb27d869 100644
--- a/scss/_nav.scss
+++ b/scss/_nav.scss
@@ -117,6 +117,13 @@
   }
 }
 
+.nav-fill,
+.nav-justified {
+  .nav-item .nav-link {
+    width: 100%; // Make sure button will grow
+  }
+}
+
 
 // Tabbable tabs
 //
-- 
cgit v1.2.3


From 6d93a1371a7edb823f7d625c6f4489f37c06aac1 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Tue, 2 Mar 2021 06:09:14 -0800
Subject: Reset select:disabled opacity and null-ify color to fix rendering
 differences in Chrome

---
 scss/_reboot.scss    | 12 +++++++-----
 scss/_variables.scss |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'scss')

diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index 7b153d1a8..22b9aaa60 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -420,12 +420,10 @@ textarea {
 }
 
 // Remove the inheritance of text transform in Firefox
-
 button,
 select {
   text-transform: none;
 }
-
 // Set the cursor for non-`<button>` buttons
 //
 // Details at https://github.com/twbs/bootstrap/pull/30562
@@ -433,11 +431,15 @@ select {
   cursor: pointer;
 }
 
-// Remove the inheritance of word-wrap in Safari.
-// See https://github.com/twbs/bootstrap/issues/24990
-
 select {
+  // Remove the inheritance of word-wrap in Safari.
+  // See https://github.com/twbs/bootstrap/issues/24990
   word-wrap: normal;
+
+  // Undo the opacity change from Chrome
+  &:disabled {
+    opacity: 1;
+  }
 }
 
 // Remove the dropdown arrow in Chrome from inputs built with datalists.
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 723f5a86b..4ffcf18ed 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -796,8 +796,8 @@ $form-select-indicator-padding:     $form-select-padding-x * 3 !default; // Extr
 $form-select-font-weight:           $input-font-weight !default;
 $form-select-line-height:           $input-line-height !default;
 $form-select-color:                 $input-color !default;
-$form-select-disabled-color:        $gray-600 !default;
 $form-select-bg:                    $input-bg !default;
+$form-select-disabled-color:        null !default;
 $form-select-disabled-bg:           $gray-200 !default;
 $form-select-disabled-border-color: $input-disabled-border-color !default;
 $form-select-bg-position:           right $form-select-padding-x center !default;
-- 
cgit v1.2.3


From 548be2ed6604ddfc8488cd4a793c6271c2caf485 Mon Sep 17 00:00:00 2001
From: GeoSot <geo.sotis@gmail.com>
Date: Tue, 2 Mar 2021 19:10:10 +0200
Subject: Offcanvas as component (#29017)

* Add a new offcanvas component

* offcanvas.js: switch to string constants and `event.key`

* Remove unneeded code

* Sass optimizations

* Fixes

Make sure the element is hidden and not offscreen when inactive
fix close icon negative margins
Add content in right & bottom examples
Re-fix bottom offcanvas height not to cover all viewport

* Wording tweaks

* update tests and offcanvas class

* separate scrollbar functionality and use it in offcanvas

* Update .bundlewatch.config.json

* fix focus

* update btn-close / fix focus on close

* add aria-modal and role
return focus on trigger when offcanvas is closed
change body scrolling timings

* move common code to reusable functions

* add aria-labelledby

* Replace lorem ipsum text

* fix focus when offcanvas is closed

* updates

* revert modal, add tests for scrollbar

* show backdrop by default

* Update offcanvas.md

* Update offcanvas CSS to better match modals

- Add background-clip for borders
- Move from outline to border (less clever, more consistent)
- Add scss-docs in vars

* Revamp offcanvas docs

- Add static example to show and explain the components
- Split live examples and rename them
- Simplify example content
- Expand docs notes elsewhere
- Add sass docs

* Add .offcanvas-title instead of .modal-title

* Rename offcanvas example to offcanvas-navbar to reflect it's purpose

* labelledby references title and not header

* Add default shadow to offcanvas

* enable offcanvas-body to fill all the remaining wrapper area

* Be more descriptive, on Accessibility area

* remove redundant classes

* ensure in case of an already open offcanvas, not to open another one

* bring back backdrop|scroll combinations

* bring back toggling class

* refactor scrollbar method, plus tests

* add check if element is not full-width, according to #30621

* revert all in modal

* use documentElement innerWidth

* Rename classes to -start and -end

Also copyedit some docs wording

* omit some things on scrollbar

* PASS BrowserStack tests

-- IOS devices, Android devices and Browsers on Mac, hide scrollbar by default and appear it, only while scrolling.

* Rename '_handleClosing' to '_addEventListeners'

* change pipe usage to comma

* change Data.getData to Data.get

Co-authored-by: XhmikosR <xhmikosr@gmail.com>
Co-authored-by: Martijn Cuppens <martijn.cuppens@gmail.com>
Co-authored-by: Mark Otto <markdotto@gmail.com>
---
 scss/_offcanvas.scss | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 scss/_variables.scss | 26 +++++++++++++++---
 scss/bootstrap.scss  |  1 +
 3 files changed, 100 insertions(+), 4 deletions(-)
 create mode 100644 scss/_offcanvas.scss

(limited to 'scss')

diff --git a/scss/_offcanvas.scss b/scss/_offcanvas.scss
new file mode 100644
index 000000000..1eeb98966
--- /dev/null
+++ b/scss/_offcanvas.scss
@@ -0,0 +1,77 @@
+.offcanvas {
+  position: fixed;
+  bottom: 0;
+  z-index: $zindex-offcanvas;
+  display: flex;
+  flex-direction: column;
+  max-width: 100%;
+  color: $offcanvas-color;
+  visibility: hidden;
+  background-color: $offcanvas-bg-color;
+  background-clip: padding-box;
+  outline: 0;
+  @include box-shadow($offcanvas-box-shadow);
+  @include transition(transform $offcanvas-transition-duration ease-in-out);
+}
+
+.offcanvas-header {
+  display: flex;
+  justify-content: space-between;
+  padding: $offcanvas-padding-y $offcanvas-padding-x;
+
+  .btn-close {
+    padding: ($offcanvas-padding-y / 2) ($offcanvas-padding-x / 2);
+    margin: ($offcanvas-padding-y / -2) ($offcanvas-padding-x / -2) ($offcanvas-padding-y / -2) auto;
+  }
+}
+
+.offcanvas-title {
+  margin-bottom: 0;
+  line-height: $offcanvas-title-line-height;
+}
+
+.offcanvas-body {
+  flex-grow: 1;
+  padding: $offcanvas-padding-y $offcanvas-padding-x;
+  overflow-y: auto;
+}
+
+.offcanvas-start {
+  top: 0;
+  left: 0;
+  width: $offcanvas-horizontal-width;
+  border-right: $offcanvas-border-width solid $offcanvas-border-color;
+  transform: translateX(-100%);
+}
+
+.offcanvas-end {
+  top: 0;
+  right: 0;
+  width: $offcanvas-horizontal-width;
+  border-left: $offcanvas-border-width solid $offcanvas-border-color;
+  transform: translateX(100%);
+}
+
+.offcanvas-bottom {
+  right: 0;
+  left: 0;
+  height: $offcanvas-vertical-height;
+  max-height: 100%;
+  border-top: $offcanvas-border-width solid $offcanvas-border-color;
+  transform: translateY(100%);
+}
+
+.offcanvas.show {
+  transform: none;
+}
+
+.offcanvas-backdrop::before {
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: $zindex-offcanvas - 1;
+  width: 100vw;
+  height: 100vh;
+  content: "";
+  background-color: $offcanvas-body-backdrop-color;
+}
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 4ffcf18ed..2668a790c 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -902,10 +902,11 @@ $form-validation-states: (
 $zindex-dropdown:                   1000 !default;
 $zindex-sticky:                     1020 !default;
 $zindex-fixed:                      1030 !default;
-$zindex-modal-backdrop:             1040 !default;
-$zindex-modal:                      1050 !default;
-$zindex-popover:                    1060 !default;
-$zindex-tooltip:                    1070 !default;
+$zindex-offcanvas:                  1040 !default;
+$zindex-modal-backdrop:             1050 !default;
+$zindex-modal:                      1060 !default;
+$zindex-popover:                    1070 !default;
+$zindex-tooltip:                    1080 !default;
 // scss-docs-end zindex-stack
 
 
@@ -1431,6 +1432,23 @@ $btn-close-white-filter:     invert(1) grayscale(100%) brightness(200%) !default
 // scss-docs-end close-variables
 
 
+// Offcanvas
+
+// scss-docs-start offcanvas-variables
+$offcanvas-padding-y:               $modal-inner-padding !default;
+$offcanvas-padding-x:               $modal-inner-padding !default;
+$offcanvas-horizontal-width:        400px !default;
+$offcanvas-vertical-height:         30vh !default;
+$offcanvas-transition-duration:     .3s !default;
+$offcanvas-border-color:            $modal-content-border-color !default;
+$offcanvas-border-width:            $modal-content-border-width !default;
+$offcanvas-title-line-height:       $modal-title-line-height !default;
+$offcanvas-bg-color:                $modal-content-bg !default;
+$offcanvas-color:                   $modal-content-color !default;
+$offcanvas-body-backdrop-color:     rgba($modal-backdrop-bg, $modal-backdrop-opacity) !default;
+$offcanvas-box-shadow:              $modal-content-box-shadow-xs !default;
+// scss-docs-end offcanvas-variables
+
 // Code
 
 $code-font-size:                    $small-font-size !default;
diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss
index f5f411753..2687d0991 100644
--- a/scss/bootstrap.scss
+++ b/scss/bootstrap.scss
@@ -42,6 +42,7 @@
 @import "popover";
 @import "carousel";
 @import "spinners";
+@import "offcanvas";
 
 // Helpers
 @import "helpers";
-- 
cgit v1.2.3


From bdffdb93807fccefa524b64fc183b055a8d25591 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Mon, 8 Mar 2021 19:00:06 +0200
Subject: Update devDependencies (#33307)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* @popperjs/core    ^2.9.0  →    ^2.9.1
* autoprefixer     ^10.2.4  →   ^10.2.5
* clean-css-cli     ^5.2.0  →    ^5.2.1
* postcss           ^8.2.6  →    ^8.2.7
* stylelint       ^13.11.0  →  ^13.12.0
---
 scss/_reboot.scss             | 1 -
 scss/forms/_form-control.scss | 4 ----
 2 files changed, 5 deletions(-)

(limited to 'scss')

diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index 22b9aaa60..d49a68fe5 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -570,7 +570,6 @@ legend {
 
 // Inherit font family and line height for file input buttons
 
-// stylelint-disable-next-line selector-pseudo-element-no-unknown
 ::file-selector-button {
   font: inherit;
 }
diff --git a/scss/forms/_form-control.scss b/scss/forms/_form-control.scss
index bac416f8c..9728b91f3 100644
--- a/scss/forms/_form-control.scss
+++ b/scss/forms/_form-control.scss
@@ -73,7 +73,6 @@
   }
 
   // File input buttons theming
-  // stylelint-disable-next-line selector-pseudo-element-no-unknown
   &::file-selector-button {
     padding: $input-padding-y $input-padding-x;
     margin: (-$input-padding-y) (-$input-padding-x);
@@ -89,7 +88,6 @@
     @include transition($btn-transition);
   }
 
-  // stylelint-disable-next-line selector-pseudo-element-no-unknown
   &:hover:not(:disabled):not([readonly])::file-selector-button {
     background-color: $form-file-button-hover-bg;
   }
@@ -150,7 +148,6 @@
   @include font-size($input-font-size-sm);
   @include border-radius($input-border-radius-sm);
 
-  // stylelint-disable-next-line selector-pseudo-element-no-unknown
   &::file-selector-button {
     padding: $input-padding-y-sm $input-padding-x-sm;
     margin: (-$input-padding-y-sm) (-$input-padding-x-sm);
@@ -170,7 +167,6 @@
   @include font-size($input-font-size-lg);
   @include border-radius($input-border-radius-lg);
 
-  // stylelint-disable-next-line selector-pseudo-element-no-unknown
   &::file-selector-button {
     padding: $input-padding-y-lg $input-padding-x-lg;
     margin: (-$input-padding-y-lg) (-$input-padding-x-lg);
-- 
cgit v1.2.3


From 644afc276169fd94ee2e6c5c79df8337be1b12ed Mon Sep 17 00:00:00 2001
From: gopal-jayaraman <78528954+gopal-jayaraman@users.noreply.github.com>
Date: Thu, 11 Mar 2021 08:36:18 +0530
Subject: Removing duplicate text-decoration style for abbr[title] #33197
 (#33325)

Removing duplicate text-decoration style for abbr[title] #33197
---
 scss/_reboot.scss | 1 -
 1 file changed, 1 deletion(-)

(limited to 'scss')

diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index d49a68fe5..352046988 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -142,7 +142,6 @@ p {
 
 abbr[title],
 abbr[data-bs-original-title] { // 1
-  text-decoration: underline; // 2
   text-decoration: underline dotted; // 2
   cursor: help; // 3
   text-decoration-skip-ink: none; // 4
-- 
cgit v1.2.3


From defce830276d04238350c2b738b1d02197c6e37d Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Fri, 12 Feb 2021 10:51:18 -0800
Subject: Add ol.list-group with psuedo-element numbers

---
 scss/_list-group.scss | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'scss')

diff --git a/scss/_list-group.scss b/scss/_list-group.scss
index 7e23b8e0c..ecacb05f2 100644
--- a/scss/_list-group.scss
+++ b/scss/_list-group.scss
@@ -12,6 +12,19 @@
   @include border-radius($list-group-border-radius);
 }
 
+// stylelint-disable selector-no-qualifying-type
+ol.list-group {
+  list-style-type: none;
+  counter-reset: section;
+
+  > li::before {
+    // Increments only this instance of the section counter
+    content: counters(section, ".") ". ";
+    counter-increment: section;
+  }
+}
+// stylelint-enable selector-no-qualifying-type
+
 
 // Interactive list items
 //
-- 
cgit v1.2.3


From 5c6e72c6fea2cef2c7e169ed1d68f9146081d246 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Wed, 10 Mar 2021 21:49:47 -0800
Subject: Change from element selector to the opt-in class

---
 scss/_list-group.scss | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'scss')

diff --git a/scss/_list-group.scss b/scss/_list-group.scss
index ecacb05f2..2193168c5 100644
--- a/scss/_list-group.scss
+++ b/scss/_list-group.scss
@@ -12,8 +12,7 @@
   @include border-radius($list-group-border-radius);
 }
 
-// stylelint-disable selector-no-qualifying-type
-ol.list-group {
+.list-group-numbered {
   list-style-type: none;
   counter-reset: section;
 
@@ -23,7 +22,6 @@ ol.list-group {
     counter-increment: section;
   }
 }
-// stylelint-enable selector-no-qualifying-type
 
 
 // Interactive list items
-- 
cgit v1.2.3


From c198eb6319d63c5414dbe3036ad160bd78d4cf01 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Tue, 16 Mar 2021 22:16:03 -0700
Subject: Revamp accordion borders to fix pixel jumping (#33149)

- Pushes the borders to the .accordion-item
- Simplifies the .accordion-flush
- Recreates the .accordion-button border-bottom with an inset box-shadow
- Updates background-color to solid to match other components like list group and prevent stacked translucent borders
- Use negative margin to overlap the consecutive items
---
 scss/_accordion.scss | 51 +++++++++++++++++++--------------------------------
 scss/_variables.scss |  3 ++-
 2 files changed, 21 insertions(+), 33 deletions(-)

(limited to 'scss')

diff --git a/scss/_accordion.scss b/scss/_accordion.scss
index 298a553e0..294d5229b 100644
--- a/scss/_accordion.scss
+++ b/scss/_accordion.scss
@@ -12,18 +12,15 @@
   color: $accordion-button-color;
   text-align: left; // Reset button style
   background-color: $accordion-button-bg;
-  border: $accordion-border-width solid $accordion-border-color;
+  border: 0;
   @include border-radius(0);
   overflow-anchor: none;
   @include transition($accordion-transition);
 
-  &.collapsed {
-    border-bottom-width: 0;
-  }
-
   &:not(.collapsed) {
     color: $accordion-button-active-color;
     background-color: $accordion-button-active-bg;
+    box-shadow: inset 0 ($accordion-border-width * -1) 0 $accordion-border-color;
 
     &::after {
       background-image: escape-svg($accordion-button-active-icon);
@@ -61,33 +58,35 @@
 }
 
 .accordion-item {
+  margin-bottom: -$accordion-border-width;
+  background-color: $accordion-bg;
+  border: $accordion-border-width solid $accordion-border-color;
+
   &:first-of-type {
+    @include border-top-radius($accordion-border-radius);
+
     .accordion-button {
-      @include border-top-radius($accordion-border-radius);
+      @include border-top-radius($accordion-inner-border-radius);
     }
   }
 
+  // Only set a border-radius on the last item if the accordion is collapsed
   &:last-of-type {
+    margin-bottom: 0;
+    @include border-bottom-radius($accordion-border-radius);
+
     .accordion-button {
-      // Only set a border-radius on the last item if the accordion is collapsed
       &.collapsed {
-        border-bottom-width: $accordion-border-width;
-        @include border-bottom-radius($accordion-border-radius);
+        @include border-bottom-radius($accordion-inner-border-radius);
       }
     }
 
     .accordion-collapse {
-      border-bottom-width: $accordion-border-width;
       @include border-bottom-radius($accordion-border-radius);
     }
   }
 }
 
-.accordion-collapse {
-  border: solid $accordion-border-color;
-  border-width: 0 $accordion-border-width;
-}
-
 .accordion-body {
   padding: $accordion-body-padding-y $accordion-body-padding-x;
 }
@@ -98,29 +97,17 @@
 // Remove borders and border-radius to keep accordion items edge-to-edge.
 
 .accordion-flush {
-  .accordion-button {
-    border-right: 0;
-    border-left: 0;
-    @include border-radius(0);
-  }
-
   .accordion-collapse {
     border-width: 0;
   }
 
   .accordion-item {
-    &:first-of-type {
-      .accordion-button {
-        border-top-width: 0;
-        @include border-top-radius(0);
-      }
-    }
+    @include border-radius(0);
 
-    &:last-of-type {
-      .accordion-button.collapsed {
-        border-bottom-width: 0;
-        @include border-bottom-radius(0);
-      }
+    .accordion-button {
+      border-right: 0;
+      border-left: 0;
+      @include border-radius(0);
     }
   }
 }
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 2668a790c..7558224f9 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -1101,10 +1101,11 @@ $card-group-margin:                 $grid-gutter-width / 2 !default;
 $accordion-padding-y:                     1rem !default;
 $accordion-padding-x:                     1.25rem !default;
 $accordion-color:                         $body-color !default;
-$accordion-bg:                            transparent !default;
+$accordion-bg:                            $body-bg !default;
 $accordion-border-width:                  $border-width !default;
 $accordion-border-color:                  rgba($black, .125) !default;
 $accordion-border-radius:                 $border-radius !default;
+$accordion-inner-border-radius:           subtract($accordion-border-radius, $accordion-border-width) !default;
 
 $accordion-body-padding-y:                $accordion-padding-y !default;
 $accordion-body-padding-x:                $accordion-padding-x !default;
-- 
cgit v1.2.3


From e775c494f2d54d21204f9449a232ec096f702b77 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Mon, 22 Mar 2021 13:01:08 -0700
Subject: Fix flush accordion styles

---
 scss/_accordion.scss | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'scss')

diff --git a/scss/_accordion.scss b/scss/_accordion.scss
index 294d5229b..ae1ca0fbb 100644
--- a/scss/_accordion.scss
+++ b/scss/_accordion.scss
@@ -102,11 +102,14 @@
   }
 
   .accordion-item {
+    border-right: 0;
+    border-left: 0;
     @include border-radius(0);
 
+    &:first-child { border-top: 0; }
+    &:last-child { border-bottom: 0; }
+
     .accordion-button {
-      border-right: 0;
-      border-left: 0;
       @include border-radius(0);
     }
   }
-- 
cgit v1.2.3


From 220139a89ffc3864bbb6e1b35471667318eadc1f Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Tue, 23 Mar 2021 18:26:54 +0200
Subject: Release v5.0.0-beta3 (#33439)

---
 scss/bootstrap-grid.scss      | 2 +-
 scss/bootstrap-reboot.scss    | 2 +-
 scss/bootstrap-utilities.scss | 2 +-
 scss/bootstrap.scss           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'scss')

diff --git a/scss/bootstrap-grid.scss b/scss/bootstrap-grid.scss
index e394a29ed..8116a0ff7 100644
--- a/scss/bootstrap-grid.scss
+++ b/scss/bootstrap-grid.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Grid v5.0.0-beta2 (https://getbootstrap.com/)
+ * Bootstrap Grid v5.0.0-beta3 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
diff --git a/scss/bootstrap-reboot.scss b/scss/bootstrap-reboot.scss
index 7aef48c99..3eff8820a 100644
--- a/scss/bootstrap-reboot.scss
+++ b/scss/bootstrap-reboot.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Reboot v5.0.0-beta2 (https://getbootstrap.com/)
+ * Bootstrap Reboot v5.0.0-beta3 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
diff --git a/scss/bootstrap-utilities.scss b/scss/bootstrap-utilities.scss
index 6c818b63a..9331d8097 100644
--- a/scss/bootstrap-utilities.scss
+++ b/scss/bootstrap-utilities.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Utilities v5.0.0-beta2 (https://getbootstrap.com/)
+ * Bootstrap Utilities v5.0.0-beta3 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss
index 2687d0991..1a975a3db 100644
--- a/scss/bootstrap.scss
+++ b/scss/bootstrap.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v5.0.0-beta2 (https://getbootstrap.com/)
+ * Bootstrap v5.0.0-beta3 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
-- 
cgit v1.2.3


From 91fa809529c1b38600118be9922e2085fd200a77 Mon Sep 17 00:00:00 2001
From: Kyle Tsang <6854874+kyletsang@users.noreply.github.com>
Date: Tue, 30 Mar 2021 23:07:00 -0700
Subject: Make .nav-link color consistent when using buttons (#33478)

* Make .nav-link color consistent when using buttons

* Set $nav-link-hover-color to $link-hover-color as default
---
 scss/_variables.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scss')

diff --git a/scss/_variables.scss b/scss/_variables.scss
index 7558224f9..8e36bd59b 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -917,8 +917,8 @@ $nav-link-padding-y:                .5rem !default;
 $nav-link-padding-x:                1rem !default;
 $nav-link-font-size:                null !default;
 $nav-link-font-weight:              null !default;
-$nav-link-color:                    null !default;
-$nav-link-hover-color:              null !default;
+$nav-link-color:                    $link-color !default;
+$nav-link-hover-color:              $link-hover-color !default;
 $nav-link-transition:               color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out !default;
 $nav-link-disabled-color:           $gray-600 !default;
 
-- 
cgit v1.2.3


From bfafabfd53c330fd341cac97ba07e85abba698ab Mon Sep 17 00:00:00 2001
From: Geremia Taglialatela <tagliala.dev@gmail.com>
Date: Fri, 19 Mar 2021 21:52:58 +0100
Subject: Fix validation feedback icon in select multiple

Validation feedback for `<select multiple>` should look like
`<textarea>`.

The previous implementation was placing the validation icon in the
middle of the select field together with the single select arrow, that
is not supposed to be part of this kind of inputs
---
 scss/mixins/_forms.scss | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'scss')

diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss
index a1e0849df..612f94d17 100644
--- a/scss/mixins/_forms.scss
+++ b/scss/mixins/_forms.scss
@@ -92,6 +92,14 @@
         background-image: escape-svg($form-select-indicator), escape-svg($icon);
         background-position: $form-select-bg-position, $form-select-feedback-icon-position;
         background-size: $form-select-bg-size, $form-select-feedback-icon-size;
+
+        &[multiple],
+        &[size]:not([size="1"]) {
+          padding-right: $input-height-inner;
+          background-image: escape-svg($icon);
+          background-position: top $input-height-inner-quarter right $input-height-inner-quarter;
+          background-size: $form-select-feedback-icon-size;
+        }
       }
 
       &:focus {
-- 
cgit v1.2.3


From 91a24e2b09b5595fbf4c07efbce562e19c76c559 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Sun, 4 Apr 2021 10:51:45 -0700
Subject: Vertically align offcanvas header components

Fixes #33460
---
 scss/_offcanvas.scss | 1 +
 1 file changed, 1 insertion(+)

(limited to 'scss')

diff --git a/scss/_offcanvas.scss b/scss/_offcanvas.scss
index 1eeb98966..aa6c156bd 100644
--- a/scss/_offcanvas.scss
+++ b/scss/_offcanvas.scss
@@ -16,6 +16,7 @@
 
 .offcanvas-header {
   display: flex;
+  align-items: center;
   justify-content: space-between;
   padding: $offcanvas-padding-y $offcanvas-padding-x;
 
-- 
cgit v1.2.3


From 056ad3ad9506a118ca77e3947cffbcef9d46fcd0 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Sun, 4 Apr 2021 11:11:33 -0700
Subject: Add offcanvas-top modifier (#33549)

---
 scss/_offcanvas.scss | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'scss')

diff --git a/scss/_offcanvas.scss b/scss/_offcanvas.scss
index aa6c156bd..5c11101f6 100644
--- a/scss/_offcanvas.scss
+++ b/scss/_offcanvas.scss
@@ -53,6 +53,16 @@
   transform: translateX(100%);
 }
 
+.offcanvas-top {
+  top: 0;
+  right: 0;
+  left: 0;
+  height: $offcanvas-vertical-height;
+  max-height: 100%;
+  border-bottom: $offcanvas-border-width solid $offcanvas-border-color;
+  transform: translateY(-100%);
+}
+
 .offcanvas-bottom {
   right: 0;
   left: 0;
-- 
cgit v1.2.3


From 062ecf67b2b1fefbef8e2d49b95015308e909699 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Sun, 4 Apr 2021 11:44:30 -0700
Subject: Spinner alignment changes

---
 scss/_spinners.scss  | 4 ++--
 scss/_variables.scss | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'scss')

diff --git a/scss/_spinners.scss b/scss/_spinners.scss
index 8e19bae51..a4a2c77cf 100644
--- a/scss/_spinners.scss
+++ b/scss/_spinners.scss
@@ -12,7 +12,7 @@
   display: inline-block;
   width: $spinner-width;
   height: $spinner-height;
-  vertical-align: text-bottom;
+  vertical-align: $spinner-vertical-align;
   border: $spinner-border-width solid currentColor;
   border-right-color: transparent;
   // stylelint-disable-next-line property-disallowed-list
@@ -46,7 +46,7 @@
   display: inline-block;
   width: $spinner-width;
   height: $spinner-height;
-  vertical-align: text-bottom;
+  vertical-align: $spinner-vertical-align;
   background-color: currentColor;
   // stylelint-disable-next-line property-disallowed-list
   border-radius: 50%;
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 8e36bd59b..4c7ce3b0b 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -1406,6 +1406,7 @@ $carousel-dark-control-icon-filter:  invert(1) grayscale(100) !default;
 // scss-docs-start spinner-variables
 $spinner-width:           2rem !default;
 $spinner-height:          $spinner-width !default;
+$spinner-vertical-align:  -.125em !default;
 $spinner-border-width:    .25em !default;
 $spinner-animation-speed: .75s !default;
 
-- 
cgit v1.2.3


From 0c56749f136c0d01aaebe17b6bf1584239f80869 Mon Sep 17 00:00:00 2001
From: CFX <cfxd@users.noreply.github.com>
Date: Tue, 6 Apr 2021 14:45:28 -0400
Subject: Add equal column mixin (#32155)

---
 scss/mixins/_grid.scss | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'scss')

diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index 92bb88ad4..d757eac74 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -26,9 +26,14 @@
   margin-top: var(--#{$variable-prefix}gutter-y);
 }
 
-@mixin make-col($size, $columns: $grid-columns) {
-  flex: 0 0 auto;
-  width: percentage($size / $columns);
+@mixin make-col($size: false, $columns: $grid-columns) {
+  @if $size {
+    flex: 0 0 auto;
+    width: percentage($size / $columns);
+  } @else {
+    flex: 1 1 0;
+    max-width: 100%;
+  }
 }
 
 @mixin make-col-auto() {
-- 
cgit v1.2.3


From 2d2f5b3dfd901bca22133ae25fdcce7afb4042c7 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Mon, 11 Jan 2021 21:02:26 -0800
Subject: Add color-scheme mixin

---
 scss/_mixins.scss              |  1 +
 scss/mixins/_color-scheme.scss | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 scss/mixins/_color-scheme.scss

(limited to 'scss')

diff --git a/scss/_mixins.scss b/scss/_mixins.scss
index 7b06cd819..eec085789 100644
--- a/scss/_mixins.scss
+++ b/scss/_mixins.scss
@@ -10,6 +10,7 @@
 
 // Helpers
 @import "mixins/breakpoints";
+@import "mixins/color-scheme";
 @import "mixins/image";
 @import "mixins/resize";
 @import "mixins/visually-hidden";
diff --git a/scss/mixins/_color-scheme.scss b/scss/mixins/_color-scheme.scss
new file mode 100644
index 000000000..303fed72d
--- /dev/null
+++ b/scss/mixins/_color-scheme.scss
@@ -0,0 +1,17 @@
+// scss-docs-start mixin-color-scheme
+@mixin color-scheme($name) {
+  @if $name == dark {
+    @media (prefers-color-scheme: dark) {
+      @content;
+    }
+  } @else if $name == light {
+    @media (prefers-color-scheme: light) {
+      @content;
+    }
+  } @else {
+    @media (prefers-color-scheme: #{$name}) {
+      @content;
+    }
+  }
+}
+// scss-docs-end mixin-color-scheme
-- 
cgit v1.2.3


From 7b7f4a5ced176ae3d7d9d16583795245cb9c7df3 Mon Sep 17 00:00:00 2001
From: GeoSot <geo.sotis@gmail.com>
Date: Sun, 11 Apr 2021 09:37:59 +0300
Subject: Decouple Modal's scrollbar functionality (#33245)

---
 scss/_modal.scss | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'scss')

diff --git a/scss/_modal.scss b/scss/_modal.scss
index 6dd4dd329..513898644 100644
--- a/scss/_modal.scss
+++ b/scss/_modal.scss
@@ -159,15 +159,6 @@
   }
 }
 
-// Measure scrollbar width for padding body during modal show/hide
-.modal-scrollbar-measure {
-  position: absolute;
-  top: -9999px;
-  width: 50px;
-  height: 50px;
-  overflow: scroll;
-}
-
 // Scale up the modal
 @include media-breakpoint-up(sm) {
   // Automatically set modal's width for larger viewports
-- 
cgit v1.2.3


From 6fe75df3aa2802d25dbc720dbb13f644fe5a3222 Mon Sep 17 00:00:00 2001
From: Geremia Taglialatela <tagliala.dev@gmail.com>
Date: Fri, 9 Apr 2021 16:21:08 +0200
Subject: Hide validation icons from multiple selects

Implementation provided in #33411 does not take into account that some
Operating Systems may display a vertical scrollbar in the multiple
select field

This implementation will hide the validation icons from multiple select
fields, just like Bootstrap 4 does.

Fix: #33591
---
 scss/mixins/_forms.scss | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'scss')

diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss
index 612f94d17..283462fd5 100644
--- a/scss/mixins/_forms.scss
+++ b/scss/mixins/_forms.scss
@@ -88,17 +88,12 @@
       border-color: $color;
 
       @if $enable-validation-icons {
-        padding-right: $form-select-feedback-icon-padding-end;
-        background-image: escape-svg($form-select-indicator), escape-svg($icon);
-        background-position: $form-select-bg-position, $form-select-feedback-icon-position;
-        background-size: $form-select-bg-size, $form-select-feedback-icon-size;
-
-        &[multiple],
-        &[size]:not([size="1"]) {
-          padding-right: $input-height-inner;
-          background-image: escape-svg($icon);
-          background-position: top $input-height-inner-quarter right $input-height-inner-quarter;
-          background-size: $form-select-feedback-icon-size;
+        &:not([multiple]):not([size]),
+        &:not([multiple])[size="1"] {
+          padding-right: $form-select-feedback-icon-padding-end;
+          background-image: escape-svg($form-select-indicator), escape-svg($icon);
+          background-position: $form-select-bg-position, $form-select-feedback-icon-position;
+          background-size: $form-select-bg-size, $form-select-feedback-icon-size;
         }
       }
 
-- 
cgit v1.2.3


From 4383ae0459e833679af985ccb67d0e627f9469de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Poupard?= <ffoodd@users.noreply.github.com>
Date: Sat, 10 Apr 2021 21:16:45 +0200
Subject: refactor(color-scheme): reduce complexity

---
 scss/mixins/_color-scheme.scss | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'scss')

diff --git a/scss/mixins/_color-scheme.scss b/scss/mixins/_color-scheme.scss
index 303fed72d..90497aa0a 100644
--- a/scss/mixins/_color-scheme.scss
+++ b/scss/mixins/_color-scheme.scss
@@ -1,17 +1,7 @@
 // scss-docs-start mixin-color-scheme
 @mixin color-scheme($name) {
-  @if $name == dark {
-    @media (prefers-color-scheme: dark) {
-      @content;
-    }
-  } @else if $name == light {
-    @media (prefers-color-scheme: light) {
-      @content;
-    }
-  } @else {
-    @media (prefers-color-scheme: #{$name}) {
-      @content;
-    }
+  @media (prefers-color-scheme: #{$name}) {
+    @content;
   }
 }
 // scss-docs-end mixin-color-scheme
-- 
cgit v1.2.3


From 2120a02b3c84bce7ad0a3aea4147eabc3e9313c9 Mon Sep 17 00:00:00 2001
From: Carson <cpsievert1@gmail.com>
Date: Fri, 9 Apr 2021 11:32:43 -0500
Subject: Have $form-check-input-border's default derive from ($black instead
 of hard-coded black)

---
 scss/_variables.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/_variables.scss b/scss/_variables.scss
index 4c7ce3b0b..d0ef7ef75 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -738,7 +738,7 @@ $form-check-transition:                   null !default;
 $form-check-input-active-filter:          brightness(90%) !default;
 
 $form-check-input-bg:                     $input-bg !default;
-$form-check-input-border:                 1px solid rgba(0, 0, 0, .25) !default;
+$form-check-input-border:                 1px solid rgba($black, .25) !default;
 $form-check-input-border-radius:          .25em !default;
 $form-check-radio-border-radius:          50% !default;
 $form-check-input-focus-border:           $input-focus-border-color !default;
-- 
cgit v1.2.3


From f61a0218b36d915db80dc23635a9078e98e2e3e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Victor=20Mass=C3=A9?= <victor.dhamma@gmail.com>
Date: Wed, 14 Apr 2021 22:51:44 +0200
Subject: Make accordion icon rotation more natural (#33292)

---
 scss/_variables.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/_variables.scss b/scss/_variables.scss
index d0ef7ef75..45b331c15 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -1125,7 +1125,7 @@ $accordion-icon-width:                    1.25rem !default;
 $accordion-icon-color:                    $accordion-color !default;
 $accordion-icon-active-color:             $accordion-button-active-color !default;
 $accordion-icon-transition:               transform .2s ease-in-out !default;
-$accordion-icon-transform:                rotate(180deg) !default;
+$accordion-icon-transform:                rotate(-180deg) !default;
 
 $accordion-button-icon:         url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$accordion-icon-color}'><path fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/></svg>") !default;
 $accordion-button-active-icon:  url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$accordion-icon-active-color}'><path fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/></svg>") !default;
-- 
cgit v1.2.3


From 6fc74ebbbf014e107c4ea3022a661f2633ecd842 Mon Sep 17 00:00:00 2001
From: Mona Brahmakshatriya <monajmakwana@gmail.com>
Date: Sun, 18 Apr 2021 02:53:56 +0530
Subject: fix: use list-group variable instead of alert (#33658)

Use $list-group-item-color-scale variable in list-group NOT $alert-color-scale
---
 scss/_list-group.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/_list-group.scss b/scss/_list-group.scss
index 2193168c5..7daa9f10d 100644
--- a/scss/_list-group.scss
+++ b/scss/_list-group.scss
@@ -166,7 +166,7 @@
   $list-group-background: shift-color($value, $list-group-item-bg-scale);
   $list-group-color: shift-color($value, $list-group-item-color-scale);
   @if (contrast-ratio($list-group-background, $list-group-color) < $min-contrast-ratio) {
-    $list-group-color: mix($value, color-contrast($list-group-background), abs($alert-color-scale));
+    $list-group-color: mix($value, color-contrast($list-group-background), abs($list-group-item-color-scale));
   }
 
   @include list-group-item-variant($state, $list-group-background, $list-group-color);
-- 
cgit v1.2.3


From 17252bb3b0c751ad2be1c1c1226ebcf43e7967f3 Mon Sep 17 00:00:00 2001
From: harishhalodoc <80090779+harishhalodoc@users.noreply.github.com>
Date: Sun, 18 Apr 2021 03:03:27 +0530
Subject: use `:read-only` css selector instead `[readonly]` for consistency
 (#33642)

There are 5 places where [readonly] selector is used. I have replaced with :read-only for consistency.

fix for https://github.com/twbs/bootstrap/issues/33101

Co-authored-by: Harish <halodoc@ip-192-168-43-211.ap-southeast-1.compute.internal>
---
 scss/forms/_form-control.scss | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'scss')

diff --git a/scss/forms/_form-control.scss b/scss/forms/_form-control.scss
index 9728b91f3..5e43aea99 100644
--- a/scss/forms/_form-control.scss
+++ b/scss/forms/_form-control.scss
@@ -25,7 +25,7 @@
   &[type="file"] {
     overflow: hidden; // prevent pseudo element button overlap
 
-    &:not(:disabled):not([readonly]) {
+    &:not(:disabled):not(:read-only) {
       cursor: pointer;
     }
   }
@@ -65,7 +65,7 @@
   // disabled if the fieldset is disabled. Due to implementation difficulty, we
   // don't honor that edge case; we style them as disabled anyway.
   &:disabled,
-  &[readonly] {
+  &:read-only {
     background-color: $input-disabled-bg;
     border-color: $input-disabled-border-color;
     // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655.
@@ -88,7 +88,7 @@
     @include transition($btn-transition);
   }
 
-  &:hover:not(:disabled):not([readonly])::file-selector-button {
+  &:hover:not(:disabled):not(:read-only)::file-selector-button {
     background-color: $form-file-button-hover-bg;
   }
 
@@ -107,7 +107,7 @@
     @include transition($btn-transition);
   }
 
-  &:hover:not(:disabled):not([readonly])::-webkit-file-upload-button {
+  &:hover:not(:disabled):not(:read-only)::-webkit-file-upload-button {
     background-color: $form-file-button-hover-bg;
   }
 }
@@ -203,7 +203,7 @@ textarea {
   height: auto; // Override fixed browser height
   padding: $input-padding-y;
 
-  &:not(:disabled):not([readonly]) {
+  &:not(:disabled):not(:read-only) {
     cursor: pointer;
   }
 
-- 
cgit v1.2.3


From 7100a0da522dbeeed6c6a749fe1364badf461199 Mon Sep 17 00:00:00 2001
From: Rohit Sharma <rohit2sharma95@gmail.com>
Date: Thu, 25 Mar 2021 00:59:45 +0530
Subject: Apply positioning only when Popper is not used

---
 scss/_dropdown.scss | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'scss')

diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
index 209843fac..06e70f701 100644
--- a/scss/_dropdown.scss
+++ b/scss/_dropdown.scss
@@ -16,7 +16,6 @@
 // The dropdown menu
 .dropdown-menu {
   position: absolute;
-  top: 100%;
   z-index: $zindex-dropdown;
   display: none; // none by default, but block on "open" of the menu
   min-width: $dropdown-min-width;
@@ -33,6 +32,7 @@
   @include box-shadow($dropdown-box-shadow);
 
   &[data-bs-popper] {
+    top: 100%;
     left: 0;
     margin-top: $dropdown-spacer;
   }
@@ -83,15 +83,12 @@
 }
 
 .dropend {
-  .dropdown-menu {
+  .dropdown-menu[data-bs-popper] {
     top: 0;
     right: auto;
     left: 100%;
-
-    &[data-bs-popper] {
-      margin-top: 0;
-      margin-left: $dropdown-spacer;
-    }
+    margin-top: 0;
+    margin-left: $dropdown-spacer;
   }
 
   .dropdown-toggle {
@@ -103,15 +100,12 @@
 }
 
 .dropstart {
-  .dropdown-menu {
+  .dropdown-menu[data-bs-popper] {
     top: 0;
     right: 100%;
     left: auto;
-
-    &[data-bs-popper] {
-      margin-top: 0;
-      margin-right: $dropdown-spacer;
-    }
+    margin-top: 0;
+    margin-right: $dropdown-spacer;
   }
 
   .dropdown-toggle {
-- 
cgit v1.2.3


From a9d7a62658c5d93dcba5ed5fc47d84f3ddd3e0a3 Mon Sep 17 00:00:00 2001
From: GeoSot <geo.sotis@gmail.com>
Date: Mon, 19 Apr 2021 08:20:25 +0300
Subject: Use the backdrop util in offcanvas, enforcing consistency (#33545)

* respect /share modal's backdrop functionality, keeping consistency
* listen click events over backdrop (only) and trigger `hide()` without add/remove event tricks
* achieve to hide foreign open offcanvas instances without glitches `if (allReadyOpen && allReadyOpen !== target)`, in case another is going to be open, when user clicks on trigger button
---
 scss/_offcanvas.scss | 11 -----------
 scss/_variables.scss |  5 ++---
 2 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'scss')

diff --git a/scss/_offcanvas.scss b/scss/_offcanvas.scss
index 5c11101f6..f1d994564 100644
--- a/scss/_offcanvas.scss
+++ b/scss/_offcanvas.scss
@@ -75,14 +75,3 @@
 .offcanvas.show {
   transform: none;
 }
-
-.offcanvas-backdrop::before {
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: $zindex-offcanvas - 1;
-  width: 100vw;
-  height: 100vh;
-  content: "";
-  background-color: $offcanvas-body-backdrop-color;
-}
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 45b331c15..1e17606f4 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -902,8 +902,8 @@ $form-validation-states: (
 $zindex-dropdown:                   1000 !default;
 $zindex-sticky:                     1020 !default;
 $zindex-fixed:                      1030 !default;
-$zindex-offcanvas:                  1040 !default;
-$zindex-modal-backdrop:             1050 !default;
+$zindex-modal-backdrop:             1040 !default;
+$zindex-offcanvas:                  1050 !default;
 $zindex-modal:                      1060 !default;
 $zindex-popover:                    1070 !default;
 $zindex-tooltip:                    1080 !default;
@@ -1447,7 +1447,6 @@ $offcanvas-border-width:            $modal-content-border-width !default;
 $offcanvas-title-line-height:       $modal-title-line-height !default;
 $offcanvas-bg-color:                $modal-content-bg !default;
 $offcanvas-color:                   $modal-content-color !default;
-$offcanvas-body-backdrop-color:     rgba($modal-backdrop-bg, $modal-backdrop-opacity) !default;
 $offcanvas-box-shadow:              $modal-content-box-shadow-xs !default;
 // scss-docs-end offcanvas-variables
 
-- 
cgit v1.2.3


From 7fe4e4363468f18cbf5924db8da58e505657d2d5 Mon Sep 17 00:00:00 2001
From: alpadev <2838324+alpadev@users.noreply.github.com>
Date: Fri, 30 Apr 2021 09:59:54 +0200
Subject: accordion: fix `border-top` on Firefox (#33736)

Co-authored-by: XhmikosR <xhmikosr@gmail.com>
---
 scss/_accordion.scss | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'scss')

diff --git a/scss/_accordion.scss b/scss/_accordion.scss
index ae1ca0fbb..fc62ceb88 100644
--- a/scss/_accordion.scss
+++ b/scss/_accordion.scss
@@ -58,7 +58,6 @@
 }
 
 .accordion-item {
-  margin-bottom: -$accordion-border-width;
   background-color: $accordion-bg;
   border: $accordion-border-width solid $accordion-border-color;
 
@@ -70,9 +69,12 @@
     }
   }
 
+  &:not(:first-of-type) {
+    border-top: 0;
+  }
+
   // Only set a border-radius on the last item if the accordion is collapsed
   &:last-of-type {
-    margin-bottom: 0;
     @include border-bottom-radius($accordion-border-radius);
 
     .accordion-button {
-- 
cgit v1.2.3


From bf0936748602c8109fd916c64b4560799fa1c3f8 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Wed, 5 May 2021 22:32:12 +0300
Subject: Release v5.0.0 (#33647)

* Bump version to 5.0.0

* Fix npm tag

* Dist
---
 scss/bootstrap-grid.scss      | 2 +-
 scss/bootstrap-reboot.scss    | 2 +-
 scss/bootstrap-utilities.scss | 2 +-
 scss/bootstrap.scss           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'scss')

diff --git a/scss/bootstrap-grid.scss b/scss/bootstrap-grid.scss
index 8116a0ff7..815991c40 100644
--- a/scss/bootstrap-grid.scss
+++ b/scss/bootstrap-grid.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Grid v5.0.0-beta3 (https://getbootstrap.com/)
+ * Bootstrap Grid v5.0.0 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
diff --git a/scss/bootstrap-reboot.scss b/scss/bootstrap-reboot.scss
index 3eff8820a..8da95a22e 100644
--- a/scss/bootstrap-reboot.scss
+++ b/scss/bootstrap-reboot.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Reboot v5.0.0-beta3 (https://getbootstrap.com/)
+ * Bootstrap Reboot v5.0.0 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
diff --git a/scss/bootstrap-utilities.scss b/scss/bootstrap-utilities.scss
index 9331d8097..8ddb861fc 100644
--- a/scss/bootstrap-utilities.scss
+++ b/scss/bootstrap-utilities.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Utilities v5.0.0-beta3 (https://getbootstrap.com/)
+ * Bootstrap Utilities v5.0.0 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss
index 1a975a3db..cd149f9f6 100644
--- a/scss/bootstrap.scss
+++ b/scss/bootstrap.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v5.0.0-beta3 (https://getbootstrap.com/)
+ * Bootstrap v5.0.0 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
-- 
cgit v1.2.3


From b074e23ee417c15de6c0644218a08f6b02e998d4 Mon Sep 17 00:00:00 2001
From: "Mark H. Wilkinson" <mhw@dangerous-techniques.com>
Date: Fri, 7 May 2021 09:55:23 +0100
Subject: Don't redefine $list-group-color in loop

---
 scss/_list-group.scss | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'scss')

diff --git a/scss/_list-group.scss b/scss/_list-group.scss
index 7daa9f10d..dcd61d2b5 100644
--- a/scss/_list-group.scss
+++ b/scss/_list-group.scss
@@ -163,12 +163,12 @@
 // Organizationally, this must come after the `:hover` states.
 
 @each $state, $value in $theme-colors {
-  $list-group-background: shift-color($value, $list-group-item-bg-scale);
-  $list-group-color: shift-color($value, $list-group-item-color-scale);
-  @if (contrast-ratio($list-group-background, $list-group-color) < $min-contrast-ratio) {
-    $list-group-color: mix($value, color-contrast($list-group-background), abs($list-group-item-color-scale));
+  $list-group-variant-bg: shift-color($value, $list-group-item-bg-scale);
+  $list-group-variant-color: shift-color($value, $list-group-item-color-scale);
+  @if (contrast-ratio($list-group-variant-bg, $list-group-variant-color) < $min-contrast-ratio) {
+    $list-group-variant-color: mix($value, color-contrast($list-group-variant-bg), abs($list-group-item-color-scale));
   }
 
-  @include list-group-item-variant($state, $list-group-background, $list-group-color);
+  @include list-group-item-variant($state, $list-group-variant-bg, $list-group-variant-color);
 }
 // scss-docs-end list-group-modifiers
-- 
cgit v1.2.3


From d81d0a92d4c250e010eb085fe4b35824d12b4c8c Mon Sep 17 00:00:00 2001
From: Jatin Mehta <mehtajatin05@gmail.com>
Date: Thu, 13 May 2021 11:09:01 +0530
Subject: Validated inputs in `.input-group` shouldn't be behind sibling
 element (#33644)

Added z-index property for input-group only for invalid state
---
 scss/mixins/_forms.scss | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss
index 283462fd5..dc5bdb0b9 100644
--- a/scss/mixins/_forms.scss
+++ b/scss/mixins/_forms.scss
@@ -130,7 +130,14 @@
   .input-group .form-control,
   .input-group .form-select {
     @include form-validation-state-selector($state) {
-      z-index: 3;
+      @if $state == "valid" {
+        z-index: 1;
+      } @else if $state == "invalid" {
+        z-index: 2;
+      }
+      &:focus {
+        z-index: 3;
+      }
     }
   }
 }
-- 
cgit v1.2.3


From 7ed48943cfa5044163c11ceecd914e965c066f30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Poupard?= <ffoodd@users.noreply.github.com>
Date: Thu, 13 May 2021 07:39:37 +0200
Subject: PRevent accent-bg from leaking in nested table (#33825)

Fixes #33817

Solution by  @Hintzmann in [#33817 (comment)](https://github.com/twbs/bootstrap/issues/33817#issuecomment-831718042).
---
 scss/_tables.scss | 1 +
 1 file changed, 1 insertion(+)

(limited to 'scss')

diff --git a/scss/_tables.scss b/scss/_tables.scss
index 50368293a..19f679d28 100644
--- a/scss/_tables.scss
+++ b/scss/_tables.scss
@@ -4,6 +4,7 @@
 
 .table {
   --#{$variable-prefix}table-bg: #{$table-bg};
+  --#{$variable-prefix}table-accent-bg: #{$table-bg};
   --#{$variable-prefix}table-striped-color: #{$table-striped-color};
   --#{$variable-prefix}table-striped-bg: #{$table-striped-bg};
   --#{$variable-prefix}table-active-color: #{$table-active-color};
-- 
cgit v1.2.3


From 1e4b924aa9fcf1e4bbba586243ad72ae9972dcea Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Thu, 13 May 2021 07:01:46 -0700
Subject: Revert "use `:read-only` css selector instead `[readonly]` for
 consistency (#33642)" (#33961)

This reverts commit 17252bb3b0c751ad2be1c1c1226ebcf43e7967f3.

Co-authored-by: XhmikosR <xhmikosr@gmail.com>
---
 scss/forms/_form-control.scss | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'scss')

diff --git a/scss/forms/_form-control.scss b/scss/forms/_form-control.scss
index 5e43aea99..9728b91f3 100644
--- a/scss/forms/_form-control.scss
+++ b/scss/forms/_form-control.scss
@@ -25,7 +25,7 @@
   &[type="file"] {
     overflow: hidden; // prevent pseudo element button overlap
 
-    &:not(:disabled):not(:read-only) {
+    &:not(:disabled):not([readonly]) {
       cursor: pointer;
     }
   }
@@ -65,7 +65,7 @@
   // disabled if the fieldset is disabled. Due to implementation difficulty, we
   // don't honor that edge case; we style them as disabled anyway.
   &:disabled,
-  &:read-only {
+  &[readonly] {
     background-color: $input-disabled-bg;
     border-color: $input-disabled-border-color;
     // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655.
@@ -88,7 +88,7 @@
     @include transition($btn-transition);
   }
 
-  &:hover:not(:disabled):not(:read-only)::file-selector-button {
+  &:hover:not(:disabled):not([readonly])::file-selector-button {
     background-color: $form-file-button-hover-bg;
   }
 
@@ -107,7 +107,7 @@
     @include transition($btn-transition);
   }
 
-  &:hover:not(:disabled):not(:read-only)::-webkit-file-upload-button {
+  &:hover:not(:disabled):not([readonly])::-webkit-file-upload-button {
     background-color: $form-file-button-hover-bg;
   }
 }
@@ -203,7 +203,7 @@ textarea {
   height: auto; // Override fixed browser height
   padding: $input-padding-y;
 
-  &:not(:disabled):not(:read-only) {
+  &:not(:disabled):not([readonly]) {
     cursor: pointer;
   }
 
-- 
cgit v1.2.3


From 130a5ba1df272916dcc66f3fe1a36cfedcb7667b Mon Sep 17 00:00:00 2001
From: GeoSot <geo.sotis@gmail.com>
Date: Mon, 5 Apr 2021 00:24:04 +0300
Subject: remove modal css override

---
 scss/_modal.scss | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'scss')

diff --git a/scss/_modal.scss b/scss/_modal.scss
index 513898644..4a0e3b861 100644
--- a/scss/_modal.scss
+++ b/scss/_modal.scss
@@ -4,16 +4,6 @@
 // .modal-content   - actual modal w/ bg and corners and stuff
 
 
-.modal-open {
-  // Kill the scroll on the body
-  overflow: hidden;
-
-  .modal {
-    overflow-x: hidden;
-    overflow-y: auto;
-  }
-}
-
 // Container that the modal scrolls within
 .modal {
   position: fixed;
@@ -23,7 +13,8 @@
   display: none;
   width: 100%;
   height: 100%;
-  overflow: hidden;
+  overflow-x: hidden;
+  overflow-y: auto;
   // Prevent Chrome on Windows from adding a focus outline. For details, see
   // https://github.com/twbs/bootstrap/pull/10951.
   outline: 0;
-- 
cgit v1.2.3


From 58b1be927f43c779377e478df2d119f2ddf956ca Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Thu, 13 May 2021 19:22:20 +0300
Subject: Release v5.0.1 (#33972)

* Bump version to 5.0.1.

* Dist
---
 scss/bootstrap-grid.scss      | 2 +-
 scss/bootstrap-reboot.scss    | 2 +-
 scss/bootstrap-utilities.scss | 2 +-
 scss/bootstrap.scss           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'scss')

diff --git a/scss/bootstrap-grid.scss b/scss/bootstrap-grid.scss
index 815991c40..5f3a14d16 100644
--- a/scss/bootstrap-grid.scss
+++ b/scss/bootstrap-grid.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Grid v5.0.0 (https://getbootstrap.com/)
+ * Bootstrap Grid v5.0.1 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
diff --git a/scss/bootstrap-reboot.scss b/scss/bootstrap-reboot.scss
index 8da95a22e..3fb5fa0ec 100644
--- a/scss/bootstrap-reboot.scss
+++ b/scss/bootstrap-reboot.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Reboot v5.0.0 (https://getbootstrap.com/)
+ * Bootstrap Reboot v5.0.1 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
diff --git a/scss/bootstrap-utilities.scss b/scss/bootstrap-utilities.scss
index 8ddb861fc..f921a5d15 100644
--- a/scss/bootstrap-utilities.scss
+++ b/scss/bootstrap-utilities.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Utilities v5.0.0 (https://getbootstrap.com/)
+ * Bootstrap Utilities v5.0.1 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss
index cd149f9f6..86c079db3 100644
--- a/scss/bootstrap.scss
+++ b/scss/bootstrap.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v5.0.0 (https://getbootstrap.com/)
+ * Bootstrap v5.0.1 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
-- 
cgit v1.2.3


From 8aa02d88016f88ae4a3bd187dd3c3bcac5e753f5 Mon Sep 17 00:00:00 2001
From: pu-master <83826914+pu-master@users.noreply.github.com>
Date: Tue, 18 May 2021 19:47:45 -0400
Subject: Update button-variant mixin to add missing space.

---
 scss/mixins/_buttons.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/mixins/_buttons.scss b/scss/mixins/_buttons.scss
index c06fa4a98..b67499668 100644
--- a/scss/mixins/_buttons.scss
+++ b/scss/mixins/_buttons.scss
@@ -11,7 +11,7 @@
   $hover-background: if($color == $color-contrast-light, shade-color($background, $btn-hover-bg-shade-amount), tint-color($background, $btn-hover-bg-tint-amount)),
   $hover-border: if($color == $color-contrast-light, shade-color($border, $btn-hover-border-shade-amount), tint-color($border, $btn-hover-border-tint-amount)),
   $hover-color: color-contrast($hover-background),
-  $active-background: if($color == $color-contrast-light, shade-color($background,$btn-active-bg-shade-amount), tint-color($background, $btn-active-bg-tint-amount)),
+  $active-background: if($color == $color-contrast-light, shade-color($background, $btn-active-bg-shade-amount), tint-color($background, $btn-active-bg-tint-amount)),
   $active-border: if($color == $color-contrast-light, shade-color($border, $btn-active-border-shade-amount), tint-color($border, $btn-active-border-tint-amount)),
   $active-color: color-contrast($active-background),
   $disabled-background: $background,
-- 
cgit v1.2.3


From 55a0f9af2738daafe8d961ca35c22800c710bb27 Mon Sep 17 00:00:00 2001
From: GeoSot <geo.sotis@gmail.com>
Date: Thu, 20 May 2021 17:46:43 +0300
Subject: fix wrong comment text for tooltip (#34044)

---
 scss/_variables.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/_variables.scss b/scss/_variables.scss
index 1e17606f4..15343e435 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -1157,7 +1157,7 @@ $form-feedback-tooltip-font-size:     $tooltip-font-size !default;
 $form-feedback-tooltip-line-height:   null !default;
 $form-feedback-tooltip-opacity:       $tooltip-opacity !default;
 $form-feedback-tooltip-border-radius: $tooltip-border-radius !default;
-// scss-docs-start tooltip-feedback-variables
+// scss-docs-end tooltip-feedback-variables
 
 
 // Popovers
-- 
cgit v1.2.3


From 50cf7f48ccf0e46ebc0968c1fc4db465db9f8b0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Poupard?= <ffoodd@users.noreply.github.com>
Date: Tue, 25 May 2021 07:23:41 +0200
Subject: Handle complex expressions in add() & subtract() (#34047)

---
 scss/_functions.scss | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'scss')

diff --git a/scss/_functions.scss b/scss/_functions.scss
index 29114fc81..f92355f42 100644
--- a/scss/_functions.scss
+++ b/scss/_functions.scss
@@ -181,6 +181,14 @@ $_luminance-list: .0008 .001 .0011 .0013 .0015 .0017 .002 .0022 .0025 .0027 .003
     @return $value1 + $value2;
   }
 
+  @if type-of($value1) != number {
+    $value1: unquote("(") + $value1 + unquote(")");
+  }
+
+  @if type-of($value2) != number {
+    $value2: unquote("(") + $value2 + unquote(")");
+  }
+
   @return if($return-calc == true, calc(#{$value1} + #{$value2}), $value1 + unquote(" + ") + $value2);
 }
 
@@ -201,5 +209,13 @@ $_luminance-list: .0008 .001 .0011 .0013 .0015 .0017 .002 .0022 .0025 .0027 .003
     @return $value1 - $value2;
   }
 
+  @if type-of($value1) != number {
+    $value1: unquote("(") + $value1 + unquote(")");
+  }
+
+  @if type-of($value2) != number {
+    $value2: unquote("(") + $value2 + unquote(")");
+  }
+
   @return if($return-calc == true, calc(#{$value1} - #{$value2}), $value1 + unquote(" - ") + $value2);
 }
-- 
cgit v1.2.3


From bdde9b50a65a51a521a8ab98d3d9fb9d904425f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Poupard?= <ffoodd@users.noreply.github.com>
Date: Tue, 25 May 2021 07:31:30 +0200
Subject: Fix x-paddings for select (with floating label, and in Firefox)
 (#34008)

---
 scss/forms/_floating-labels.scss | 3 ++-
 scss/forms/_form-select.scss     | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/forms/_floating-labels.scss b/scss/forms/_floating-labels.scss
index 8b2e2b8eb..09d9294dc 100644
--- a/scss/forms/_floating-labels.scss
+++ b/scss/forms/_floating-labels.scss
@@ -4,7 +4,6 @@
   > .form-control,
   > .form-select {
     height: $form-floating-height;
-    padding: $form-floating-padding-y $form-floating-padding-x;
   }
 
   > label {
@@ -21,6 +20,8 @@
 
   // stylelint-disable no-duplicate-selectors
   > .form-control {
+    padding: $form-floating-padding-y $form-floating-padding-x;
+
     &::placeholder {
       color: transparent;
     }
diff --git a/scss/forms/_form-select.scss b/scss/forms/_form-select.scss
index 15d5061ad..70256255a 100644
--- a/scss/forms/_form-select.scss
+++ b/scss/forms/_form-select.scss
@@ -7,6 +7,8 @@
   display: block;
   width: 100%;
   padding: $form-select-padding-y $form-select-indicator-padding $form-select-padding-y $form-select-padding-x;
+  // stylelint-disable-next-line property-no-vendor-prefix
+  -moz-padding-start: subtract($form-select-padding-x, 3px); // See https://github.com/twbs/bootstrap/issues/32636
   font-family: $form-select-font-family;
   @include font-size($form-select-font-size);
   font-weight: $form-select-font-weight;
-- 
cgit v1.2.3


From 57205e3d8eb3282927098ac5a03a322453978a5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Poupard?= <ffoodd@users.noreply.github.com>
Date: Thu, 27 May 2021 16:36:32 +0200
Subject: fix(dropdowns): RTL for `.dropdown-menu-*` (#34124)

---
 scss/_dropdown.scss | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'scss')

diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
index 06e70f701..adc114327 100644
--- a/scss/_dropdown.scss
+++ b/scss/_dropdown.scss
@@ -50,8 +50,8 @@
       --bs-position: start;
 
       &[data-bs-popper] {
-        right: auto #{"/* rtl:ignore */"};
-        left: 0 #{"/* rtl:ignore */"};
+        right: auto;
+        left: 0;
       }
     }
 
@@ -59,8 +59,8 @@
       --bs-position: end;
 
       &[data-bs-popper] {
-        right: 0 #{"/* rtl:ignore */"};
-        left: auto #{"/* rtl:ignore */"};
+        right: 0;
+        left: auto;
       }
     }
   }
-- 
cgit v1.2.3


From fd985d3732f170f4d55f93800bf82bb3137836e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Poupard?= <ffoodd@users.noreply.github.com>
Date: Fri, 28 May 2021 09:12:40 +0200
Subject: fix(tables): decouple table-bg and table-accent-bg (#34048)

Co-authored-by: alpadev <2838324+alpadev@users.noreply.github.com>
---
 scss/_tables.scss    | 2 +-
 scss/_variables.scss | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/_tables.scss b/scss/_tables.scss
index 19f679d28..92556ba05 100644
--- a/scss/_tables.scss
+++ b/scss/_tables.scss
@@ -4,7 +4,7 @@
 
 .table {
   --#{$variable-prefix}table-bg: #{$table-bg};
-  --#{$variable-prefix}table-accent-bg: #{$table-bg};
+  --#{$variable-prefix}table-accent-bg: #{$table-accent-bg};
   --#{$variable-prefix}table-striped-color: #{$table-striped-color};
   --#{$variable-prefix}table-striped-bg: #{$table-striped-bg};
   --#{$variable-prefix}table-active-color: #{$table-active-color};
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 15343e435..9a1f3daad 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -535,6 +535,7 @@ $table-cell-vertical-align:   top !default;
 
 $table-color:                 $body-color !default;
 $table-bg:                    transparent !default;
+$table-accent-bg:             transparent !default;
 
 $table-th-font-weight:        null !default;
 
-- 
cgit v1.2.3


From 649c2bb0bf326db36cbbf7e72c0541b19749a70e Mon Sep 17 00:00:00 2001
From: Simon Ihmig <simon.ihmig@kaliber5.de>
Date: Fri, 28 May 2021 09:20:31 +0200
Subject: Add missing transition to `.form-select` (#34034)

A selectbox is styled in a very similar way as an input (`.form-control`), including border-color and box-shadow. So it can be assumed it should apply the same CSS transition for these properties when focused, but this was missing.

Co-authored-by: alpadev <2838324+alpadev@users.noreply.github.com>
---
 scss/_variables.scss         | 2 ++
 scss/forms/_form-select.scss | 1 +
 2 files changed, 3 insertions(+)

(limited to 'scss')

diff --git a/scss/_variables.scss b/scss/_variables.scss
index 9a1f3daad..11819f440 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -826,6 +826,8 @@ $form-select-font-size-sm:        $input-font-size-sm !default;
 $form-select-padding-y-lg:        $input-padding-y-lg !default;
 $form-select-padding-x-lg:        $input-padding-x-lg !default;
 $form-select-font-size-lg:        $input-font-size-lg !default;
+
+$form-select-transition:          $input-transition !default;
 // scss-docs-end form-select-variables
 
 // scss-docs-start form-range-variables
diff --git a/scss/forms/_form-select.scss b/scss/forms/_form-select.scss
index 70256255a..4506a979a 100644
--- a/scss/forms/_form-select.scss
+++ b/scss/forms/_form-select.scss
@@ -22,6 +22,7 @@
   border: $form-select-border-width solid $form-select-border-color;
   @include border-radius($form-select-border-radius, 0);
   @include box-shadow($form-select-box-shadow);
+  @include transition($form-select-transition);
   appearance: none;
 
   &:focus {
-- 
cgit v1.2.3


From c0d21e1b3da954ef429f34700435729b3313160e Mon Sep 17 00:00:00 2001
From: Breno Reis <breno.dk@gmail.com>
Date: Tue, 18 May 2021 09:22:06 -0300
Subject: Sets the correct color for popover header bottom border

---
 scss/_popover.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/_popover.scss b/scss/_popover.scss
index a55555e2e..da00f700f 100644
--- a/scss/_popover.scss
+++ b/scss/_popover.scss
@@ -144,7 +144,7 @@
   @include font-size($font-size-base);
   color: $popover-header-color;
   background-color: $popover-header-bg;
-  border-bottom: $popover-border-width solid shade-color($popover-header-bg, 10%);
+  border-bottom: $popover-border-width solid $popover-border-color;
   @include border-top-radius($popover-inner-border-radius);
 
   &:empty {
-- 
cgit v1.2.3


From dbda13d5ef6897be41f1e872667f6aa30860efb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Poupard?= <ffoodd@users.noreply.github.com>
Date: Thu, 3 Jun 2021 18:02:46 +0200
Subject: fix(forms): unitless `line-height` for floating labels (#34161)

Co-authored-by: Mark Otto <markd.otto@gmail.com>
Co-authored-by: XhmikosR <xhmikosr@gmail.com>
---
 scss/_variables.scss             | 1 +
 scss/forms/_floating-labels.scss | 1 +
 2 files changed, 2 insertions(+)

(limited to 'scss')

diff --git a/scss/_variables.scss b/scss/_variables.scss
index 11819f440..93ccb25a5 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -859,6 +859,7 @@ $form-file-button-hover-bg:       shade-color($form-file-button-bg, 5%) !default
 
 // scss-docs-start form-floating-variables
 $form-floating-height:            add(3.5rem, $input-height-border) !default;
+$form-floating-line-height:       1.25 !default;
 $form-floating-padding-x:         $input-padding-x !default;
 $form-floating-padding-y:         1rem !default;
 $form-floating-input-padding-t:   1.625rem !default;
diff --git a/scss/forms/_floating-labels.scss b/scss/forms/_floating-labels.scss
index 09d9294dc..2f4295480 100644
--- a/scss/forms/_floating-labels.scss
+++ b/scss/forms/_floating-labels.scss
@@ -4,6 +4,7 @@
   > .form-control,
   > .form-select {
     height: $form-floating-height;
+    line-height: $form-floating-line-height;
   }
 
   > label {
-- 
cgit v1.2.3


From f2b47e1c8a263f4406255991af9fd55984c22a0e Mon Sep 17 00:00:00 2001
From: Anal-Retentive Squirrel Hunter
 <43895102+lacutah@users.noreply.github.com>
Date: Thu, 3 Jun 2021 12:18:00 -0400
Subject: Allow individual grid classes to override `.row-cols` (#33621)

---
 scss/mixins/_grid.scss | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index d757eac74..36031df79 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -65,8 +65,8 @@
 
 @mixin make-grid-columns($columns: $grid-columns, $gutter: $grid-gutter-width, $breakpoints: $grid-breakpoints) {
   @each $breakpoint in map-keys($breakpoints) {
+    // .row-cols defaults must all appear before .col overrides so they can be overridden.
     $infix: breakpoint-infix($breakpoint, $breakpoints);
-
     @include media-breakpoint-up($breakpoint, $breakpoints) {
       // Provide basic `.col-{bp}` classes for equal-width flexbox columns
       .col#{$infix} {
@@ -84,7 +84,13 @@
           }
         }
       }
+    }
+  }
 
+  @each $breakpoint in map-keys($breakpoints) {
+    $infix: breakpoint-infix($breakpoint, $breakpoints);
+
+    @include media-breakpoint-up($breakpoint, $breakpoints) {
       .col#{$infix}-auto {
         @include make-col-auto();
       }
-- 
cgit v1.2.3


From be17444756c48e3a892c36507f859cd841bd8c1f Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Mon, 14 Jun 2021 09:35:30 -0700
Subject: Replace `/` division with multiplication and custom `divide()`
 function (#34245)

* Convert bulk of division to multiplication

* Use custom divide() function instead of Dart Sass math module for greater compatibility

* Apply suggestions from code review

* Fix functions
---
 scss/_card.scss             | 10 +++++-----
 scss/_carousel.scss         |  4 ++--
 scss/_functions.scss        | 31 ++++++++++++++++++++++++++++---
 scss/_images.scss           |  2 +-
 scss/_modal.scss            |  8 ++++----
 scss/_offcanvas.scss        |  4 ++--
 scss/_popover.scss          | 18 +++++++++---------
 scss/_toasts.scss           |  2 +-
 scss/_tooltip.scss          |  8 ++++----
 scss/_variables.scss        | 30 +++++++++++++++---------------
 scss/forms/_form-check.scss |  2 +-
 scss/forms/_form-range.scss |  2 +-
 scss/mixins/_grid.scss      | 13 ++++++++-----
 13 files changed, 81 insertions(+), 53 deletions(-)

(limited to 'scss')

diff --git a/scss/_card.scss b/scss/_card.scss
index e3314219f..b077858c4 100644
--- a/scss/_card.scss
+++ b/scss/_card.scss
@@ -55,7 +55,7 @@
 }
 
 .card-subtitle {
-  margin-top: -$card-title-spacer-y / 2;
+  margin-top: -$card-title-spacer-y * .5;
   margin-bottom: 0;
 }
 
@@ -106,9 +106,9 @@
 //
 
 .card-header-tabs {
-  margin-right: -$card-cap-padding-x / 2;
+  margin-right: -$card-cap-padding-x * .5;
   margin-bottom: -$card-cap-padding-y;
-  margin-left: -$card-cap-padding-x / 2;
+  margin-left: -$card-cap-padding-x * .5;
   border-bottom: 0;
 
   @if $nav-tabs-link-active-bg != $card-bg {
@@ -120,8 +120,8 @@
 }
 
 .card-header-pills {
-  margin-right: -$card-cap-padding-x / 2;
-  margin-left: -$card-cap-padding-x / 2;
+  margin-right: -$card-cap-padding-x * .5;
+  margin-left: -$card-cap-padding-x * .5;
 }
 
 // Card image
diff --git a/scss/_carousel.scss b/scss/_carousel.scss
index d389c3042..3d8fb15a0 100644
--- a/scss/_carousel.scss
+++ b/scss/_carousel.scss
@@ -202,9 +202,9 @@
 
 .carousel-caption {
   position: absolute;
-  right: (100% - $carousel-caption-width) / 2;
+  right: (100% - $carousel-caption-width) * .5;
   bottom: $carousel-caption-spacer;
-  left: (100% - $carousel-caption-width) / 2;
+  left: (100% - $carousel-caption-width) * .5;
   padding-top: $carousel-caption-padding-y;
   padding-bottom: $carousel-caption-padding-y;
   color: $carousel-caption-color;
diff --git a/scss/_functions.scss b/scss/_functions.scss
index f92355f42..2d3478bfa 100644
--- a/scss/_functions.scss
+++ b/scss/_functions.scss
@@ -95,7 +95,7 @@
 // Color contrast
 // See https://github.com/twbs/bootstrap/pull/30168
 
-// A list of pre-calculated numbers of pow(($value / 255 + .055) / 1.055, 2.4). (from 0 to 255)
+// A list of pre-calculated numbers of pow(divide((divide($value, 255) + .055), 1.055), 2.4). (from 0 to 255)
 // stylelint-disable-next-line scss/dollar-variable-default, scss/dollar-variable-pattern
 $_luminance-list: .0008 .001 .0011 .0013 .0015 .0017 .002 .0022 .0025 .0027 .003 .0033 .0037 .004 .0044 .0048 .0052 .0056 .006 .0065 .007 .0075 .008 .0086 .0091 .0097 .0103 .011 .0116 .0123 .013 .0137 .0144 .0152 .016 .0168 .0176 .0185 .0194 .0203 .0212 .0222 .0232 .0242 .0252 .0262 .0273 .0284 .0296 .0307 .0319 .0331 .0343 .0356 .0369 .0382 .0395 .0409 .0423 .0437 .0452 .0467 .0482 .0497 .0513 .0529 .0545 .0561 .0578 .0595 .0612 .063 .0648 .0666 .0685 .0704 .0723 .0742 .0762 .0782 .0802 .0823 .0844 .0865 .0887 .0908 .0931 .0953 .0976 .0999 .1022 .1046 .107 .1095 .1119 .1144 .117 .1195 .1221 .1248 .1274 .1301 .1329 .1356 .1384 .1413 .1441 .147 .15 .1529 .1559 .159 .162 .1651 .1683 .1714 .1746 .1779 .1812 .1845 .1878 .1912 .1946 .1981 .2016 .2051 .2086 .2122 .2159 .2195 .2232 .227 .2307 .2346 .2384 .2423 .2462 .2502 .2542 .2582 .2623 .2664 .2705 .2747 .2789 .2831 .2874 .2918 .2961 .3005 .305 .3095 .314 .3185 .3231 .3278 .3325 .3372 .3419 .3467 .3515 .3564 .3613 .3663 .3712 .3763 .3813 .3864 .3916 .3968 .402 .4072 .4125 .4179 .4233 .4287 .4342 .4397 .4452 .4508 .4564 .4621 .4678 .4735 .4793 .4851 .491 .4969 .5029 .5089 .5149 .521 .5271 .5333 .5395 .5457 .552 .5583 .5647 .5711 .5776 .5841 .5906 .5972 .6038 .6105 .6172 .624 .6308 .6376 .6445 .6514 .6584 .6654 .6724 .6795 .6867 .6939 .7011 .7084 .7157 .7231 .7305 .7379 .7454 .7529 .7605 .7682 .7758 .7835 .7913 .7991 .807 .8148 .8228 .8308 .8388 .8469 .855 .8632 .8714 .8796 .8879 .8963 .9047 .9131 .9216 .9301 .9387 .9473 .956 .9647 .9734 .9823 .9911 1;
 
@@ -123,7 +123,7 @@ $_luminance-list: .0008 .001 .0011 .0013 .0015 .0017 .002 .0022 .0025 .0027 .003
   $l1: luminance($background);
   $l2: luminance(opaque($background, $foreground));
 
-  @return if($l1 > $l2, ($l1 + .05) / ($l2 + .05), ($l2 + .05) / ($l1 + .05));
+  @return if($l1 > $l2, divide($l1 + .05, $l2 + .05), divide($l2 + .05, $l1 + .05));
 }
 
 // Return WCAG2.0 relative luminance
@@ -137,7 +137,7 @@ $_luminance-list: .0008 .001 .0011 .0013 .0015 .0017 .002 .0022 .0025 .0027 .003
   );
 
   @each $name, $value in $rgb {
-    $value: if($value / 255 < .03928, $value / 255 / 12.92, nth($_luminance-list, $value + 1));
+    $value: if(divide($value, 255) < .03928, divide(divide($value, 255), 12.92), nth($_luminance-list, $value + 1));
     $rgb: map-merge($rgb, ($name: $value));
   }
 
@@ -219,3 +219,28 @@ $_luminance-list: .0008 .001 .0011 .0013 .0015 .0017 .002 .0022 .0025 .0027 .003
 
   @return if($return-calc == true, calc(#{$value1} - #{$value2}), $value1 + unquote(" - ") + $value2);
 }
+
+@function divide($dividend, $divisor, $precision: 10) {
+  $sign: if($dividend > 0 and $divisor > 0, 1, -1);
+  $dividend: abs($dividend);
+  $divisor: abs($divisor);
+  $quotient: 0;
+  $remainder: $dividend;
+  @if $dividend == 0 {
+    @return 0;
+  }
+  @if $divisor == 0 {
+    @error "Cannot divide by 0";
+  }
+  @if $divisor == 1 {
+    @return $dividend;
+  }
+  @while $remainder >= $divisor {
+    $quotient: $quotient + 1;
+    $remainder: $remainder - $divisor;
+  }
+  @if $remainder > 0 and $precision > 0 {
+    $remainder: divide($remainder * 10, $divisor, $precision - 1) * .1;
+  }
+  @return ($quotient + $remainder) * $sign;
+}
diff --git a/scss/_images.scss b/scss/_images.scss
index b11b45a37..3d6a1014c 100644
--- a/scss/_images.scss
+++ b/scss/_images.scss
@@ -32,7 +32,7 @@
 }
 
 .figure-img {
-  margin-bottom: $spacer / 2;
+  margin-bottom: $spacer * .5;
   line-height: 1;
 }
 
diff --git a/scss/_modal.scss b/scss/_modal.scss
index 4a0e3b861..77473085c 100644
--- a/scss/_modal.scss
+++ b/scss/_modal.scss
@@ -110,8 +110,8 @@
   @include border-top-radius($modal-content-inner-border-radius);
 
   .btn-close {
-    padding: ($modal-header-padding-y / 2) ($modal-header-padding-x / 2);
-    margin: ($modal-header-padding-y / -2) ($modal-header-padding-x / -2) ($modal-header-padding-y / -2) auto;
+    padding: ($modal-header-padding-y * .5) ($modal-header-padding-x * .5);
+    margin: ($modal-header-padding-y * -.5) ($modal-header-padding-x * -.5) ($modal-header-padding-y * -.5) auto;
   }
 }
 
@@ -138,7 +138,7 @@
   flex-shrink: 0;
   align-items: center; // vertically center
   justify-content: flex-end; // Right align buttons with flex property because text-align doesn't work on flex items
-  padding: $modal-inner-padding - $modal-footer-margin-between / 2;
+  padding: $modal-inner-padding - $modal-footer-margin-between * .5;
   border-top: $modal-footer-border-width solid $modal-footer-border-color;
   @include border-bottom-radius($modal-content-inner-border-radius);
 
@@ -146,7 +146,7 @@
   // This solution is far from ideal because of the universal selector usage,
   // but is needed to fix https://github.com/twbs/bootstrap/issues/24800
   > * {
-    margin: $modal-footer-margin-between / 2;
+    margin: $modal-footer-margin-between * .5;
   }
 }
 
diff --git a/scss/_offcanvas.scss b/scss/_offcanvas.scss
index f1d994564..1dbe6cdc4 100644
--- a/scss/_offcanvas.scss
+++ b/scss/_offcanvas.scss
@@ -21,8 +21,8 @@
   padding: $offcanvas-padding-y $offcanvas-padding-x;
 
   .btn-close {
-    padding: ($offcanvas-padding-y / 2) ($offcanvas-padding-x / 2);
-    margin: ($offcanvas-padding-y / -2) ($offcanvas-padding-x / -2) ($offcanvas-padding-y / -2) auto;
+    padding: ($offcanvas-padding-y * .5) ($offcanvas-padding-x * .5);
+    margin: ($offcanvas-padding-y * -.5) ($offcanvas-padding-x * -.5) ($offcanvas-padding-y * -.5) auto;
   }
 }
 
diff --git a/scss/_popover.scss b/scss/_popover.scss
index da00f700f..3b8208e16 100644
--- a/scss/_popover.scss
+++ b/scss/_popover.scss
@@ -40,13 +40,13 @@
 
     &::before {
       bottom: 0;
-      border-width: $popover-arrow-height ($popover-arrow-width / 2) 0;
+      border-width: $popover-arrow-height ($popover-arrow-width * .5) 0;
       border-top-color: $popover-arrow-outer-color;
     }
 
     &::after {
       bottom: $popover-border-width;
-      border-width: $popover-arrow-height ($popover-arrow-width / 2) 0;
+      border-width: $popover-arrow-height ($popover-arrow-width * .5) 0;
       border-top-color: $popover-arrow-color;
     }
   }
@@ -60,13 +60,13 @@
 
     &::before {
       left: 0;
-      border-width: ($popover-arrow-width / 2) $popover-arrow-height ($popover-arrow-width / 2) 0;
+      border-width: ($popover-arrow-width * .5) $popover-arrow-height ($popover-arrow-width * .5) 0;
       border-right-color: $popover-arrow-outer-color;
     }
 
     &::after {
       left: $popover-border-width;
-      border-width: ($popover-arrow-width / 2) $popover-arrow-height ($popover-arrow-width / 2) 0;
+      border-width: ($popover-arrow-width * .5) $popover-arrow-height ($popover-arrow-width * .5) 0;
       border-right-color: $popover-arrow-color;
     }
   }
@@ -78,13 +78,13 @@
 
     &::before {
       top: 0;
-      border-width: 0 ($popover-arrow-width / 2) $popover-arrow-height ($popover-arrow-width / 2);
+      border-width: 0 ($popover-arrow-width * .5) $popover-arrow-height ($popover-arrow-width * .5);
       border-bottom-color: $popover-arrow-outer-color;
     }
 
     &::after {
       top: $popover-border-width;
-      border-width: 0 ($popover-arrow-width / 2) $popover-arrow-height ($popover-arrow-width / 2);
+      border-width: 0 ($popover-arrow-width * .5) $popover-arrow-height ($popover-arrow-width * .5);
       border-bottom-color: $popover-arrow-color;
     }
   }
@@ -96,7 +96,7 @@
     left: 50%;
     display: block;
     width: $popover-arrow-width;
-    margin-left: -$popover-arrow-width / 2;
+    margin-left: -$popover-arrow-width * .5;
     content: "";
     border-bottom: $popover-border-width solid $popover-header-bg;
   }
@@ -110,13 +110,13 @@
 
     &::before {
       right: 0;
-      border-width: ($popover-arrow-width / 2) 0 ($popover-arrow-width / 2) $popover-arrow-height;
+      border-width: ($popover-arrow-width * .5) 0 ($popover-arrow-width * .5) $popover-arrow-height;
       border-left-color: $popover-arrow-outer-color;
     }
 
     &::after {
       right: $popover-border-width;
-      border-width: ($popover-arrow-width / 2) 0 ($popover-arrow-width / 2) $popover-arrow-height;
+      border-width: ($popover-arrow-width * .5) 0 ($popover-arrow-width * .5) $popover-arrow-height;
       border-left-color: $popover-arrow-color;
     }
   }
diff --git a/scss/_toasts.scss b/scss/_toasts.scss
index 5c533d7f5..717aae576 100644
--- a/scss/_toasts.scss
+++ b/scss/_toasts.scss
@@ -40,7 +40,7 @@
   @include border-top-radius(subtract($toast-border-radius, $toast-border-width));
 
   .btn-close {
-    margin-right: $toast-padding-x / -2;
+    margin-right: $toast-padding-x * -.5;
     margin-left: $toast-padding-x;
   }
 }
diff --git a/scss/_tooltip.scss b/scss/_tooltip.scss
index 2993bf7de..75ff07838 100644
--- a/scss/_tooltip.scss
+++ b/scss/_tooltip.scss
@@ -37,7 +37,7 @@
 
     &::before {
       top: -1px;
-      border-width: $tooltip-arrow-height ($tooltip-arrow-width / 2) 0;
+      border-width: $tooltip-arrow-height ($tooltip-arrow-width * .5) 0;
       border-top-color: $tooltip-arrow-color;
     }
   }
@@ -53,7 +53,7 @@
 
     &::before {
       right: -1px;
-      border-width: ($tooltip-arrow-width / 2) $tooltip-arrow-height ($tooltip-arrow-width / 2) 0;
+      border-width: ($tooltip-arrow-width * .5) $tooltip-arrow-height ($tooltip-arrow-width * .5) 0;
       border-right-color: $tooltip-arrow-color;
     }
   }
@@ -67,7 +67,7 @@
 
     &::before {
       bottom: -1px;
-      border-width: 0 ($tooltip-arrow-width / 2) $tooltip-arrow-height;
+      border-width: 0 ($tooltip-arrow-width * .5) $tooltip-arrow-height;
       border-bottom-color: $tooltip-arrow-color;
     }
   }
@@ -83,7 +83,7 @@
 
     &::before {
       left: -1px;
-      border-width: ($tooltip-arrow-width / 2) 0 ($tooltip-arrow-width / 2) $tooltip-arrow-height;
+      border-width: ($tooltip-arrow-width * .5) 0 ($tooltip-arrow-width * .5) $tooltip-arrow-height;
       border-left-color: $tooltip-arrow-color;
     }
   }
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 93ccb25a5..75d126d7b 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -250,8 +250,8 @@ $gradient: linear-gradient(180deg, rgba($white, .15), rgba($white, 0)) !default;
 $spacer: 1rem !default;
 $spacers: (
   0: 0,
-  1: $spacer / 4,
-  2: $spacer / 2,
+  1: $spacer * .25,
+  2: $spacer * .5,
   3: $spacer,
   4: $spacer * 1.5,
   5: $spacer * 3,
@@ -350,7 +350,7 @@ $gutters: $spacers !default;
 
 // Container padding
 
-$container-padding-x: $grid-gutter-width / 2 !default;
+$container-padding-x: $grid-gutter-width * .5 !default;
 
 
 // Components
@@ -461,7 +461,7 @@ $font-sizes: (
 // scss-docs-end font-sizes
 
 // scss-docs-start headings-variables
-$headings-margin-bottom:      $spacer / 2 !default;
+$headings-margin-bottom:      $spacer * .5 !default;
 $headings-font-family:        null !default;
 $headings-font-style:         null !default;
 $headings-font-weight:        500 !default;
@@ -718,7 +718,7 @@ $input-height-border:                   $input-border-width * 2 !default;
 
 $input-height-inner:                    add($input-line-height * 1em, $input-padding-y * 2) !default;
 $input-height-inner-half:               add($input-line-height * .5em, $input-padding-y) !default;
-$input-height-inner-quarter:            add($input-line-height * .25em, $input-padding-y / 2) !default;
+$input-height-inner-quarter:            add($input-line-height * .25em, $input-padding-y * .5) !default;
 
 $input-height:                          add($input-line-height * 1em, add($input-padding-y * 2, $input-height-border, false)) !default;
 $input-height-sm:                       add($input-line-height * 1em, add($input-padding-y-sm * 2, $input-height-border, false)) !default;
@@ -943,7 +943,7 @@ $nav-pills-link-active-bg:          $component-active-bg !default;
 // Navbar
 
 // scss-docs-start navbar-variables
-$navbar-padding-y:                  $spacer / 2 !default;
+$navbar-padding-y:                  $spacer * .5 !default;
 $navbar-padding-x:                  null !default;
 
 $navbar-nav-link-padding-x:         .5rem !default;
@@ -952,7 +952,7 @@ $navbar-brand-font-size:            $font-size-lg !default;
 // Compute the navbar-brand padding-y so the navbar-brand will have the same height as navbar-text and nav-link
 $nav-link-height:                   $font-size-base * $line-height-base + $nav-link-padding-y * 2 !default;
 $navbar-brand-height:               $navbar-brand-font-size * $line-height-base !default;
-$navbar-brand-padding-y:            ($nav-link-height - $navbar-brand-height) / 2 !default;
+$navbar-brand-padding-y:            ($nav-link-height - $navbar-brand-height) * .5 !default;
 $navbar-brand-margin-end:           1rem !default;
 
 $navbar-toggler-padding-y:          .25rem !default;
@@ -1002,7 +1002,7 @@ $dropdown-border-radius:            $border-radius !default;
 $dropdown-border-width:             $border-width !default;
 $dropdown-inner-border-radius:      subtract($dropdown-border-radius, $dropdown-border-width) !default;
 $dropdown-divider-bg:               $dropdown-border-color !default;
-$dropdown-divider-margin-y:         $spacer / 2 !default;
+$dropdown-divider-margin-y:         $spacer * .5 !default;
 $dropdown-box-shadow:               $box-shadow !default;
 
 $dropdown-link-color:               $gray-900 !default;
@@ -1014,7 +1014,7 @@ $dropdown-link-active-bg:           $component-active-bg !default;
 
 $dropdown-link-disabled-color:      $gray-500 !default;
 
-$dropdown-item-padding-y:           $spacer / 4 !default;
+$dropdown-item-padding-y:           $spacer * .25 !default;
 $dropdown-item-padding-x:           $spacer !default;
 
 $dropdown-header-color:             $gray-600 !default;
@@ -1083,12 +1083,12 @@ $pagination-border-radius-lg:       $border-radius-lg !default;
 // scss-docs-start card-variables
 $card-spacer-y:                     $spacer !default;
 $card-spacer-x:                     $spacer !default;
-$card-title-spacer-y:               $spacer / 2 !default;
+$card-title-spacer-y:               $spacer * .5 !default;
 $card-border-width:                 $border-width !default;
 $card-border-radius:                $border-radius !default;
 $card-border-color:                 rgba($black, .125) !default;
 $card-inner-border-radius:          subtract($card-border-radius, $card-border-width) !default;
-$card-cap-padding-y:                $card-spacer-y / 2 !default;
+$card-cap-padding-y:                $card-spacer-y * .5 !default;
 $card-cap-padding-x:                $card-spacer-x !default;
 $card-cap-bg:                       rgba($black, .03) !default;
 $card-cap-color:                    null !default;
@@ -1096,7 +1096,7 @@ $card-height:                       null !default;
 $card-color:                        null !default;
 $card-bg:                           $white !default;
 $card-img-overlay-padding:          $spacer !default;
-$card-group-margin:                 $grid-gutter-width / 2 !default;
+$card-group-margin:                 $grid-gutter-width * .5 !default;
 // scss-docs-end card-variables
 
 // Accordion
@@ -1144,8 +1144,8 @@ $tooltip-color:                     $white !default;
 $tooltip-bg:                        $black !default;
 $tooltip-border-radius:             $border-radius !default;
 $tooltip-opacity:                   .9 !default;
-$tooltip-padding-y:                 $spacer / 4 !default;
-$tooltip-padding-x:                 $spacer / 2 !default;
+$tooltip-padding-y:                 $spacer * .25 !default;
+$tooltip-padding-x:                 $spacer * .5 !default;
 $tooltip-margin:                    0 !default;
 
 $tooltip-arrow-width:               .8rem !default;
@@ -1311,7 +1311,7 @@ $list-group-border-color:           rgba($black, .125) !default;
 $list-group-border-width:           $border-width !default;
 $list-group-border-radius:          $border-radius !default;
 
-$list-group-item-padding-y:         $spacer / 2 !default;
+$list-group-item-padding-y:         $spacer * .5 !default;
 $list-group-item-padding-x:         $spacer !default;
 $list-group-item-bg-scale:          -80% !default;
 $list-group-item-color-scale:       40% !default;
diff --git a/scss/forms/_form-check.scss b/scss/forms/_form-check.scss
index b34250a71..6321b4100 100644
--- a/scss/forms/_form-check.scss
+++ b/scss/forms/_form-check.scss
@@ -17,7 +17,7 @@
 .form-check-input {
   width: $form-check-input-width;
   height: $form-check-input-width;
-  margin-top: ($line-height-base - $form-check-input-width) / 2; // line-height minus check height
+  margin-top: ($line-height-base - $form-check-input-width) * .5; // line-height minus check height
   vertical-align: top;
   background-color: $form-check-input-bg;
   background-repeat: no-repeat;
diff --git a/scss/forms/_form-range.scss b/scss/forms/_form-range.scss
index ae1d841d5..6de42132e 100644
--- a/scss/forms/_form-range.scss
+++ b/scss/forms/_form-range.scss
@@ -27,7 +27,7 @@
   &::-webkit-slider-thumb {
     width: $form-range-thumb-width;
     height: $form-range-thumb-height;
-    margin-top: ($form-range-track-height - $form-range-thumb-height) / 2; // Webkit specific
+    margin-top: ($form-range-track-height - $form-range-thumb-height) * .5; // Webkit specific
     @include gradient-bg($form-range-thumb-bg);
     border: $form-range-thumb-border;
     @include border-radius($form-range-thumb-border-radius);
diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index 36031df79..f108b447b 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -1,3 +1,5 @@
+@use "sass:math";
+
 /// Grid system
 //
 // Generate semantic grid columns with these mixins.
@@ -8,8 +10,8 @@
   display: flex;
   flex-wrap: wrap;
   margin-top: calc(var(--#{$variable-prefix}gutter-y) * -1); // stylelint-disable-line function-disallowed-list
-  margin-right: calc(var(--#{$variable-prefix}gutter-x) / -2); // stylelint-disable-line function-disallowed-list
-  margin-left: calc(var(--#{$variable-prefix}gutter-x) / -2); // stylelint-disable-line function-disallowed-list
+  margin-right: calc(var(--#{$variable-prefix}gutter-x) * -.5); // stylelint-disable-line function-disallowed-list
+  margin-left: calc(var(--#{$variable-prefix}gutter-x) * -.5); // stylelint-disable-line function-disallowed-list
 }
 
 @mixin make-col-ready($gutter: $grid-gutter-width) {
@@ -21,15 +23,16 @@
   flex-shrink: 0;
   width: 100%;
   max-width: 100%; // Prevent `.col-auto`, `.col` (& responsive variants) from breaking out the grid
-  padding-right: calc(var(--#{$variable-prefix}gutter-x) / 2); // stylelint-disable-line function-disallowed-list
-  padding-left: calc(var(--#{$variable-prefix}gutter-x) / 2); // stylelint-disable-line function-disallowed-list
+  padding-right: calc(var(--#{$variable-prefix}gutter-x) * .5); // stylelint-disable-line function-disallowed-list
+  padding-left: calc(var(--#{$variable-prefix}gutter-x) * .5); // stylelint-disable-line function-disallowed-list
   margin-top: var(--#{$variable-prefix}gutter-y);
 }
 
 @mixin make-col($size: false, $columns: $grid-columns) {
   @if $size {
     flex: 0 0 auto;
-    width: percentage($size / $columns);
+    width: percentage(divide($size, $columns));
+
   } @else {
     flex: 1 1 0;
     max-width: 100%;
-- 
cgit v1.2.3


From 2f734af472bfb275627f10a002dfc348cf3db93d Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Mon, 14 Jun 2021 14:40:46 -0700
Subject: Don't set auto margin on offcanvas close

---
 scss/_offcanvas.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/_offcanvas.scss b/scss/_offcanvas.scss
index 1dbe6cdc4..91db68643 100644
--- a/scss/_offcanvas.scss
+++ b/scss/_offcanvas.scss
@@ -22,7 +22,9 @@
 
   .btn-close {
     padding: ($offcanvas-padding-y * .5) ($offcanvas-padding-x * .5);
-    margin: ($offcanvas-padding-y * -.5) ($offcanvas-padding-x * -.5) ($offcanvas-padding-y * -.5) auto;
+    margin-top: $offcanvas-padding-y * -.5;
+    margin-right: $offcanvas-padding-x * -.5;
+    margin-bottom: $offcanvas-padding-y * -.5;
   }
 }
 
-- 
cgit v1.2.3


From 543d2219c455419ea25173156770780b1b1db019 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Thu, 17 Jun 2021 08:38:54 -0700
Subject: Remove a leftover sass:math module call (#34280)

---
 scss/mixins/_grid.scss | 2 --
 1 file changed, 2 deletions(-)

(limited to 'scss')

diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index f108b447b..152d91413 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -1,5 +1,3 @@
-@use "sass:math";
-
 /// Grid system
 //
 // Generate semantic grid columns with these mixins.
-- 
cgit v1.2.3


From bef9ec88986dbb4a8d34e9f01ffc0183c8b7ded0 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Thu, 17 Jun 2021 09:15:59 -0700
Subject: Fix lingering Sass math (#34281)

---
 scss/mixins/_grid.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scss')

diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index 152d91413..cf5ab7fa2 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -1,4 +1,4 @@
-/// Grid system
+// Grid system
 //
 // Generate semantic grid columns with these mixins.
 
@@ -55,7 +55,7 @@
 @mixin row-cols($count) {
   > * {
     flex: 0 0 auto;
-    width: 100% / $count;
+    width: divide(100%, $count);
   }
 }
 
-- 
cgit v1.2.3


From 34db122ecce249c81a519dbcb4caf42dac58460e Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sat, 19 Jun 2021 16:30:31 -0700
Subject: Small typos, closes #34249

---
 scss/_variables.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scss')

diff --git a/scss/_variables.scss b/scss/_variables.scss
index 75d126d7b..06dfa4a4d 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -422,8 +422,8 @@ $font-family-monospace:       SFMono-Regular, Menlo, Monaco, Consolas, "Liberati
 $font-family-base:            var(--#{$variable-prefix}font-sans-serif) !default;
 $font-family-code:            var(--#{$variable-prefix}font-monospace) !default;
 
-// $font-size-root effects the value of `rem`, which is used for as well font sizes, paddings and margins
-// $font-size-base effects the font size of the body text
+// $font-size-root affects the value of `rem`, which is used for as well font sizes, paddings, and margins
+// $font-size-base affects the font size of the body text
 $font-size-root:              null !default;
 $font-size-base:              1rem !default; // Assumes the browser default, typically `16px`
 $font-size-sm:                $font-size-base * .875 !default;
-- 
cgit v1.2.3


From ed13d0155905533e3f0f7c97b99a7803994e0953 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Fri, 18 Jun 2021 05:58:31 +0300
Subject: Update the divide() function

---
 scss/_functions.scss   | 41 +++++++++++++++++++++++++++++------------
 scss/mixins/_grid.scss |  2 +-
 2 files changed, 30 insertions(+), 13 deletions(-)

(limited to 'scss')

diff --git a/scss/_functions.scss b/scss/_functions.scss
index 2d3478bfa..870f36790 100644
--- a/scss/_functions.scss
+++ b/scss/_functions.scss
@@ -221,26 +221,43 @@ $_luminance-list: .0008 .001 .0011 .0013 .0015 .0017 .002 .0022 .0025 .0027 .003
 }
 
 @function divide($dividend, $divisor, $precision: 10) {
-  $sign: if($dividend > 0 and $divisor > 0, 1, -1);
+  $sign: if($dividend > 0 and $divisor > 0 or $dividend < 0 and $divisor < 0, 1, -1);
   $dividend: abs($dividend);
   $divisor: abs($divisor);
-  $quotient: 0;
-  $remainder: $dividend;
   @if $dividend == 0 {
     @return 0;
   }
   @if $divisor == 0 {
     @error "Cannot divide by 0";
   }
-  @if $divisor == 1 {
-    @return $dividend;
-  }
-  @while $remainder >= $divisor {
-    $quotient: $quotient + 1;
-    $remainder: $remainder - $divisor;
+  $remainder: $dividend;
+  $result: 0;
+  $factor: 10;
+  @while ($remainder > 0 and $precision >= 0) {
+    $quotient: 0;
+    @while ($remainder >= $divisor) {
+      $remainder: $remainder - $divisor;
+      $quotient: $quotient + 1;
+    }
+    $result: $result * 10 + $quotient;
+    $factor: $factor * .1;
+    $remainder: $remainder * 10;
+    $precision: $precision - 1;
+    @if ($precision < 0 and $remainder >= $divisor * 5) {
+      $result: $result + 1;
+    }
   }
-  @if $remainder > 0 and $precision > 0 {
-    $remainder: divide($remainder * 10, $divisor, $precision - 1) * .1;
+  $result: $result * $factor * $sign;
+  $dividend-unit: unit($dividend);
+  $divisor-unit: unit($divisor);
+  $unit-map: (
+    "px": 1px,
+    "rem": 1rem,
+    "em": 1em,
+    "%": 1%
+  );
+  @if ($dividend-unit != $divisor-unit and map-has-key($unit-map, $dividend-unit)) {
+    $result: $result * map-get($unit-map, $dividend-unit);
   }
-  @return ($quotient + $remainder) * $sign;
+  @return $result;
 }
diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index cf5ab7fa2..f398cd42a 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -29,7 +29,7 @@
 @mixin make-col($size: false, $columns: $grid-columns) {
   @if $size {
     flex: 0 0 auto;
-    width: percentage(divide($size, $columns));
+    width: divide(100%, divide($columns, $size));
 
   } @else {
     flex: 1 1 0;
-- 
cgit v1.2.3


From c11c3a7e1941032be9f239520a52e6064af3e017 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Thu, 17 Jun 2021 22:29:21 -0700
Subject: Update rfs to v9.0.4.

---
 scss/vendor/_rfs.scss | 68 +++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 55 insertions(+), 13 deletions(-)

(limited to 'scss')

diff --git a/scss/vendor/_rfs.scss b/scss/vendor/_rfs.scss
index 798753ecb..7e9a6c7a8 100644
--- a/scss/vendor/_rfs.scss
+++ b/scss/vendor/_rfs.scss
@@ -4,7 +4,7 @@
 //
 // Automated responsive values for font sizes, paddings, margins and much more
 //
-// Licensed under MIT (https://github.com/twbs/rfs/blob/master/LICENSE)
+// Licensed under MIT (https://github.com/twbs/rfs/blob/main/LICENSE)
 
 // Configuration
 
@@ -52,12 +52,54 @@ $enable-rfs: true !default;
 // Cache $rfs-base-value unit
 $rfs-base-value-unit: unit($rfs-base-value);
 
+@function divide($dividend, $divisor, $precision: 10) {
+  $sign: if($dividend > 0 and $divisor > 0 or $dividend < 0 and $divisor < 0, 1, -1);
+  $dividend: abs($dividend);
+  $divisor: abs($divisor);
+  @if $dividend == 0 {
+    @return 0;
+  }
+  @if $divisor == 0 {
+    @error "Cannot divide by 0";
+  }
+  $remainder: $dividend;
+  $result: 0;
+  $factor: 10;
+  @while ($remainder > 0 and $precision >= 0) {
+    $quotient: 0;
+    @while ($remainder >= $divisor) {
+      $remainder: $remainder - $divisor;
+      $quotient: $quotient + 1;
+    }
+    $result: $result * 10 + $quotient;
+    $factor: $factor * .1;
+    $remainder: $remainder * 10;
+    $precision: $precision - 1;
+    @if ($precision < 0 and $remainder >= $divisor * 5) {
+      $result: $result + 1;
+    }
+  }
+  $result: $result * $factor * $sign;
+  $dividend-unit: unit($dividend);
+  $divisor-unit: unit($divisor);
+  $unit-map: (
+    "px": 1px,
+    "rem": 1rem,
+    "em": 1em,
+    "%": 1%
+  );
+  @if ($dividend-unit != $divisor-unit and map-has-key($unit-map, $dividend-unit)) {
+    $result: $result * map-get($unit-map, $dividend-unit);
+  }
+  @return $result;
+}
+
 // Remove px-unit from $rfs-base-value for calculations
 @if $rfs-base-value-unit == px {
-  $rfs-base-value: $rfs-base-value / ($rfs-base-value * 0 + 1);
+  $rfs-base-value: divide($rfs-base-value, $rfs-base-value * 0 + 1);
 }
 @else if $rfs-base-value-unit == rem {
-  $rfs-base-value: $rfs-base-value / ($rfs-base-value * 0 + 1 / $rfs-rem-value);
+  $rfs-base-value: divide($rfs-base-value, divide($rfs-base-value * 0 + 1, $rfs-rem-value));
 }
 
 // Cache $rfs-breakpoint unit to prevent multiple calls
@@ -65,14 +107,14 @@ $rfs-breakpoint-unit-cache: unit($rfs-breakpoint);
 
 // Remove unit from $rfs-breakpoint for calculations
 @if $rfs-breakpoint-unit-cache == px {
-  $rfs-breakpoint: $rfs-breakpoint / ($rfs-breakpoint * 0 + 1);
+  $rfs-breakpoint: divide($rfs-breakpoint, $rfs-breakpoint * 0 + 1);
 }
 @else if $rfs-breakpoint-unit-cache == rem or $rfs-breakpoint-unit-cache == "em" {
-  $rfs-breakpoint: $rfs-breakpoint / ($rfs-breakpoint * 0 + 1 / $rfs-rem-value);
+  $rfs-breakpoint: divide($rfs-breakpoint, divide($rfs-breakpoint * 0 + 1, $rfs-rem-value));
 }
 
 // Calculate the media query value
-$rfs-mq-value: if($rfs-breakpoint-unit == px, #{$rfs-breakpoint}px, #{$rfs-breakpoint / $rfs-rem-value}#{$rfs-breakpoint-unit});
+$rfs-mq-value: if($rfs-breakpoint-unit == px, #{$rfs-breakpoint}px, #{divide($rfs-breakpoint, $rfs-rem-value)}#{$rfs-breakpoint-unit});
 $rfs-mq-property-width: if($rfs-mode == max-media-query, max-width, min-width);
 $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height);
 
@@ -164,11 +206,11 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
 
       @if $unit == px {
         // Convert to rem if needed
-        $val: $val + ' ' + if($rfs-unit == rem, #{$value / ($value * 0 + $rfs-rem-value)}rem, $value);
+        $val: $val + ' ' + if($rfs-unit == rem, #{divide($value, $value * 0 + $rfs-rem-value)}rem, $value);
       }
       @else if $unit == rem {
         // Convert to px if needed
-        $val: $val + ' ' + if($rfs-unit == px, #{$value / ($value * 0 + 1) * $rfs-rem-value}px, $value);
+        $val: $val + ' ' + if($rfs-unit == px, #{divide($value, $value * 0 + 1) * $rfs-rem-value}px, $value);
       }
       @else {
         // If $value isn't a number (like inherit) or $value has a unit (not px or rem, like 1.5em) or $ is 0, just print the value
@@ -205,21 +247,21 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
 
       @else {
         // Remove unit from $value for calculations
-        $value: $value / ($value * 0 + if($unit == px, 1, 1 / $rfs-rem-value));
+        $value: divide($value, $value * 0 + if($unit == px, 1, divide(1, $rfs-rem-value)));
 
         // Only add the media query if the value is greater than the minimum value
         @if abs($value) <= $rfs-base-value or not $enable-rfs {
-          $val: $val + ' ' +  if($rfs-unit == rem, #{$value / $rfs-rem-value}rem, #{$value}px);
+          $val: $val + ' ' +  if($rfs-unit == rem, #{divide($value, $rfs-rem-value)}rem, #{$value}px);
         }
         @else {
           // Calculate the minimum value
-          $value-min: $rfs-base-value + (abs($value) - $rfs-base-value) / $rfs-factor;
+          $value-min: $rfs-base-value + divide(abs($value) - $rfs-base-value, $rfs-factor);
 
           // Calculate difference between $value and the minimum value
           $value-diff: abs($value) - $value-min;
 
           // Base value formatting
-          $min-width: if($rfs-unit == rem, #{$value-min / $rfs-rem-value}rem, #{$value-min}px);
+          $min-width: if($rfs-unit == rem, #{divide($value-min, $rfs-rem-value)}rem, #{$value-min}px);
 
           // Use negative value if needed
           $min-width: if($value < 0, -$min-width, $min-width);
@@ -228,7 +270,7 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
           $variable-unit: if($rfs-two-dimensional, vmin, vw);
 
           // Calculate the variable width between 0 and $rfs-breakpoint
-          $variable-width: #{$value-diff * 100 / $rfs-breakpoint}#{$variable-unit};
+          $variable-width: #{divide($value-diff * 100, $rfs-breakpoint)}#{$variable-unit};
 
           // Return the calculated value
           $val: $val + ' calc(' + $min-width + if($value < 0, ' - ', ' + ') + $variable-width + ')';
-- 
cgit v1.2.3


From 16d5041a76748580bae47ce168ba579daae9725b Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Tue, 22 Jun 2021 10:39:13 -0700
Subject: Fix another Sass division (#34332)

* Fix another Sass division

* Revert the percentage division in the mixins for accuracy

Co-authored-by: XhmikosR <xhmikosr@gmail.com>
---
 scss/mixins/_grid.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scss')

diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index f398cd42a..ff6941c46 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -29,7 +29,7 @@
 @mixin make-col($size: false, $columns: $grid-columns) {
   @if $size {
     flex: 0 0 auto;
-    width: divide(100%, divide($columns, $size));
+    width: percentage(divide($size, $columns));
 
   } @else {
     flex: 1 1 0;
@@ -43,7 +43,7 @@
 }
 
 @mixin make-col-offset($size, $columns: $grid-columns) {
-  $num: $size / $columns;
+  $num: divide($size, $columns);
   margin-left: if($num == 0, 0, percentage($num));
 }
 
-- 
cgit v1.2.3


From 688bce4fa695cc360a0d084e34f029b0c192b223 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Tue, 22 Jun 2021 21:29:16 +0300
Subject: Release v5.0.2 (#34276)

* Bump version to v5.0.2.

* Dist
---
 scss/bootstrap-grid.scss      | 2 +-
 scss/bootstrap-reboot.scss    | 2 +-
 scss/bootstrap-utilities.scss | 2 +-
 scss/bootstrap.scss           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'scss')

diff --git a/scss/bootstrap-grid.scss b/scss/bootstrap-grid.scss
index 5f3a14d16..bcd8c19cf 100644
--- a/scss/bootstrap-grid.scss
+++ b/scss/bootstrap-grid.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Grid v5.0.1 (https://getbootstrap.com/)
+ * Bootstrap Grid v5.0.2 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
diff --git a/scss/bootstrap-reboot.scss b/scss/bootstrap-reboot.scss
index 3fb5fa0ec..72444f6c1 100644
--- a/scss/bootstrap-reboot.scss
+++ b/scss/bootstrap-reboot.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Reboot v5.0.1 (https://getbootstrap.com/)
+ * Bootstrap Reboot v5.0.2 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
diff --git a/scss/bootstrap-utilities.scss b/scss/bootstrap-utilities.scss
index f921a5d15..ab2d0e701 100644
--- a/scss/bootstrap-utilities.scss
+++ b/scss/bootstrap-utilities.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Utilities v5.0.1 (https://getbootstrap.com/)
+ * Bootstrap Utilities v5.0.2 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss
index 86c079db3..eb047a3f2 100644
--- a/scss/bootstrap.scss
+++ b/scss/bootstrap.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v5.0.1 (https://getbootstrap.com/)
+ * Bootstrap v5.0.2 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
-- 
cgit v1.2.3


From a816615efa9d4fbd311c58d79b096c5672a406a1 Mon Sep 17 00:00:00 2001
From: harishhalodoc <80090779+harishhalodoc@users.noreply.github.com>
Date: Wed, 23 Jun 2021 07:50:01 +0530
Subject: Add utility classes for opacity (#33781)

* Add responsive utility classes for opacity

- fix for #33483

* remove responsive opacity utils as it has impact on bootstrap.css bundle size

* Update opacity.md

* Update site/content/docs/5.0/utilities/opacity.md

Co-authored-by: Mark Otto <otto@github.com>

* Update site/content/docs/5.0/utilities/opacity.md

Co-authored-by: Mark Otto <otto@github.com>

Co-authored-by: Harish <halodoc@ip-192-168-1-101.ap-southeast-1.compute.internal>
Co-authored-by: XhmikosR <xhmikosr@gmail.com>
Co-authored-by: Mark Otto <otto@github.com>
Co-authored-by: Mark Otto <markd.otto@gmail.com>
Co-authored-by: alpadev <2838324+alpadev@users.noreply.github.com>
---
 scss/_utilities.scss | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'scss')

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 3c927cf59..74f8a3a01 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -24,6 +24,19 @@ $utilities: map-merge(
       )
     ),
     // scss-docs-end utils-float
+    // Opacity utilities
+    // scss-docs-start utils-opacity
+    "opacity": (
+      property: opacity,
+      values: (
+        0: 0,
+        25: .25,
+        50: .5,
+        75: .75,
+        100: 1,
+      )
+    ),
+    // scss-docs-end utils-opacity
     // scss-docs-start utils-overflow
     "overflow": (
       property: overflow,
-- 
cgit v1.2.3


From dd824f2d3eab63790ccbd30d6e5c125b77d82d32 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Tue, 22 Jun 2021 19:51:16 -0700
Subject: v5.1: Add optional CSS grid (#31813)

---
 scss/_grid.scss      | 34 ++++++++++++++++++++++++++++++++++
 scss/_variables.scss |  1 +
 2 files changed, 35 insertions(+)

(limited to 'scss')

diff --git a/scss/_grid.scss b/scss/_grid.scss
index 5686f31fe..13f21a3ff 100644
--- a/scss/_grid.scss
+++ b/scss/_grid.scss
@@ -12,6 +12,40 @@
   }
 }
 
+@mixin make-cssgrid($columns: $grid-columns, $breakpoints: $grid-breakpoints) {
+  @each $breakpoint in map-keys($breakpoints) {
+    $infix: breakpoint-infix($breakpoint, $breakpoints);
+
+    @include media-breakpoint-up($breakpoint, $breakpoints) {
+      @if $columns > 0 {
+        @for $i from 1 through $columns {
+          .g-col#{$infix}-#{$i} {
+            grid-column: auto / span $i;
+          }
+        }
+
+        // `$columns - 1` because offsetting by the width of an entire row isn't possible
+        @for $i from 0 through ($columns - 1) {
+          .g-start#{$infix}-#{$i} {
+            grid-column-start: $i;
+          }
+        }
+      }
+    }
+  }
+}
+
+@if $enable-cssgrid {
+  .grid {
+    display: grid;
+    grid-template-rows: repeat(var(--#{$variable-prefix}rows, 1), 1fr);
+    grid-template-columns: repeat(var(--#{$variable-prefix}columns, #{$grid-columns}), 1fr);
+    gap: var(--#{$variable-prefix}gap, #{$grid-gutter-width});
+
+    @include make-cssgrid();
+  }
+}
+
 
 // Columns
 //
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 06dfa4a4d..8abd75032 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -221,6 +221,7 @@ $enable-transitions:          true !default;
 $enable-reduced-motion:       true !default;
 $enable-smooth-scroll:        true !default;
 $enable-grid-classes:         true !default;
+$enable-cssgrid:              false !default;
 $enable-button-pointers:      true !default;
 $enable-rfs:                  true !default;
 $enable-validation-icons:     true !default;
-- 
cgit v1.2.3


From 45d26de72817b295c5f94c8426354fd5b7d0a1f9 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Fri, 25 Jun 2021 13:41:15 -0700
Subject: Variablize backdrop for modal and offcanvas

---
 scss/_mixins.scss          |  1 +
 scss/_modal.scss           | 12 +-----------
 scss/_offcanvas.scss       |  4 ++++
 scss/_variables.scss       |  9 ++++++---
 scss/mixins/_backdrop.scss | 14 ++++++++++++++
 5 files changed, 26 insertions(+), 14 deletions(-)
 create mode 100644 scss/mixins/_backdrop.scss

(limited to 'scss')

diff --git a/scss/_mixins.scss b/scss/_mixins.scss
index eec085789..af1f74f72 100644
--- a/scss/_mixins.scss
+++ b/scss/_mixins.scss
@@ -22,6 +22,7 @@
 
 // Components
 @import "mixins/alert";
+@import "mixins/backdrop";
 @import "mixins/buttons";
 @import "mixins/caret";
 @import "mixins/pagination";
diff --git a/scss/_modal.scss b/scss/_modal.scss
index 77473085c..21e1258f5 100644
--- a/scss/_modal.scss
+++ b/scss/_modal.scss
@@ -85,17 +85,7 @@
 
 // Modal background
 .modal-backdrop {
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: $zindex-modal-backdrop;
-  width: 100vw;
-  height: 100vh;
-  background-color: $modal-backdrop-bg;
-
-  // Fade for backdrop
-  &.fade { opacity: 0; }
-  &.show { opacity: $modal-backdrop-opacity; }
+  @include overlay-backdrop($zindex-modal-backdrop, $modal-backdrop-bg, $modal-backdrop-opacity);
 }
 
 // Modal header
diff --git a/scss/_offcanvas.scss b/scss/_offcanvas.scss
index 91db68643..a089c2a08 100644
--- a/scss/_offcanvas.scss
+++ b/scss/_offcanvas.scss
@@ -14,6 +14,10 @@
   @include transition(transform $offcanvas-transition-duration ease-in-out);
 }
 
+.offcanvas-backdrop {
+  @include overlay-backdrop($zindex-offcanvas-backdrop, $offcanvas-backdrop-bg, $offcanvas-backdrop-opacity);
+}
+
 .offcanvas-header {
   display: flex;
   align-items: center;
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 8abd75032..aa4d4ff2f 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -907,9 +907,10 @@ $form-validation-states: (
 $zindex-dropdown:                   1000 !default;
 $zindex-sticky:                     1020 !default;
 $zindex-fixed:                      1030 !default;
-$zindex-modal-backdrop:             1040 !default;
-$zindex-offcanvas:                  1050 !default;
-$zindex-modal:                      1060 !default;
+$zindex-offcanvas-backdrop:         1040 !default;
+$zindex-offcanvas:                  1045 !default;
+$zindex-modal-backdrop:             1050 !default;
+$zindex-modal:                      1055 !default;
 $zindex-popover:                    1070 !default;
 $zindex-tooltip:                    1080 !default;
 // scss-docs-end zindex-stack
@@ -1453,6 +1454,8 @@ $offcanvas-title-line-height:       $modal-title-line-height !default;
 $offcanvas-bg-color:                $modal-content-bg !default;
 $offcanvas-color:                   $modal-content-color !default;
 $offcanvas-box-shadow:              $modal-content-box-shadow-xs !default;
+$offcanvas-backdrop-bg:             $modal-backdrop-bg !default;
+$offcanvas-backdrop-opacity:        $modal-backdrop-opacity !default;
 // scss-docs-end offcanvas-variables
 
 // Code
diff --git a/scss/mixins/_backdrop.scss b/scss/mixins/_backdrop.scss
new file mode 100644
index 000000000..9705ae9ee
--- /dev/null
+++ b/scss/mixins/_backdrop.scss
@@ -0,0 +1,14 @@
+// Shared between modals and offcanvases
+@mixin overlay-backdrop($zindex, $backdrop-bg, $backdrop-opacity) {
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: $zindex;
+  width: 100vw;
+  height: 100vh;
+  background-color: $backdrop-bg;
+
+  // Fade for backdrop
+  &.fade { opacity: 0; }
+  &.show { opacity: $backdrop-opacity; }
+}
-- 
cgit v1.2.3


From 359ed099e5b2f82bd602f2a6c45f43af8f2c87e8 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Mon, 14 Jun 2021 23:25:11 +0300
Subject: Add horizontal collapse support

---
 scss/_transitions.scss | 6 ++++++
 scss/_variables.scss   | 1 +
 2 files changed, 7 insertions(+)

(limited to 'scss')

diff --git a/scss/_transitions.scss b/scss/_transitions.scss
index 2905df45c..bfb26aa8a 100644
--- a/scss/_transitions.scss
+++ b/scss/_transitions.scss
@@ -17,5 +17,11 @@
   height: 0;
   overflow: hidden;
   @include transition($transition-collapse);
+
+  &.collapse-horizontal {
+    width: 0;
+    height: auto;
+    @include transition($transition-collapse-width);
+  }
 }
 // scss-docs-end collapse-classes
diff --git a/scss/_variables.scss b/scss/_variables.scss
index aa4d4ff2f..7f93df4e3 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -398,6 +398,7 @@ $transition-base:             all .2s ease-in-out !default;
 $transition-fade:             opacity .15s linear !default;
 // scss-docs-start collapse-transition
 $transition-collapse:         height .35s ease !default;
+$transition-collapse-width:   width .35s ease !default;
 // scss-docs-end collapse-transition
 
 // stylelint-disable function-disallowed-list
-- 
cgit v1.2.3


From 47bbd945f0f92f50dd2f2dbdd78d10ada39a41cb Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Tue, 6 Jul 2021 11:31:20 -1000
Subject: Add maps for all colors, document how to extend color utilities
 (#32319)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add maps for all colors, document how to extend color utilities

* Updates to make this more functional for v5

- Moves color maps into _variables.scss for now (felt weird to split them out when the variables are there)
- Adds a new function, map-merge-multiple(), and updates docs that reference combo-map
- Updates code snippet and docs guidance about how to extend the color utils to handle this

* Update site/content/docs/5.0/customize/color.md

Co-authored-by: Gaël Poupard <ffoodd@users.noreply.github.com>
Co-authored-by: XhmikosR <xhmikosr@gmail.com>
---
 scss/_functions.scss |  10 +++++
 scss/_variables.scss | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+)

(limited to 'scss')

diff --git a/scss/_functions.scss b/scss/_functions.scss
index 870f36790..f8e43702d 100644
--- a/scss/_functions.scss
+++ b/scss/_functions.scss
@@ -55,6 +55,16 @@
   @return $result;
 }
 
+// Merge multiple maps
+@function map-merge-multiple($maps...) {
+  $merged-maps: ();
+
+  @each $map in $maps {
+    $merged-maps: map-merge($merged-maps, $map);
+  }
+  @return $merged-maps;
+}
+
 // Replace `$search` with `$replace` in `$string`
 // Used on our SVG icon backgrounds for custom forms.
 //
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 7f93df4e3..f79021467 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -198,6 +198,126 @@ $cyan-600: shade-color($cyan, 20%) !default;
 $cyan-700: shade-color($cyan, 40%) !default;
 $cyan-800: shade-color($cyan, 60%) !default;
 $cyan-900: shade-color($cyan, 80%) !default;
+
+$blues: (
+  "blue-100": $blue-100,
+  "blue-200": $blue-200,
+  "blue-300": $blue-300,
+  "blue-400": $blue-400,
+  "blue-500": $blue-500,
+  "blue-600": $blue-600,
+  "blue-700": $blue-700,
+  "blue-800": $blue-800,
+  "blue-900": $blue-900
+) !default;
+
+$indigos: (
+  "indigo-100": $indigo-100,
+  "indigo-200": $indigo-200,
+  "indigo-300": $indigo-300,
+  "indigo-400": $indigo-400,
+  "indigo-500": $indigo-500,
+  "indigo-600": $indigo-600,
+  "indigo-700": $indigo-700,
+  "indigo-800": $indigo-800,
+  "indigo-900": $indigo-900
+) !default;
+
+$purples: (
+  "purple-100": $purple-200,
+  "purple-200": $purple-100,
+  "purple-300": $purple-300,
+  "purple-400": $purple-400,
+  "purple-500": $purple-500,
+  "purple-600": $purple-600,
+  "purple-700": $purple-700,
+  "purple-800": $purple-800,
+  "purple-900": $purple-900
+) !default;
+
+$pinks: (
+  "pink-100": $pink-100,
+  "pink-200": $pink-200,
+  "pink-300": $pink-300,
+  "pink-400": $pink-400,
+  "pink-500": $pink-500,
+  "pink-600": $pink-600,
+  "pink-700": $pink-700,
+  "pink-800": $pink-800,
+  "pink-900": $pink-900
+) !default;
+
+$reds: (
+  "red-100": $red-100,
+  "red-200": $red-200,
+  "red-300": $red-300,
+  "red-400": $red-400,
+  "red-500": $red-500,
+  "red-600": $red-600,
+  "red-700": $red-700,
+  "red-800": $red-800,
+  "red-900": $red-900
+) !default;
+
+$oranges: (
+  "orange-100": $orange-100,
+  "orange-200": $orange-200,
+  "orange-300": $orange-300,
+  "orange-400": $orange-400,
+  "orange-500": $orange-500,
+  "orange-600": $orange-600,
+  "orange-700": $orange-700,
+  "orange-800": $orange-800,
+  "orange-900": $orange-900
+) !default;
+
+$yellows: (
+  "yellow-100": $yellow-100,
+  "yellow-200": $yellow-200,
+  "yellow-300": $yellow-300,
+  "yellow-400": $yellow-400,
+  "yellow-500": $yellow-500,
+  "yellow-600": $yellow-600,
+  "yellow-700": $yellow-700,
+  "yellow-800": $yellow-800,
+  "yellow-900": $yellow-900
+) !default;
+
+$greens: (
+  "green-100": $green-100,
+  "green-200": $green-200,
+  "green-300": $green-300,
+  "green-400": $green-400,
+  "green-500": $green-500,
+  "green-600": $green-600,
+  "green-700": $green-700,
+  "green-800": $green-800,
+  "green-900": $green-900
+) !default;
+
+$teals: (
+  "teal-100": $teal-100,
+  "teal-200": $teal-200,
+  "teal-300": $teal-300,
+  "teal-400": $teal-400,
+  "teal-500": $teal-500,
+  "teal-600": $teal-600,
+  "teal-700": $teal-700,
+  "teal-800": $teal-800,
+  "teal-900": $teal-900
+) !default;
+
+$cyans: (
+  "cyan-100": $cyan-100,
+  "cyan-200": $cyan-200,
+  "cyan-300": $cyan-300,
+  "cyan-400": $cyan-400,
+  "cyan-500": $cyan-500,
+  "cyan-600": $cyan-600,
+  "cyan-700": $cyan-700,
+  "cyan-800": $cyan-800,
+  "cyan-900": $cyan-900
+) !default;
 // fusv-enable
 
 // Characters which are escaped by the escape-svg function
-- 
cgit v1.2.3


From 0fc117cec5962a697c7a9ab22f40fbad21a7519e Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Wed, 7 Jul 2021 23:44:55 -0700
Subject: Add null `$card-box-shadow` variable (#34440)

Fixes #34421

Co-authored-by: XhmikosR <xhmikosr@gmail.com>
---
 scss/_card.scss      | 1 +
 scss/_variables.scss | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/_card.scss b/scss/_card.scss
index b077858c4..ed74c82bf 100644
--- a/scss/_card.scss
+++ b/scss/_card.scss
@@ -13,6 +13,7 @@
   background-clip: border-box;
   border: $card-border-width solid $card-border-color;
   @include border-radius($card-border-radius);
+  @include box-shadow($card-box-shadow);
 
   > hr {
     margin-right: 0;
diff --git a/scss/_variables.scss b/scss/_variables.scss
index f79021467..4486b5712 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -1208,8 +1208,9 @@ $card-spacer-y:                     $spacer !default;
 $card-spacer-x:                     $spacer !default;
 $card-title-spacer-y:               $spacer * .5 !default;
 $card-border-width:                 $border-width !default;
-$card-border-radius:                $border-radius !default;
 $card-border-color:                 rgba($black, .125) !default;
+$card-border-radius:                $border-radius !default;
+$card-box-shadow:                   null !default;
 $card-inner-border-radius:          subtract($card-border-radius, $card-border-width) !default;
 $card-cap-padding-y:                $card-spacer-y * .5 !default;
 $card-cap-padding-x:                $card-spacer-x !default;
-- 
cgit v1.2.3


From 054f8781a86b16c3793eaf424093a5d4cfb37114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Poupard?= <ffoodd@users.noreply.github.com>
Date: Wed, 14 Jul 2021 08:19:28 +0200
Subject: fix(forms): prevent color control from shrinking (#34445)

* fix(forms): prevent color control from shrinking

Fixes #34195

Setting `min-width` alongside `max-width` wouldn't make any sense IMHO. The only concern I have is whether we should introduce a dedicated variable for said width?

* feat(forms): introduce ` $form-color-width`

* feat(forms): use ` $form-color-width`

Co-authored-by: XhmikosR <xhmikosr@gmail.com>
---
 scss/_variables.scss          | 2 ++
 scss/forms/_form-control.scss | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/_variables.scss b/scss/_variables.scss
index 4486b5712..3a77eec4c 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -847,6 +847,8 @@ $input-height-sm:                       add($input-line-height * 1em, add($input
 $input-height-lg:                       add($input-line-height * 1em, add($input-padding-y-lg * 2, $input-height-border, false)) !default;
 
 $input-transition:                      border-color .15s ease-in-out, box-shadow .15s ease-in-out !default;
+
+$form-color-width:                      3rem !default;
 // scss-docs-end form-input-variables
 
 // scss-docs-start form-check-variables
diff --git a/scss/forms/_form-control.scss b/scss/forms/_form-control.scss
index 9728b91f3..96423c530 100644
--- a/scss/forms/_form-control.scss
+++ b/scss/forms/_form-control.scss
@@ -199,7 +199,7 @@ textarea {
 // stylelint-enable selector-no-qualifying-type
 
 .form-control-color {
-  max-width: 3rem;
+  width: $form-color-width;
   height: auto; // Override fixed browser height
   padding: $input-padding-y;
 
-- 
cgit v1.2.3


From 2bc6de1f5ea85e2b1e228e56c96b339dc105b1c8 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Fri, 14 May 2021 14:32:24 -0700
Subject: Add hstack and vstack helpers

---
 scss/_helpers.scss        |  1 +
 scss/helpers/_stacks.scss | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 scss/helpers/_stacks.scss

(limited to 'scss')

diff --git a/scss/_helpers.scss b/scss/_helpers.scss
index 8f566d12f..13fb1bbb5 100644
--- a/scss/_helpers.scss
+++ b/scss/_helpers.scss
@@ -2,6 +2,7 @@
 @import "helpers/colored-links";
 @import "helpers/ratio";
 @import "helpers/position";
+@import "helpers/stacks";
 @import "helpers/visually-hidden";
 @import "helpers/stretched-link";
 @import "helpers/text-truncation";
diff --git a/scss/helpers/_stacks.scss b/scss/helpers/_stacks.scss
new file mode 100644
index 000000000..bb0d4d55a
--- /dev/null
+++ b/scss/helpers/_stacks.scss
@@ -0,0 +1,24 @@
+// scss-docs-start stacks
+.hstack {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  align-self: stretch;
+}
+
+.vstack {
+  display: flex;
+  flex: 1 1 auto;
+  flex-direction: column;
+  align-self: stretch;
+}
+// scss-docs-end stacks
+
+.vr {
+  display: inline-block;
+  align-self: stretch;
+  width: 1px;
+  min-height: 1em;
+  background-color: currentColor;
+  opacity: $hr-opacity;
+}
-- 
cgit v1.2.3


From aee169d19288d78330be2df0960ea8924353f84f Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Tue, 22 Jun 2021 22:22:02 -0700
Subject: Split .vr from stacks as a new helper

---
 scss/_helpers.scss        | 1 +
 scss/helpers/_stacks.scss | 9 ---------
 scss/helpers/_vr.scss     | 8 ++++++++
 3 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 scss/helpers/_vr.scss

(limited to 'scss')

diff --git a/scss/_helpers.scss b/scss/_helpers.scss
index 13fb1bbb5..4a989f5a5 100644
--- a/scss/_helpers.scss
+++ b/scss/_helpers.scss
@@ -6,3 +6,4 @@
 @import "helpers/visually-hidden";
 @import "helpers/stretched-link";
 @import "helpers/text-truncation";
+@import "helpers/vr";
diff --git a/scss/helpers/_stacks.scss b/scss/helpers/_stacks.scss
index bb0d4d55a..6cd237ae6 100644
--- a/scss/helpers/_stacks.scss
+++ b/scss/helpers/_stacks.scss
@@ -13,12 +13,3 @@
   align-self: stretch;
 }
 // scss-docs-end stacks
-
-.vr {
-  display: inline-block;
-  align-self: stretch;
-  width: 1px;
-  min-height: 1em;
-  background-color: currentColor;
-  opacity: $hr-opacity;
-}
diff --git a/scss/helpers/_vr.scss b/scss/helpers/_vr.scss
new file mode 100644
index 000000000..37f864777
--- /dev/null
+++ b/scss/helpers/_vr.scss
@@ -0,0 +1,8 @@
+.vr {
+  display: inline-block;
+  align-self: stretch;
+  width: 1px;
+  min-height: 1em;
+  background-color: currentColor;
+  opacity: $hr-opacity;
+}
-- 
cgit v1.2.3


From 06a1ca56233583cd7ec2b2d7f8987ce43d796114 Mon Sep 17 00:00:00 2001
From: craftwerk <pst@crftwrk.de>
Date: Thu, 1 Apr 2021 19:24:17 +0200
Subject: Add new offcanvas support to navbars

Co-Authored-By: craftwerk <1193597+craftwerk@users.noreply.github.com>
---
 scss/_navbar.scss | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index 2ccef11b7..a395ede65 100644
--- a/scss/_navbar.scss
+++ b/scss/_navbar.scss
@@ -193,13 +193,42 @@
         .navbar-toggler {
           display: none;
         }
+
+        .offcanvas-header {
+          display: none;
+        }
+
+        .offcanvas {
+          position: inherit;
+          bottom: 0;
+          z-index: 1000;
+          flex-grow: 1;
+          visibility: visible !important; /* stylelint-disable-line declaration-no-important */
+          background-color: transparent;
+          border-right: 0;
+          border-left: 0;
+          @include transition(none);
+          transform: none;
+        }
+        .offcanvas-top,
+        .offcanvas-bottom {
+          height: auto;
+          border-top: 0;
+          border-bottom: 0;
+        }
+
+        .offcanvas-body {
+          display: flex;
+          flex-grow: 0;
+          padding: 0;
+          overflow-y: visible;
+        }
       }
     }
   }
 }
 // scss-docs-end navbar-expand-loop
 
-
 // Navbar themes
 //
 // Styles for switching between navbars with light or dark background.
-- 
cgit v1.2.3


From 41292a52570610dc312a775ae0491dc46f93a4fe Mon Sep 17 00:00:00 2001
From: GeoSot <geo.sotis@gmail.com>
Date: Thu, 22 Jul 2021 18:13:13 +0300
Subject: Toasts: Change showing timings and classes to keep toast
 `display:none` by default (#33610)

---
 scss/_toasts.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scss')

diff --git a/scss/_toasts.scss b/scss/_toasts.scss
index 717aae576..0a2d6ec87 100644
--- a/scss/_toasts.scss
+++ b/scss/_toasts.scss
@@ -10,11 +10,11 @@
   box-shadow: $toast-box-shadow;
   @include border-radius($toast-border-radius);
 
-  &:not(.showing):not(.show) {
+  &.showing {
     opacity: 0;
   }
 
-  &.hide {
+  &:not(.show) {
     display: none;
   }
 }
-- 
cgit v1.2.3


From 9ef7ca51568372cde63094281738fe72f490e89d Mon Sep 17 00:00:00 2001
From: TheFakeCake <TheFakeCake@users.noreply.github.com>
Date: Mon, 12 Jul 2021 14:41:16 +0200
Subject: Make default $accordion-icon-color consistent

Change the $accordion-icon-color variable default value to
$accordion-button-color
---
 scss/_variables.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/_variables.scss b/scss/_variables.scss
index 3a77eec4c..1caaed6a0 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -1252,7 +1252,7 @@ $accordion-button-focus-border-color:     $input-focus-border-color !default;
 $accordion-button-focus-box-shadow:       $btn-focus-box-shadow !default;
 
 $accordion-icon-width:                    1.25rem !default;
-$accordion-icon-color:                    $accordion-color !default;
+$accordion-icon-color:                    $accordion-button-color !default;
 $accordion-icon-active-color:             $accordion-button-active-color !default;
 $accordion-icon-transition:               transform .2s ease-in-out !default;
 $accordion-icon-transform:                rotate(-180deg) !default;
-- 
cgit v1.2.3


From e208774fc1b301b96e65997dd0fca92c94ac20fb Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Mon, 26 Jul 2021 10:45:10 -0500
Subject: Clean up a couple CSS Grid issues (#34572)

- Moves the make-cssgrid() mixin to the grid mixins stylesheet
- Updates the g-start-* classes to start at 1 instead of 0 as 0 is an invalid value (fixes #34399)

Co-authored-by: XhmikosR <xhmikosr@gmail.com>
---
 scss/_grid.scss        | 23 -----------------------
 scss/mixins/_grid.scss | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 23 deletions(-)

(limited to 'scss')

diff --git a/scss/_grid.scss b/scss/_grid.scss
index 13f21a3ff..27fd55847 100644
--- a/scss/_grid.scss
+++ b/scss/_grid.scss
@@ -12,29 +12,6 @@
   }
 }
 
-@mixin make-cssgrid($columns: $grid-columns, $breakpoints: $grid-breakpoints) {
-  @each $breakpoint in map-keys($breakpoints) {
-    $infix: breakpoint-infix($breakpoint, $breakpoints);
-
-    @include media-breakpoint-up($breakpoint, $breakpoints) {
-      @if $columns > 0 {
-        @for $i from 1 through $columns {
-          .g-col#{$infix}-#{$i} {
-            grid-column: auto / span $i;
-          }
-        }
-
-        // `$columns - 1` because offsetting by the width of an entire row isn't possible
-        @for $i from 0 through ($columns - 1) {
-          .g-start#{$infix}-#{$i} {
-            grid-column-start: $i;
-          }
-        }
-      }
-    }
-  }
-}
-
 @if $enable-cssgrid {
   .grid {
     display: grid;
diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index ff6941c46..41760ef4e 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -130,3 +130,27 @@
     }
   }
 }
+
+@mixin make-cssgrid($columns: $grid-columns, $breakpoints: $grid-breakpoints) {
+  @each $breakpoint in map-keys($breakpoints) {
+    $infix: breakpoint-infix($breakpoint, $breakpoints);
+
+    @include media-breakpoint-up($breakpoint, $breakpoints) {
+      @if $columns > 0 {
+        @for $i from 1 through $columns {
+          .g-col#{$infix}-#{$i} {
+            grid-column: auto / span $i;
+          }
+        }
+
+        // Start with `1` because `0` is and invalid value.
+        // Ends with `$columns - 1` because offsetting by the width of an entire row isn't possible.
+        @for $i from 1 through ($columns - 1) {
+          .g-start#{$infix}-#{$i} {
+            grid-column-start: $i;
+          }
+        }
+      }
+    }
+  }
+}
-- 
cgit v1.2.3


From 85364745831ba5513ee7e940fe571cb4268810b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Poupard?= <ffoodd@users.noreply.github.com>
Date: Tue, 27 Jul 2021 06:48:08 +0200
Subject: More concise improvements for `add()` and `subtract()` (#34432)

---
 scss/_functions.scss | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'scss')

diff --git a/scss/_functions.scss b/scss/_functions.scss
index f8e43702d..1f3263175 100644
--- a/scss/_functions.scss
+++ b/scss/_functions.scss
@@ -191,14 +191,6 @@ $_luminance-list: .0008 .001 .0011 .0013 .0015 .0017 .002 .0022 .0025 .0027 .003
     @return $value1 + $value2;
   }
 
-  @if type-of($value1) != number {
-    $value1: unquote("(") + $value1 + unquote(")");
-  }
-
-  @if type-of($value2) != number {
-    $value2: unquote("(") + $value2 + unquote(")");
-  }
-
   @return if($return-calc == true, calc(#{$value1} + #{$value2}), $value1 + unquote(" + ") + $value2);
 }
 
@@ -219,10 +211,6 @@ $_luminance-list: .0008 .001 .0011 .0013 .0015 .0017 .002 .0022 .0025 .0027 .003
     @return $value1 - $value2;
   }
 
-  @if type-of($value1) != number {
-    $value1: unquote("(") + $value1 + unquote(")");
-  }
-
   @if type-of($value2) != number {
     $value2: unquote("(") + $value2 + unquote(")");
   }
-- 
cgit v1.2.3


From fd9285bc9cdbfbf85ad9d7a1dc5a8acb81f162ea Mon Sep 17 00:00:00 2001
From: Andrew Pucci <andrewpucci@users.noreply.github.com>
Date: Wed, 28 Jul 2021 09:00:10 -0400
Subject: Make text decoration consistent with other anchors (#34475)

Fixes #34474

Co-authored-by: XhmikosR <xhmikosr@gmail.com>
---
 scss/_card.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/_card.scss b/scss/_card.scss
index ed74c82bf..22890f5c9 100644
--- a/scss/_card.scss
+++ b/scss/_card.scss
@@ -66,7 +66,7 @@
 
 .card-link {
   &:hover {
-    text-decoration: none;
+    text-decoration: if($link-hover-decoration == underline, none, null);
   }
 
   + .card-link {
-- 
cgit v1.2.3


From 906a990eb711808fd20d78c95272dbd02332be97 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Wed, 28 Jul 2021 21:29:46 -0600
Subject: Revert "Allow individual grid classes to override `.row-cols`
 (#33621)" (#34612)

This reverts commit f2b47e1c8a263f4406255991af9fd55984c22a0e.
---
 scss/mixins/_grid.scss | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'scss')

diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index 41760ef4e..59cc56376 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -66,8 +66,8 @@
 
 @mixin make-grid-columns($columns: $grid-columns, $gutter: $grid-gutter-width, $breakpoints: $grid-breakpoints) {
   @each $breakpoint in map-keys($breakpoints) {
-    // .row-cols defaults must all appear before .col overrides so they can be overridden.
     $infix: breakpoint-infix($breakpoint, $breakpoints);
+
     @include media-breakpoint-up($breakpoint, $breakpoints) {
       // Provide basic `.col-{bp}` classes for equal-width flexbox columns
       .col#{$infix} {
@@ -85,13 +85,7 @@
           }
         }
       }
-    }
-  }
 
-  @each $breakpoint in map-keys($breakpoints) {
-    $infix: breakpoint-infix($breakpoint, $breakpoints);
-
-    @include media-breakpoint-up($breakpoint, $breakpoints) {
       .col#{$infix}-auto {
         @include make-col-auto();
       }
-- 
cgit v1.2.3


From f64df40dfa21283992d395dbe3115fdad98fe463 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Tue, 3 Aug 2021 08:27:49 -0700
Subject: Update input-bg to use body-bg (#34651)

---
 scss/_variables.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/_variables.scss b/scss/_variables.scss
index 1caaed6a0..b6aa1b1e9 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -814,7 +814,7 @@ $input-padding-y-lg:                    $input-btn-padding-y-lg !default;
 $input-padding-x-lg:                    $input-btn-padding-x-lg !default;
 $input-font-size-lg:                    $input-btn-font-size-lg !default;
 
-$input-bg:                              $white !default;
+$input-bg:                              $body-bg !default;
 $input-disabled-bg:                     $gray-200 !default;
 $input-disabled-border-color:           null !default;
 
-- 
cgit v1.2.3


From 39b7c75b13dd982e1a4f106f412ff18acc0026ec Mon Sep 17 00:00:00 2001
From: Jaume Sala <jaumesala@gmail.com>
Date: Tue, 3 Aug 2021 17:59:00 +0200
Subject: Add new placeholder component (#31859)

Co-authored-by: XhmikosR <xhmikosr@gmail.com>
Co-authored-by: Jaume Sala <jaumesala@gmail.com>
Co-authored-by: Mark Otto <markdotto@gmail.com>
Co-authored-by: Patrick H. Lauke <redux@splintered.co.uk>
---
 scss/_placeholders.scss | 51 +++++++++++++++++++++++++++++++++++++++++++++++++
 scss/_variables.scss    |  7 +++++++
 scss/bootstrap.scss     |  1 +
 3 files changed, 59 insertions(+)
 create mode 100644 scss/_placeholders.scss

(limited to 'scss')

diff --git a/scss/_placeholders.scss b/scss/_placeholders.scss
new file mode 100644
index 000000000..2f647cc9b
--- /dev/null
+++ b/scss/_placeholders.scss
@@ -0,0 +1,51 @@
+.placeholder {
+  display: inline-block;
+  min-height: 1em;
+  vertical-align: middle;
+  cursor: wait;
+  background-color: currentColor;
+  opacity: $placeholder-opacity-max;
+
+  &.btn::before {
+    display: inline-block;
+    content: "";
+  }
+}
+
+// Sizing
+.placeholder-xs {
+  min-height: .6em;
+}
+
+.placeholder-sm {
+  min-height: .8em;
+}
+
+.placeholder-lg {
+  min-height: 1.2em;
+}
+
+// Animation
+.placeholder-glow {
+  .placeholder {
+    animation: placeholder-glow 2s ease-in-out infinite;
+  }
+}
+
+@keyframes placeholder-glow {
+  50% {
+    opacity: $placeholder-opacity-min;
+  }
+}
+
+.placeholder-wave {
+  mask-image: linear-gradient(130deg, $black 55%, rgba(0, 0, 0, (1 - $placeholder-opacity-min)) 75%, $black 95%);
+  mask-size: 200% 100%;
+  animation: placeholder-wave 2s linear infinite;
+}
+
+@keyframes placeholder-wave {
+  100% {
+    mask-position: -200% 0%;
+  }
+}
diff --git a/scss/_variables.scss b/scss/_variables.scss
index b6aa1b1e9..9e921c07e 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -1203,6 +1203,13 @@ $pagination-border-radius-lg:       $border-radius-lg !default;
 // scss-docs-end pagination-variables
 
 
+// Placeholders
+
+// scss-docs-start placeholders
+$placeholder-opacity-max:           .5 !default;
+$placeholder-opacity-min:           .2 !default;
+// scss-docs-end placeholders
+
 // Cards
 
 // scss-docs-start card-variables
diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss
index eb047a3f2..f051c59a9 100644
--- a/scss/bootstrap.scss
+++ b/scss/bootstrap.scss
@@ -43,6 +43,7 @@
 @import "carousel";
 @import "spinners";
 @import "offcanvas";
+@import "placeholders";
 
 // Helpers
 @import "helpers";
-- 
cgit v1.2.3


From e72916e5b741b07b94b12b3707129e868811bdbb Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Mon, 24 May 2021 11:56:19 -0700
Subject: Update color and background-color utilities

- Adds new functions to generate additional Sass maps
- Adds new root variables for rgb() versions of our theme colors, plus a few extras
- Adds ability to change the alpha transparency of text color and background color utilities with new utilities, inline styles, or local CSS var
- Updates documentation for color and background-color utilities pages
- Deprecates .text-black-50 and .text-white-50 since those (and additional transparency levels) can be generated on the fly

Change approach slightly to prevent cascade
---
 scss/_functions.scss        | 35 +++++++++++++++++++++++++++++++++++
 scss/_root.scss             |  8 ++++++++
 scss/_utilities.scss        | 39 +++++++++++++++++++++++++++++++--------
 scss/_variables.scss        | 26 ++++++++++++++++++++++++++
 scss/mixins/_utilities.scss | 33 +++++++++++++++++++++++++++------
 5 files changed, 127 insertions(+), 14 deletions(-)

(limited to 'scss')

diff --git a/scss/_functions.scss b/scss/_functions.scss
index 1f3263175..e00395505 100644
--- a/scss/_functions.scss
+++ b/scss/_functions.scss
@@ -32,6 +32,41 @@
   }
 }
 
+// Colors
+@function to-rgb($value) {
+  @return red($value), green($value), blue($value);
+}
+
+@function rgba-css-var($identifier, $target) {
+  @return rgba(var(--#{$variable-prefix}#{$identifier}-rgb), var(--#{$variable-prefix}#{$target}-opacity));
+}
+
+// stylelint-disable scss/dollar-variable-pattern
+@function map-loop($map, $func, $args...) {
+  $_map: ();
+
+  @each $key, $value in $map {
+    // allow to pass the $key and $value of the map as an function argument
+    $_args: ();
+    @each $arg in $args {
+      $_args: append($_args, if($arg == "$key", $key, if($arg == "$value", $value, $arg)));
+    }
+
+    $_map: map-merge($_map, ($key: call(get-function($func), $_args...)));
+  }
+
+  @return $_map;
+}
+// stylelint-enable scss/dollar-variable-pattern
+
+@function varify($list) {
+  $result: null;
+  @each $entry in $list {
+    $result: append($result, var(--#{$variable-prefix}#{$entry}), space);
+  }
+  @return $result;
+}
+
 // Internal Bootstrap function to turn maps into its negative variant.
 // It prefixes the keys with `n` and makes the value negative.
 @function negativify-map($map) {
diff --git a/scss/_root.scss b/scss/_root.scss
index 768d6343f..95c773901 100644
--- a/scss/_root.scss
+++ b/scss/_root.scss
@@ -8,6 +8,14 @@
     --#{$variable-prefix}#{$color}: #{$value};
   }
 
+  @each $color, $value in $theme-colors-rgb {
+    --#{$variable-prefix}#{$color}-rgb: #{$value};
+  }
+
+  --#{$variable-prefix}white-rgb: #{to-rgb($white)};
+  --#{$variable-prefix}black-rgb: #{to-rgb($black)};
+  --#{$variable-prefix}body-rgb: #{to-rgb($body-color)};
+
   // Use `inspect` for lists so that quoted items keep the quotes.
   // See https://github.com/sass/sass/issues/2383#issuecomment-336349172
   --#{$variable-prefix}font-sans-serif: #{inspect($font-family-sans-serif)};
diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 74f8a3a01..960d6f1ad 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -514,32 +514,55 @@ $utilities: map-merge(
     "color": (
       property: color,
       class: text,
+      local-vars: (
+        "text-opacity": 1
+      ),
       values: map-merge(
-        $theme-colors,
+        $utilities-text-colors,
         (
-          "white": $white,
-          "body": $body-color,
           "muted": $text-muted,
-          "black-50": rgba($black, .5),
-          "white-50": rgba($white, .5),
+          "black-50": rgba($black, .5), // deprecated
+          "white-50": rgba($white, .5), // deprecated
           "reset": inherit,
         )
       )
     ),
+    "text-opacity": (
+      css-var: true,
+      class: text-opacity,
+      values: (
+        25: .25,
+        50: .5,
+        75: .75,
+        100: 1
+      )
+    ),
     // scss-docs-end utils-color
     // scss-docs-start utils-bg-color
     "background-color": (
       property: background-color,
       class: bg,
+      local-vars: (
+        "bg-opacity": 1
+      ),
       values: map-merge(
-        $theme-colors,
+        $utilities-bg-colors,
         (
-          "body": $body-bg,
-          "white": $white,
           "transparent": transparent
         )
       )
     ),
+    "bg-opacity": (
+      css-var: true,
+      class: bg-opacity,
+      values: (
+        10: .1,
+        25: .25,
+        50: .5,
+        75: .75,
+        100: 1
+      )
+    ),
     // scss-docs-end utils-bg-color
     "gradient": (
       property: background-image,
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 9e921c07e..3750fa2c2 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -90,6 +90,10 @@ $theme-colors: (
 ) !default;
 // scss-docs-end theme-colors-map
 
+// scss-docs-start theme-colors-rgb
+$theme-colors-rgb: map-loop($theme-colors, to-rgb, "$value") !default;
+// scss-docs-end theme-colors-rgb
+
 // The contrast ratio to reach against white, to determine if color changes from "light" to "dark". Acceptable values for WCAG 2.0 are 3, 4.5 and 7.
 // See https://www.w3.org/TR/WCAG20/#visual-audio-contrast-contrast
 $min-contrast-ratio:   4.5 !default;
@@ -401,6 +405,28 @@ $body-bg:                   $white !default;
 $body-color:                $gray-900 !default;
 $body-text-align:           null !default;
 
+// Utilities maps
+//
+// Extends the default `$theme-colors` maps to help create our utilities.
+
+// scss-docs-start utilities-colors
+$utilities-colors: map-merge(
+  $theme-colors-rgb,
+  (
+    "black": to-rgb($black),
+    "white": to-rgb($white),
+    "body":  to-rgb($body-color)
+  )
+) !default;
+// scss-docs-end utilities-colors
+
+// scss-docs-start utilities-text-colors
+$utilities-text-colors: map-loop($utilities-colors, rgba-css-var, "$key", "text") !default;
+// scss-docs-end utilities-text-colors
+
+// scss-docs-start utilities-bg-colors
+$utilities-bg-colors: map-loop($utilities-colors, rgba-css-var, "$key", "bg") !default;
+// scss-docs-end utilities-bg-colors
 
 // Links
 //
diff --git a/scss/mixins/_utilities.scss b/scss/mixins/_utilities.scss
index 4d2370a0b..e871b4233 100644
--- a/scss/mixins/_utilities.scss
+++ b/scss/mixins/_utilities.scss
@@ -41,25 +41,46 @@
       }
     }
 
+    $is-css-var: map-get($utility, css-var);
+    $is-local-vars: map-get($utility, local-vars);
     $is-rtl: map-get($utility, rtl);
 
     @if $value != null {
       @if $is-rtl == false {
         /* rtl:begin:remove */
       }
-      .#{$property-class + $infix + $property-class-modifier} {
-        @each $property in $properties {
-          #{$property}: $value if($enable-important-utilities, !important, null);
+
+      @if $is-css-var {
+        .#{$property-class + $infix + $property-class-modifier} {
+          --#{$variable-prefix}#{$property-class}: #{$value};
         }
-      }
 
-      @each $pseudo in $state {
-        .#{$property-class + $infix + $property-class-modifier}-#{$pseudo}:#{$pseudo} {
+        @each $pseudo in $state {
+          .#{$property-class + $infix + $property-class-modifier}-#{$pseudo}:#{$pseudo} {
+            --#{$variable-prefix}#{$property-class}: #{$value};
+          }
+        }
+      } @else {
+        .#{$property-class + $infix + $property-class-modifier} {
           @each $property in $properties {
+            @if $is-local-vars {
+              @each $local-var, $value in $is-local-vars {
+                --#{$variable-prefix}#{$local-var}: #{$value};
+              }
+            }
             #{$property}: $value if($enable-important-utilities, !important, null);
           }
         }
+
+        @each $pseudo in $state {
+          .#{$property-class + $infix + $property-class-modifier}-#{$pseudo}:#{$pseudo} {
+            @each $property in $properties {
+              #{$property}: $value if($enable-important-utilities, !important, null);
+            }
+          }
+        }
       }
+
       @if $is-rtl == false {
         /* rtl:end:remove */
       }
-- 
cgit v1.2.3


From 4d7911a27bf9591c1f4dee53fe0b1f053646d0fd Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sun, 18 Jul 2021 20:38:30 -0700
Subject: Add and document additional :root CSS variables

- Adds grayscale colors
- Adds root and body variables

Note that some Sass variables default to `null`, so as we generate and use the CSS variable, we'll be potentially adding some lines of code.
---
 scss/_reboot.scss | 20 ++++++++++++--------
 scss/_root.scss   | 33 +++++++++++++++++++++++++++++++--
 2 files changed, 43 insertions(+), 10 deletions(-)

(limited to 'scss')

diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index 352046988..80bfffb6e 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -26,7 +26,9 @@
 // null by default, thus nothing is generated.
 
 :root {
-  font-size: $font-size-root;
+  @if $font-size-root != null {
+    font-size: var(--#{$variable-prefix}-root-font-size);
+  }
 
   @if $enable-smooth-scroll {
     @media (prefers-reduced-motion: no-preference) {
@@ -43,18 +45,20 @@
 // 3. Prevent adjustments of font size after orientation changes in iOS.
 // 4. Change the default tap highlight to be completely transparent in iOS.
 
+// scss-docs-start reboot-body-rules
 body {
   margin: 0; // 1
-  font-family: $font-family-base;
-  @include font-size($font-size-base);
-  font-weight: $font-weight-base;
-  line-height: $line-height-base;
-  color: $body-color;
-  text-align: $body-text-align;
-  background-color: $body-bg; // 2
+  font-family: var(--#{$variable-prefix}body-font-family);
+  @include font-size(var(--#{$variable-prefix}body-font-size));
+  font-weight: var(--#{$variable-prefix}body-font-weight);
+  line-height: var(--#{$variable-prefix}body-line-height);
+  color: var(--#{$variable-prefix}body-color);
+  text-align: var(--#{$variable-prefix}body-text-align);
+  background-color: var(--#{$variable-prefix}body-bg); // 2
   -webkit-text-size-adjust: 100%; // 3
   -webkit-tap-highlight-color: rgba($black, 0); // 4
 }
+// scss-docs-end reboot-body-rules
 
 
 // Content grouping
diff --git a/scss/_root.scss b/scss/_root.scss
index 95c773901..189b2b3bb 100644
--- a/scss/_root.scss
+++ b/scss/_root.scss
@@ -1,9 +1,18 @@
 :root {
-  // Custom variable values only support SassScript inside `#{}`.
+  // Note: Custom variable values only support SassScript inside `#{}`.
+
+  // Colors
+  //
+  // Generate palettes for full colors, grays, and theme colors.
+
   @each $color, $value in $colors {
     --#{$variable-prefix}#{$color}: #{$value};
   }
 
+  @each $color, $value in $grays {
+    --#{$variable-prefix}gray-#{$color}: #{$value};
+  }
+
   @each $color, $value in $theme-colors {
     --#{$variable-prefix}#{$color}: #{$value};
   }
@@ -16,9 +25,29 @@
   --#{$variable-prefix}black-rgb: #{to-rgb($black)};
   --#{$variable-prefix}body-rgb: #{to-rgb($body-color)};
 
-  // Use `inspect` for lists so that quoted items keep the quotes.
+  // Fonts
+
+  // Note: Use `inspect` for lists so that quoted items keep the quotes.
   // See https://github.com/sass/sass/issues/2383#issuecomment-336349172
   --#{$variable-prefix}font-sans-serif: #{inspect($font-family-sans-serif)};
   --#{$variable-prefix}font-monospace: #{inspect($font-family-monospace)};
   --#{$variable-prefix}gradient: #{$gradient};
+
+  // Root and body
+  // stylelint-disable custom-property-empty-line-before
+  // scss-docs-start root-body-variables
+  @if $font-size-root != null {
+    --#{$variable-prefix}root-font-size: #{$font-size-root};
+  }
+  --#{$variable-prefix}body-font-family: #{$font-family-base};
+  --#{$variable-prefix}body-font-size: #{$font-size-base};
+  --#{$variable-prefix}body-font-weight: #{$font-weight-base};
+  --#{$variable-prefix}body-line-height: #{$line-height-base};
+  --#{$variable-prefix}body-color: #{$body-color};
+  @if $body-text-align != null {
+    --#{$variable-prefix}body-text-align: #{$body-text-align};
+  }
+  --#{$variable-prefix}body-bg: #{$body-bg};
+  // scss-docs-end root-body-variables
+  // stylelint-enable custom-property-empty-line-before
 }
-- 
cgit v1.2.3


From 7fcc2f4d526ff774a0a7de6b624a607e5ba47fb9 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Wed, 4 Aug 2021 17:49:34 +0300
Subject: _navbar.scss: switch comment (#34677)

---
 scss/_navbar.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index a395ede65..001dfc988 100644
--- a/scss/_navbar.scss
+++ b/scss/_navbar.scss
@@ -203,7 +203,7 @@
           bottom: 0;
           z-index: 1000;
           flex-grow: 1;
-          visibility: visible !important; /* stylelint-disable-line declaration-no-important */
+          visibility: visible !important; // stylelint-disable-line declaration-no-important
           background-color: transparent;
           border-right: 0;
           border-left: 0;
-- 
cgit v1.2.3


From f20fece3a8cdd0e76a42c2737524b7652bf54d26 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Wed, 4 Aug 2021 18:41:51 +0300
Subject: Prepare v5.1.0. (#34674)

---
 scss/bootstrap-grid.scss      | 2 +-
 scss/bootstrap-reboot.scss    | 2 +-
 scss/bootstrap-utilities.scss | 2 +-
 scss/bootstrap.scss           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'scss')

diff --git a/scss/bootstrap-grid.scss b/scss/bootstrap-grid.scss
index bcd8c19cf..2c68fbbf7 100644
--- a/scss/bootstrap-grid.scss
+++ b/scss/bootstrap-grid.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Grid v5.0.2 (https://getbootstrap.com/)
+ * Bootstrap Grid v5.1.0 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
diff --git a/scss/bootstrap-reboot.scss b/scss/bootstrap-reboot.scss
index 72444f6c1..0c4bbe589 100644
--- a/scss/bootstrap-reboot.scss
+++ b/scss/bootstrap-reboot.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Reboot v5.0.2 (https://getbootstrap.com/)
+ * Bootstrap Reboot v5.1.0 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
diff --git a/scss/bootstrap-utilities.scss b/scss/bootstrap-utilities.scss
index ab2d0e701..297e825fa 100644
--- a/scss/bootstrap-utilities.scss
+++ b/scss/bootstrap-utilities.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Utilities v5.0.2 (https://getbootstrap.com/)
+ * Bootstrap Utilities v5.1.0 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss
index f051c59a9..e42b4b457 100644
--- a/scss/bootstrap.scss
+++ b/scss/bootstrap.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v5.0.2 (https://getbootstrap.com/)
+ * Bootstrap v5.1.0 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
-- 
cgit v1.2.3


From f4fd27118fb2b384968068f66361f020a0996a1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Semih=20Raif=20G=C3=BCrel?= <semihraifgurel@icloud.com>
Date: Thu, 5 Aug 2021 08:39:04 +0300
Subject: Fix font size variable name (#34679)

Co-authored-by: XhmikosR <xhmikosr@gmail.com>
---
 scss/_reboot.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index 80bfffb6e..79fedc6ca 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -27,7 +27,7 @@
 
 :root {
   @if $font-size-root != null {
-    font-size: var(--#{$variable-prefix}-root-font-size);
+    font-size: var(--#{$variable-prefix}root-font-size);
   }
 
   @if $enable-smooth-scroll {
-- 
cgit v1.2.3


From 612d235faf3515dacceb19df04f1d32b9ef62c55 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Tue, 10 Aug 2021 07:16:48 -0700
Subject: Add check to rgba-css-var function for body or bg (#34699)

---
 scss/_functions.scss | 10 ++++++++--
 scss/_root.scss      |  3 ++-
 scss/_variables.scss | 26 ++++++++++++++++++--------
 3 files changed, 28 insertions(+), 11 deletions(-)

(limited to 'scss')

diff --git a/scss/_functions.scss b/scss/_functions.scss
index e00395505..30539b393 100644
--- a/scss/_functions.scss
+++ b/scss/_functions.scss
@@ -37,11 +37,17 @@
   @return red($value), green($value), blue($value);
 }
 
+// stylelint-disable scss/dollar-variable-pattern
 @function rgba-css-var($identifier, $target) {
-  @return rgba(var(--#{$variable-prefix}#{$identifier}-rgb), var(--#{$variable-prefix}#{$target}-opacity));
+  @if $identifier == "body" and $target == "bg" {
+    @return rgba(var(--#{$variable-prefix}#{$identifier}-bg-rgb), var(--#{$variable-prefix}#{$target}-opacity));
+  } @if $identifier == "body" and $target == "text" {
+    @return rgba(var(--#{$variable-prefix}#{$identifier}-color-rgb), var(--#{$variable-prefix}#{$target}-opacity));
+  } @else {
+    @return rgba(var(--#{$variable-prefix}#{$identifier}-rgb), var(--#{$variable-prefix}#{$target}-opacity));
+  }
 }
 
-// stylelint-disable scss/dollar-variable-pattern
 @function map-loop($map, $func, $args...) {
   $_map: ();
 
diff --git a/scss/_root.scss b/scss/_root.scss
index 189b2b3bb..5e138e97b 100644
--- a/scss/_root.scss
+++ b/scss/_root.scss
@@ -23,7 +23,8 @@
 
   --#{$variable-prefix}white-rgb: #{to-rgb($white)};
   --#{$variable-prefix}black-rgb: #{to-rgb($black)};
-  --#{$variable-prefix}body-rgb: #{to-rgb($body-color)};
+  --#{$variable-prefix}body-color-rgb: #{to-rgb($body-color)};
+  --#{$variable-prefix}body-bg-rgb: #{to-rgb($body-bg)};
 
   // Fonts
 
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 3750fa2c2..1700f9941 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -409,23 +409,33 @@ $body-text-align:           null !default;
 //
 // Extends the default `$theme-colors` maps to help create our utilities.
 
+// Come v6, we'll de-dupe these variables. Until then, for backward compatibility, we keep them to reassign.
 // scss-docs-start utilities-colors
-$utilities-colors: map-merge(
-  $theme-colors-rgb,
+$utilities-colors: $theme-colors-rgb !default;
+// scss-docs-end utilities-colors
+
+// scss-docs-start utilities-text-colors
+$utilities-text: map-merge(
+  $utilities-colors,
   (
     "black": to-rgb($black),
     "white": to-rgb($white),
-    "body":  to-rgb($body-color)
+    "body": to-rgb($body-color)
   )
 ) !default;
-// scss-docs-end utilities-colors
-
-// scss-docs-start utilities-text-colors
-$utilities-text-colors: map-loop($utilities-colors, rgba-css-var, "$key", "text") !default;
+$utilities-text-colors: map-loop($utilities-text, rgba-css-var, "$key", "text") !default;
 // scss-docs-end utilities-text-colors
 
 // scss-docs-start utilities-bg-colors
-$utilities-bg-colors: map-loop($utilities-colors, rgba-css-var, "$key", "bg") !default;
+$utilities-bg: map-merge(
+  $utilities-colors,
+  (
+    "black": to-rgb($black),
+    "white": to-rgb($white),
+    "body": to-rgb($body-bg)
+  )
+) !default;
+$utilities-bg-colors: map-loop($utilities-bg, rgba-css-var, "$key", "bg") !default;
 // scss-docs-end utilities-bg-colors
 
 // Links
-- 
cgit v1.2.3