From 1c260efb34dcef928df60c9aa7b13a75681c7453 Mon Sep 17 00:00:00 2001
From: IanDelMar <42134098+IanDelMar@users.noreply.github.com>
Date: Thu, 6 Oct 2022 15:03:53 +0200
Subject: [PATCH] copy bootstrap assets

---
 src/sass/assets/bootstrap5/_buttons.scss               | 10 ++++++++--
 src/sass/assets/bootstrap5/_toasts.scss                |  2 ++
 src/sass/assets/bootstrap5/_variables.scss             |  2 +-
 src/sass/assets/bootstrap5/mixins/_banner.scss         |  2 +-
 src/sass/assets/bootstrap5/mixins/_table-variants.scss |  4 ++--
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/sass/assets/bootstrap5/_buttons.scss b/src/sass/assets/bootstrap5/_buttons.scss
index c2d07735..f2c4c13a 100644
--- a/src/sass/assets/bootstrap5/_buttons.scss
+++ b/src/sass/assets/bootstrap5/_buttons.scss
@@ -40,14 +40,20 @@
   @include box-shadow(var(--#{$prefix}btn-box-shadow));
   @include transition($btn-transition);
 
-  :not(.btn-check) + &:hover,
-  &:first-child:hover {
+  &:hover {
     color: var(--#{$prefix}btn-hover-color);
     text-decoration: if($link-hover-decoration == underline, none, null);
     background-color: var(--#{$prefix}btn-hover-bg);
     border-color: var(--#{$prefix}btn-hover-border-color);
   }
 
+  .btn-check + &:hover {
+    // override for the checkbox/radio buttons
+    color: var(--#{$prefix}btn-color);
+    background-color: var(--#{$prefix}btn-bg);
+    border-color: var(--#{$prefix}btn-border-color);
+  }
+
   &:focus-visible {
     color: var(--#{$prefix}btn-hover-color);
     @include gradient-bg(var(--#{$prefix}btn-hover-bg));
diff --git a/src/sass/assets/bootstrap5/_toasts.scss b/src/sass/assets/bootstrap5/_toasts.scss
index c34e49b2..2ce378d5 100644
--- a/src/sass/assets/bootstrap5/_toasts.scss
+++ b/src/sass/assets/bootstrap5/_toasts.scss
@@ -38,6 +38,8 @@
 }
 
 .toast-container {
+  --#{$prefix}toast-zindex: #{$zindex-toast};
+
   position: absolute;
   z-index: var(--#{$prefix}toast-zindex);
   width: max-content;
diff --git a/src/sass/assets/bootstrap5/_variables.scss b/src/sass/assets/bootstrap5/_variables.scss
index 07ce922f..e0218365 100644
--- a/src/sass/assets/bootstrap5/_variables.scss
+++ b/src/sass/assets/bootstrap5/_variables.scss
@@ -1256,7 +1256,7 @@ $card-group-margin:                 $grid-gutter-width * .5 !default;
 // scss-docs-start accordion-variables
 $accordion-padding-y:                     1rem !default;
 $accordion-padding-x:                     1.25rem !default;
-$accordion-color:                         var(--#{$prefix}body-color) !default;
+$accordion-color:                         $body-color !default; // Sass variable because of $accordion-button-icon
 $accordion-bg:                            $body-bg !default;
 $accordion-border-width:                  $border-width !default;
 $accordion-border-color:                  var(--#{$prefix}border-color) !default;
diff --git a/src/sass/assets/bootstrap5/mixins/_banner.scss b/src/sass/assets/bootstrap5/mixins/_banner.scss
index 8b859abb..8dacb037 100644
--- a/src/sass/assets/bootstrap5/mixins/_banner.scss
+++ b/src/sass/assets/bootstrap5/mixins/_banner.scss
@@ -1,6 +1,6 @@
 @mixin bsBanner($file) {
   /*!
-   * Bootstrap #{$file} v5.2.1 (https://getbootstrap.com/)
+   * Bootstrap #{$file} v5.2.2 (https://getbootstrap.com/)
    * Copyright 2011-2022 The Bootstrap Authors
    * Copyright 2011-2022 Twitter, Inc.
    * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
diff --git a/src/sass/assets/bootstrap5/mixins/_table-variants.scss b/src/sass/assets/bootstrap5/mixins/_table-variants.scss
index ae43ec63..5fe1b9b2 100644
--- a/src/sass/assets/bootstrap5/mixins/_table-variants.scss
+++ b/src/sass/assets/bootstrap5/mixins/_table-variants.scss
@@ -5,11 +5,11 @@
     $hover-bg: mix($color, $background, percentage($table-hover-bg-factor));
     $striped-bg: mix($color, $background, percentage($table-striped-bg-factor));
     $active-bg: mix($color, $background, percentage($table-active-bg-factor));
-    $border-color: mix($color, $background, percentage($table-border-factor));
+    $table-border-color: mix($color, $background, percentage($table-border-factor));
 
     --#{$prefix}table-color: #{$color};
     --#{$prefix}table-bg: #{$background};
-    --#{$prefix}table-border-color: #{$border-color};
+    --#{$prefix}table-border-color: #{$table-border-color};
     --#{$prefix}table-striped-bg: #{$striped-bg};
     --#{$prefix}table-striped-color: #{color-contrast($striped-bg)};
     --#{$prefix}table-active-bg: #{$active-bg};