From dec3ea6a7f18e9127a771492e55ad2b94ab03e2a Mon Sep 17 00:00:00 2001
From: Catalin Zalog <c@zalog.ro>
Date: Sat, 28 Mar 2020 22:01:37 +0200
Subject: Order sizes variables (#30479)

---
 scss/_variables.scss | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'scss')

diff --git a/scss/_variables.scss b/scss/_variables.scss
index 21b497784..31ca7f71a 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -320,13 +320,13 @@ $border-width:                1px !default;
 $border-color:                $gray-300 !default;
 
 $border-radius:               .25rem !default;
-$border-radius-lg:            .3rem !default;
 $border-radius-sm:            .2rem !default;
+$border-radius-lg:            .3rem !default;
 
 $rounded-pill:                50rem !default;
 
-$box-shadow-sm:               0 .125rem .25rem rgba($black, .075) !default;
 $box-shadow:                  0 .5rem 1rem rgba($black, .15) !default;
+$box-shadow-sm:               0 .125rem .25rem rgba($black, .075) !default;
 $box-shadow-lg:               0 1rem 3rem rgba($black, .175) !default;
 $box-shadow-inset:            inset 0 1px 2px rgba($black, .075) !default;
 
@@ -374,8 +374,8 @@ $font-family-base:            $font-family-sans-serif !default;
 // $font-size-base effects 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-lg:                $font-size-base * 1.25 !default;
 $font-size-sm:                $font-size-base * .875 !default;
+$font-size-lg:                $font-size-base * 1.25 !default;
 
 $font-weight-lighter:         lighter !default;
 $font-weight-light:           300 !default;
@@ -386,8 +386,8 @@ $font-weight-bolder:          bolder !default;
 $font-weight-base:            $font-weight-normal !default;
 
 $line-height-base:            1.5 !default;
-$line-height-lg:              2 !default;
 $line-height-sm:              1.25 !default;
+$line-height-lg:              2 !default;
 
 $h1-font-size:                $font-size-base * 2.5 !default;
 $h2-font-size:                $font-size-base * 2 !default;
@@ -549,8 +549,8 @@ $btn-block-spacing-y:         .5rem !default;
 
 // Allows for customizing button radius independently from global border radius
 $btn-border-radius:           $border-radius !default;
-$btn-border-radius-lg:        $border-radius-lg !default;
 $btn-border-radius-sm:        $border-radius-sm !default;
+$btn-border-radius-lg:        $border-radius-lg !default;
 
 $btn-transition:              color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out !default;
 
@@ -584,8 +584,8 @@ $input-border-width:                    $input-btn-border-width !default;
 $input-box-shadow:                      $box-shadow-inset !default;
 
 $input-border-radius:                   $border-radius !default;
-$input-border-radius-lg:                $border-radius-lg !default;
 $input-border-radius-sm:                $border-radius-sm !default;
+$input-border-radius-lg:                $border-radius-lg !default;
 
 $input-focus-bg:                        $input-bg !default;
 $input-focus-border-color:              lighten($component-active-bg, 25%) !default;
@@ -1055,10 +1055,10 @@ $modal-header-padding-y:            1rem !default;
 $modal-header-padding-x:            1rem !default;
 $modal-header-padding:              $modal-header-padding-y $modal-header-padding-x !default; // Keep this for backwards compatibility
 
-$modal-xl:                          1140px !default;
-$modal-lg:                          800px !default;
-$modal-md:                          500px !default;
 $modal-sm:                          300px !default;
+$modal-md:                          500px !default;
+$modal-lg:                          800px !default;
+$modal-xl:                          1140px !default;
 
 $modal-fade-transform:              translate(0, -50px) !default;
 $modal-show-transform:              none !default;
-- 
cgit v1.2.3


From 841412626633a89b8ba7910a683b7e0830fd4d2d Mon Sep 17 00:00:00 2001
From: Martijn Cuppens <martijn.cuppens@gmail.com>
Date: Mon, 30 Mar 2020 15:12:36 +0200
Subject: Switch to custom properties to control grid gutter widths (#30475)

---
 scss/_grid.scss        | 34 ----------------------------------
 scss/mixins/_grid.scss | 27 +++++++++++++++++++++++----
 2 files changed, 23 insertions(+), 38 deletions(-)

(limited to 'scss')

diff --git a/scss/_grid.scss b/scss/_grid.scss
index e4e3c9796..5686f31fe 100644
--- a/scss/_grid.scss
+++ b/scss/_grid.scss
@@ -12,40 +12,6 @@
   }
 }
 
-// Gutters
-//
-// Make use of `.g-*`, `.gx-*` or `.gy-*` utilities to change spacing between the columns.
-
-@if $enable-grid-classes {
-  @each $breakpoint in map-keys($grid-breakpoints) {
-    $infix: breakpoint-infix($breakpoint, $grid-breakpoints);
-
-    @include media-breakpoint-up($breakpoint, $grid-breakpoints) {
-
-      @each $key, $value in $gutters {
-        .g#{$infix}-#{$key},
-        .gx#{$infix}-#{$key} {
-          margin-right: -$value / 2;
-          margin-left: -$value / 2;
-
-          > * {
-            padding-right: $value / 2;
-            padding-left: $value / 2;
-          }
-        }
-
-        .g#{$infix}-#{$key},
-        .gy#{$infix}-#{$key} {
-          margin-top: -$value;
-
-          > * {
-            margin-top: $value;
-          }
-        }
-      }
-    }
-  }
-}
 
 // Columns
 //
diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index 35283207d..aba7dcb58 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -3,10 +3,13 @@
 // Generate semantic grid columns with these mixins.
 
 @mixin make-row($gutter: $grid-gutter-width) {
+  --grid-gutter-x: #{$gutter};
+  --grid-gutter-y: 0;
   display: flex;
   flex-wrap: wrap;
-  margin-right: -$gutter / 2;
-  margin-left: -$gutter / 2;
+  margin-top: calc(var(--grid-gutter-y) * -1); // stylelint-disable-line function-blacklist
+  margin-right: calc(var(--grid-gutter-x) / -2); // stylelint-disable-line function-blacklist
+  margin-left: calc(var(--grid-gutter-x) / -2); // stylelint-disable-line function-blacklist
 }
 
 @mixin make-col-ready($gutter: $grid-gutter-width) {
@@ -18,8 +21,9 @@
   flex-shrink: 0;
   width: 100%;
   max-width: 100%; // Prevent `.col-auto`, `.col` (& responsive variants) from breaking out the grid
-  padding-right: $gutter / 2;
-  padding-left: $gutter / 2;
+  padding-right: calc(var(--grid-gutter-x) / 2); // stylelint-disable-line function-blacklist
+  padding-left: calc(var(--grid-gutter-x) / 2); // stylelint-disable-line function-blacklist
+  margin-top: var(--grid-gutter-y);
 }
 
 @mixin make-col($size, $columns: $grid-columns) {
@@ -93,6 +97,21 @@
           }
         }
       }
+
+      // Gutters
+      //
+      // Make use of `.g-*`, `.gx-*` or `.gy-*` utilities to change spacing between the columns.
+      @each $key, $value in $gutters {
+        .g#{$infix}-#{$key},
+        .gx#{$infix}-#{$key} {
+          --grid-gutter-x: #{$value};
+        }
+
+        .g#{$infix}-#{$key},
+        .gy#{$infix}-#{$key} {
+          --grid-gutter-y: #{$value};
+        }
+      }
     }
   }
 }
-- 
cgit v1.2.3


From 22a535641b9f2f7d3fce291ab446f1a73ae23557 Mon Sep 17 00:00:00 2001
From: Martijn Cuppens <martijn.cuppens@gmail.com>
Date: Tue, 31 Mar 2020 10:33:05 +0200
Subject: Cleanup responsive tables (#30482)

---
 scss/_tables.scss | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

(limited to 'scss')

diff --git a/scss/_tables.scss b/scss/_tables.scss
index cb5fc8421..253282c98 100644
--- a/scss/_tables.scss
+++ b/scss/_tables.scss
@@ -174,23 +174,14 @@
 // Generate series of `.table-responsive-*` classes for configuring the screen
 // size of where your table will overflow.
 
-.table-responsive {
-  @each $breakpoint in map-keys($grid-breakpoints) {
-    $next: breakpoint-next($breakpoint, $grid-breakpoints);
-    $infix: breakpoint-infix($next, $grid-breakpoints);
-
-    &#{$infix} {
-      @include media-breakpoint-down($breakpoint) {
-        display: block;
-        width: 100%;
-        overflow-x: auto;
-        -webkit-overflow-scrolling: touch;
-
-        // Prevent double border on horizontal scroll due to use of `display: block;`
-        > .table-bordered {
-          border: 0;
-        }
-      }
+@each $breakpoint in map-keys($grid-breakpoints) {
+  $next: breakpoint-next($breakpoint, $grid-breakpoints);
+  $infix: breakpoint-infix($next, $grid-breakpoints);
+
+  @include media-breakpoint-down($breakpoint) {
+    .table-responsive#{$infix} {
+      overflow-x: auto;
+      -webkit-overflow-scrolling: touch;
     }
   }
 }
-- 
cgit v1.2.3


From a1b5a64fba5435f387162825e920d98627aedff3 Mon Sep 17 00:00:00 2001
From: Yannik Hampe <github@ynk.cipher-code.de>
Date: Tue, 31 Mar 2020 14:51:50 +0200
Subject: Use variables for list-group-item color levels (#30009)

Co-authored-by: Martijn Cuppens <martijn.cuppens@gmail.com>
---
 scss/_list-group.scss | 2 +-
 scss/_variables.scss  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/_list-group.scss b/scss/_list-group.scss
index a7fa9f702..99ec43be8 100644
--- a/scss/_list-group.scss
+++ b/scss/_list-group.scss
@@ -157,5 +157,5 @@
 // Organizationally, this must come after the `:hover` states.
 
 @each $color, $value in $theme-colors {
-  @include list-group-item-variant($color, color-level($value, -9), color-level($value, 6));
+  @include list-group-item-variant($color, color-level($value, $list-group-item-bg-level), color-level($value, $list-group-item-color-level));
 }
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 31ca7f71a..9312c0be4 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -1105,6 +1105,8 @@ $list-group-border-radius:          $border-radius !default;
 
 $list-group-item-padding-y:         .75rem !default;
 $list-group-item-padding-x:         1.25rem !default;
+$list-group-item-bg-level:          -9 !default;
+$list-group-item-color-level:       6 !default;
 
 $list-group-hover-bg:               $gray-100 !default;
 $list-group-active-color:           $component-active-color !default;
-- 
cgit v1.2.3


From df707cd7272f9165dda895f08bdd15d093d96a25 Mon Sep 17 00:00:00 2001
From: Martijn Cuppens <martijn.cuppens@gmail.com>
Date: Tue, 31 Mar 2020 20:02:57 +0200
Subject: Require `.form-label` classes on form labels (#30476)

---
 scss/_button-group.scss      |  2 --
 scss/_list-group.scss        |  1 -
 scss/_reboot.scss            |  1 -
 scss/_variables.scss         |  6 +++++-
 scss/forms/_form-check.scss  |  1 -
 scss/forms/_input-group.scss |  1 -
 scss/forms/_labels.scss      | 13 ++++++++++++-
 7 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'scss')

diff --git a/scss/_button-group.scss b/scss/_button-group.scss
index e486d469d..e3d2e4cc4 100644
--- a/scss/_button-group.scss
+++ b/scss/_button-group.scss
@@ -149,8 +149,6 @@
 .btn-group-toggle {
   > .btn,
   > .btn-group > .btn {
-    margin-bottom: 0; // Override default `<label>` value
-
     input[type="radio"],
     input[type="checkbox"] {
       position: absolute;
diff --git a/scss/_list-group.scss b/scss/_list-group.scss
index 99ec43be8..fe97ce526 100644
--- a/scss/_list-group.scss
+++ b/scss/_list-group.scss
@@ -46,7 +46,6 @@
   position: relative;
   display: block;
   padding: $list-group-item-padding-y $list-group-item-padding-x;
-  margin-bottom: 0; // for <label> variations
   color: $list-group-color;
   text-decoration: if($link-decoration == none, null, none);
   background-color: $list-group-bg;
diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index cf48352d2..d3d487189 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -381,7 +381,6 @@ th {
 
 label {
   display: inline-block; // 1
-  margin-bottom: $label-margin-bottom;
 }
 
 // Remove the default `border-radius` that macOS Chrome adds.
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 9312c0be4..638945eb2 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -557,7 +557,11 @@ $btn-transition:              color .15s ease-in-out, background-color .15s ease
 
 // Forms
 
-$label-margin-bottom:                   .5rem !default;
+$form-label-margin-bottom:              .5rem !default;
+$form-label-font-size:                  null !default;
+$form-label-font-style:                 null !default;
+$form-label-font-weight:                null !default;
+$form-label-color:                      null !default;
 
 $input-padding-y:                       $input-btn-padding-y !default;
 $input-padding-x:                       $input-btn-padding-x !default;
diff --git a/scss/forms/_form-check.scss b/scss/forms/_form-check.scss
index 03ae57385..3666b6ab4 100644
--- a/scss/forms/_form-check.scss
+++ b/scss/forms/_form-check.scss
@@ -99,7 +99,6 @@
 }
 
 .form-check-label {
-  margin-bottom: 0;
   color: $form-check-label-color;
   cursor: $form-check-label-cursor;
 }
diff --git a/scss/forms/_input-group.scss b/scss/forms/_input-group.scss
index 878cb83d6..c8e86cebe 100644
--- a/scss/forms/_input-group.scss
+++ b/scss/forms/_input-group.scss
@@ -63,7 +63,6 @@
   display: flex;
   align-items: center;
   padding: $input-padding-y $input-padding-x;
-  margin-bottom: 0; // Allow use of <label> elements by overriding our default margin-bottom
   @include font-size($input-font-size); // Match inputs
   font-weight: $font-weight-normal;
   line-height: $input-line-height;
diff --git a/scss/forms/_labels.scss b/scss/forms/_labels.scss
index a3184b7d7..39ecafcd2 100644
--- a/scss/forms/_labels.scss
+++ b/scss/forms/_labels.scss
@@ -2,14 +2,25 @@
 // Labels
 //
 
+.form-label {
+  margin-bottom: $form-label-margin-bottom;
+  @include font-size($form-label-font-size);
+  font-style: $form-label-font-style;
+  font-weight: $form-label-font-weight;
+  color: $form-label-color;
+}
+
 // For use with horizontal and inline forms, when you need the label (or legend)
 // text to align with the form controls.
 .col-form-label {
   padding-top: add($input-padding-y, $input-border-width);
   padding-bottom: add($input-padding-y, $input-border-width);
-  margin-bottom: 0; // Override the `<label>/<legend>` default
+  margin-bottom: 0; // Override the `<legend>` default
   @include font-size(inherit); // Override the `<legend>` default
+  font-style: $form-label-font-style;
+  font-weight: $form-label-font-weight;
   line-height: $input-line-height;
+  color: $form-label-color;
 }
 
 .col-form-label-lg {
-- 
cgit v1.2.3


From 6dfe8e02d7d5e1cceaf5831bb07295ec7106d91c Mon Sep 17 00:00:00 2001
From: Martijn Cuppens <martijn.cuppens@gmail.com>
Date: Tue, 31 Mar 2020 20:42:38 +0200
Subject: Fix text decorations (#30492)

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

(limited to 'scss')

diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index c21d9fd73..129351d19 100644
--- a/scss/_navbar.scss
+++ b/scss/_navbar.scss
@@ -57,11 +57,12 @@
   padding-bottom: $navbar-brand-padding-y;
   margin-right: $navbar-brand-margin-right;
   @include font-size($navbar-brand-font-size);
+  text-decoration: if($link-decoration == none, null, none);
   white-space: nowrap;
 
   &:hover,
   &:focus {
-    text-decoration: none;
+    text-decoration: if($link-hover-decoration == underline, none, null);
   }
 }
 
-- 
cgit v1.2.3


From 6663faa3e7365e2d2caf49e38643f6b9d3245359 Mon Sep 17 00:00:00 2001
From: Martijn Cuppens <martijn.cuppens@gmail.com>
Date: Fri, 6 Mar 2020 17:22:27 +0100
Subject: Fix date inputs heights in safari

---
 scss/_reboot.scss             | 13 -------------
 scss/forms/_form-control.scss |  1 +
 2 files changed, 1 insertion(+), 13 deletions(-)

(limited to 'scss')

diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index d3d487189..488c0676d 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -466,19 +466,6 @@ button,
   border-style: none;
 }
 
-// Remove the default appearance of temporal inputs to avoid a Mobile Safari
-// bug where setting a custom line-height prevents text from being vertically
-// centered within the input.
-// See https://bugs.webkit.org/show_bug.cgi?id=139848
-// and https://github.com/twbs/bootstrap/issues/11266
-
-input[type="date"],
-input[type="time"],
-input[type="datetime-local"],
-input[type="month"] {
-  -webkit-appearance: textfield;
-}
-
 // 1. Textareas should really only resize vertically so they don't break their (horizontal) containers.
 
 textarea {
diff --git a/scss/forms/_form-control.scss b/scss/forms/_form-control.scss
index fb3142333..42456e3aa 100644
--- a/scss/forms/_form-control.scss
+++ b/scss/forms/_form-control.scss
@@ -15,6 +15,7 @@
   background-color: $input-bg;
   background-clip: padding-box;
   border: $input-border-width solid $input-border-color;
+  appearance: none; // Fix appearance for date inputs in Safari
 
   // Note: This has no effect on <select>s in some browsers, due to the limited stylability of `<select>`s in CSS.
   @include border-radius($input-border-radius, 0);
-- 
cgit v1.2.3


From 053d5d5e93ba995ba6fda88679f8298e3053d868 Mon Sep 17 00:00:00 2001
From: Shohei Yoshida <ysds.code@gmail.com>
Date: Wed, 1 Apr 2020 15:42:33 +0900
Subject: transition() mixin prevent redundant 'transition: none' and pass
 `null` (#30391)

* Prevent redundant 'none' for prefers-reduced-motion

* Output warning when use 'none' or 'null' with multiple arguments

* Fix for libsass(node-sass)
---
 scss/mixins/_transition.scss | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'scss')

diff --git a/scss/mixins/_transition.scss b/scss/mixins/_transition.scss
index 54983d736..54553deb9 100644
--- a/scss/mixins/_transition.scss
+++ b/scss/mixins/_transition.scss
@@ -1,13 +1,23 @@
 // stylelint-disable property-blacklist
 @mixin transition($transition...) {
+  @if length($transition) == 0 {
+    $transition: $transition-base;
+  }
+
+  @if length($transition) > 1 {
+    @each $value in $transition {
+      @if $value == null or $value == none {
+        @warn "The keyword 'none' or 'null' must be used as a single argument.";
+      }
+    }
+  }
+
   @if $enable-transitions {
-    @if length($transition) == 0 {
-      transition: $transition-base;
-    } @else {
+    @if nth($transition, 1) != null {
       transition: $transition;
     }
 
-    @if $enable-prefers-reduced-motion-media-query {
+    @if $enable-prefers-reduced-motion-media-query and nth($transition, 1) != null and nth($transition, 1) != none {
       @media (prefers-reduced-motion: reduce) {
         transition: none;
       }
-- 
cgit v1.2.3


From e138decdbb3597813c762995753db52abfbc76fb Mon Sep 17 00:00:00 2001
From: gsoti <gsotiropoulos@elearningindustry.com>
Date: Tue, 23 Apr 2019 17:03:59 +0300
Subject: Add Full-Screen size to Modal and Responsive variations for
 breakpoints (Works from breakpoint and down)

---
 scss/_mixins.scss       |  1 +
 scss/_modal.scss        | 16 ++++++++++++++++
 scss/mixins/_modal.scss | 14 ++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 scss/mixins/_modal.scss

(limited to 'scss')

diff --git a/scss/_mixins.scss b/scss/_mixins.scss
index 5a04655d5..9ace99c32 100644
--- a/scss/_mixins.scss
+++ b/scss/_mixins.scss
@@ -26,6 +26,7 @@
 @import "mixins/pagination";
 @import "mixins/lists";
 @import "mixins/list-group";
+@import "mixins/modal";
 @import "mixins/forms";
 @import "mixins/table-row";
 
diff --git a/scss/_modal.scss b/scss/_modal.scss
index ed6ab4eb1..b91848d8b 100644
--- a/scss/_modal.scss
+++ b/scss/_modal.scss
@@ -85,6 +85,7 @@
   flex-direction: column;
   width: 100%; // Ensure `.modal-content` extends the full width of the parent `.modal-dialog`
   // counteract the pointer-events: none; in the .modal-dialog
+  height: 100%;
   color: $modal-content-color;
   pointer-events: auto;
   background-color: $modal-content-bg;
@@ -142,6 +143,7 @@
   // when there should be a fixed height on `.modal-dialog`.
   flex: 1 1 auto;
   padding: $modal-inner-padding;
+  overflow-y: auto;
 }
 
 // Footer (for actions)
@@ -204,3 +206,17 @@
 @include media-breakpoint-up(xl) {
   .modal-xl { max-width: $modal-xl; }
 }
+
+.modal-fullscreen {
+  @include modalFullscreen();
+}
+
+@each $breakpoint in map-keys($grid-breakpoints) {
+  @include media-breakpoint-down($breakpoint) {
+    $infix: breakpoint-infix($breakpoint, $grid-breakpoints);
+
+    .modal-fullscreen#{$infix}-down {
+      @include modalFullscreen();
+    }
+  }
+}
diff --git a/scss/mixins/_modal.scss b/scss/mixins/_modal.scss
new file mode 100644
index 000000000..061fb6320
--- /dev/null
+++ b/scss/mixins/_modal.scss
@@ -0,0 +1,14 @@
+// Modal
+
+// Maximize modal to cover viewport
+@mixin modalFullscreen {
+  width: 100vw;
+  max-width: none;
+  height: 100vh;
+  margin: 0;
+
+  .modal-content {
+    border: 0;
+    @include border-radius(0);
+  }
+}
-- 
cgit v1.2.3


From 062002d9521e2d3d77e9880f8b151bbbf05ef085 Mon Sep 17 00:00:00 2001
From: ysds <ysds.code@gmail.com>
Date: Thu, 27 Feb 2020 17:30:06 +0200
Subject: Fix CSS and improve docs

---
 scss/_mixins.scss       |  1 -
 scss/_modal.scss        | 33 +++++++++++++++++++--------------
 scss/mixins/_modal.scss | 14 --------------
 3 files changed, 19 insertions(+), 29 deletions(-)
 delete mode 100644 scss/mixins/_modal.scss

(limited to 'scss')

diff --git a/scss/_mixins.scss b/scss/_mixins.scss
index 9ace99c32..5a04655d5 100644
--- a/scss/_mixins.scss
+++ b/scss/_mixins.scss
@@ -26,7 +26,6 @@
 @import "mixins/pagination";
 @import "mixins/lists";
 @import "mixins/list-group";
-@import "mixins/modal";
 @import "mixins/forms";
 @import "mixins/table-row";
 
diff --git a/scss/_modal.scss b/scss/_modal.scss
index b91848d8b..d898a6b0b 100644
--- a/scss/_modal.scss
+++ b/scss/_modal.scss
@@ -62,11 +62,6 @@
     overflow: hidden;
   }
 
-  .modal-header,
-  .modal-footer {
-    flex-shrink: 0;
-  }
-
   .modal-body {
     overflow-y: auto;
   }
@@ -116,6 +111,7 @@
 // Top section of the modal w/ title and dismiss
 .modal-header {
   display: flex;
+  flex-shrink: 0;
   align-items: flex-start; // so the close btn always stays on the upper right corner
   justify-content: space-between; // Put modal header elements (title and dismiss) on opposite ends
   padding: $modal-header-padding;
@@ -143,13 +139,13 @@
   // when there should be a fixed height on `.modal-dialog`.
   flex: 1 1 auto;
   padding: $modal-inner-padding;
-  overflow-y: auto;
 }
 
 // Footer (for actions)
 .modal-footer {
   display: flex;
   flex-wrap: wrap;
+  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;
@@ -207,16 +203,25 @@
   .modal-xl { max-width: $modal-xl; }
 }
 
-.modal-fullscreen {
-  @include modalFullscreen();
-}
-
 @each $breakpoint in map-keys($grid-breakpoints) {
-  @include media-breakpoint-down($breakpoint) {
-    $infix: breakpoint-infix($breakpoint, $grid-breakpoints);
+  $next-breakpoint: breakpoint-next($breakpoint);
+  $postfix: if(breakpoint-max($breakpoint, $grid-breakpoints) == null, "", "-#{$next-breakpoint}-down");
 
-    .modal-fullscreen#{$infix}-down {
-      @include modalFullscreen();
+  @include media-breakpoint-down($breakpoint) {
+    .modal-fullscreen#{$postfix} {
+      width: 100vw;
+      max-width: none;
+      height: 100%;
+      margin: 0;
+
+      .modal-content {
+        border: 0;
+        @include border-radius(0);
+      }
+
+      .modal-body {
+        overflow-y: auto;
+      }
     }
   }
 }
diff --git a/scss/mixins/_modal.scss b/scss/mixins/_modal.scss
deleted file mode 100644
index 061fb6320..000000000
--- a/scss/mixins/_modal.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-// Modal
-
-// Maximize modal to cover viewport
-@mixin modalFullscreen {
-  width: 100vw;
-  max-width: none;
-  height: 100vh;
-  margin: 0;
-
-  .modal-content {
-    border: 0;
-    @include border-radius(0);
-  }
-}
-- 
cgit v1.2.3


From 05fb3905e696484f1c7b70b1d2160f6dd9fb4601 Mon Sep 17 00:00:00 2001
From: Martijn Cuppens <martijn.cuppens@gmail.com>
Date: Thu, 27 Feb 2020 18:34:42 +0100
Subject: Fix border radii

---
 scss/_modal.scss | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/_modal.scss b/scss/_modal.scss
index d898a6b0b..49f27d304 100644
--- a/scss/_modal.scss
+++ b/scss/_modal.scss
@@ -80,7 +80,6 @@
   flex-direction: column;
   width: 100%; // Ensure `.modal-content` extends the full width of the parent `.modal-dialog`
   // counteract the pointer-events: none; in the .modal-dialog
-  height: 100%;
   color: $modal-content-color;
   pointer-events: auto;
   background-color: $modal-content-bg;
@@ -215,13 +214,22 @@
       margin: 0;
 
       .modal-content {
+        height: 100%;
         border: 0;
         @include border-radius(0);
       }
 
+      .modal-header {
+        @include border-radius(0);
+      }
+
       .modal-body {
         overflow-y: auto;
       }
+
+      .modal-footer {
+        @include border-radius(0);
+      }
     }
   }
 }
-- 
cgit v1.2.3


From 1cc1a476468d8106ef2954f959dc7b747159a353 Mon Sep 17 00:00:00 2001
From: Catalin Zalog <c@zalog.ro>
Date: Wed, 1 Apr 2020 20:44:22 +0300
Subject: Use `box-shadow` mixin for form controls (#30480)

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

(limited to 'scss')

diff --git a/scss/forms/_form-control.scss b/scss/forms/_form-control.scss
index 42456e3aa..6686ecfb8 100644
--- a/scss/forms/_form-control.scss
+++ b/scss/forms/_form-control.scss
@@ -29,10 +29,10 @@
     background-color: $input-focus-bg;
     border-color: $input-focus-border-color;
     outline: 0;
-    // Avoid using mixin so we can pass custom focus shadow properly
     @if $enable-shadows {
-      box-shadow: $input-box-shadow, $input-focus-box-shadow;
+      @include box-shadow($input-box-shadow, $input-focus-box-shadow);
     } @else {
+      // Avoid using mixin so we can pass custom focus shadow properly
       box-shadow: $input-focus-box-shadow;
     }
   }
-- 
cgit v1.2.3


From e8e6d64eb083b3086e8ea45ec70e02915a514b68 Mon Sep 17 00:00:00 2001
From: Martijn Cuppens <martijn.cuppens@gmail.com>
Date: Thu, 2 Apr 2020 07:10:11 +0200
Subject: Fix card list group borders & radii (#30497)

---
 scss/_card.scss       | 17 ++++++++++-------
 scss/_list-group.scss | 19 +++++++------------
 2 files changed, 17 insertions(+), 19 deletions(-)

(limited to 'scss')

diff --git a/scss/_card.scss b/scss/_card.scss
index 3099109b1..666092779 100644
--- a/scss/_card.scss
+++ b/scss/_card.scss
@@ -19,15 +19,18 @@
     margin-left: 0;
   }
 
-  > .list-group:first-child {
-    .list-group-item:first-child {
-      @include border-top-radius($card-border-radius);
+  > .list-group {
+    border-top: inherit;
+    border-bottom: inherit;
+
+    &:first-child {
+      border-top-width: 0;
+      @include border-top-radius($card-inner-border-radius);
     }
-  }
 
-  > .list-group:last-child {
-    .list-group-item:last-child {
-      @include border-bottom-radius($card-border-radius);
+    &:last-child  {
+      border-bottom-width: 0;
+      @include border-bottom-radius($card-inner-border-radius);
     }
   }
 }
diff --git a/scss/_list-group.scss b/scss/_list-group.scss
index fe97ce526..8513cdd9d 100644
--- a/scss/_list-group.scss
+++ b/scss/_list-group.scss
@@ -9,6 +9,7 @@
   // No need to set list-style: none; since .list-group-item is block level
   padding-left: 0; // reset padding because ul and ol
   margin-bottom: 0;
+  @include border-radius($list-group-border-radius);
 }
 
 
@@ -52,11 +53,11 @@
   border: $list-group-border-width solid $list-group-border-color;
 
   &:first-child {
-    @include border-top-radius($list-group-border-radius);
+    @include border-top-radius(inherit);
   }
 
   &:last-child {
-    @include border-bottom-radius($list-group-border-radius);
+    @include border-bottom-radius(inherit);
   }
 
   &.disabled,
@@ -132,18 +133,12 @@
 // useful within other components (e.g., cards).
 
 .list-group-flush {
-  .list-group-item {
-    border-right-width: 0;
-    border-left-width: 0;
-    @include border-radius(0);
+  @include border-radius(0);
 
-    &:first-child {
-      border-top-width: 0;
-    }
-  }
+  .list-group-item {
+    border-width: 0 0 $list-group-border-width;
 
-  &:last-child {
-    .list-group-item:last-child {
+    &:last-child {
       border-bottom-width: 0;
     }
   }
-- 
cgit v1.2.3


From a85d80c9259df7016ad305c0402df71a7850e89d Mon Sep 17 00:00:00 2001
From: Martijn Cuppens <martijn.cuppens@gmail.com>
Date: Mon, 6 Apr 2020 13:29:39 +0200
Subject: Add nav link transition (#29988)

---
 scss/_nav.scss       | 1 +
 scss/_variables.scss | 1 +
 2 files changed, 2 insertions(+)

(limited to 'scss')

diff --git a/scss/_nav.scss b/scss/_nav.scss
index 81eec4ed3..e71f6839e 100644
--- a/scss/_nav.scss
+++ b/scss/_nav.scss
@@ -15,6 +15,7 @@
   display: block;
   padding: $nav-link-padding-y $nav-link-padding-x;
   text-decoration: if($link-decoration == none, null, none);
+  @include transition($nav-link-transition);
 
   &:hover,
   &:focus {
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 638945eb2..66f7357b0 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -803,6 +803,7 @@ $zindex-tooltip:                    1070 !default;
 
 $nav-link-padding-y:                .5rem !default;
 $nav-link-padding-x:                1rem !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;
 
 $nav-tabs-border-color:             $gray-300 !default;
-- 
cgit v1.2.3


From 98ba40dc06a1fe93af299034432db352e75e9f64 Mon Sep 17 00:00:00 2001
From: Catalin Zalog <c@zalog.ro>
Date: Mon, 6 Apr 2020 15:59:29 +0300
Subject: Add `.card-footer` color (#30515)

---
 scss/_card.scss | 1 +
 1 file changed, 1 insertion(+)

(limited to 'scss')

diff --git a/scss/_card.scss b/scss/_card.scss
index 666092779..230ab113a 100644
--- a/scss/_card.scss
+++ b/scss/_card.scss
@@ -90,6 +90,7 @@
 
 .card-footer {
   padding: $card-cap-padding-y $card-cap-padding-x;
+  color: $card-cap-color;
   background-color: $card-cap-bg;
   border-top: $card-border-width solid $card-border-color;
 
-- 
cgit v1.2.3


From 83b49aa688e30f0d2af22110b94c7d8b3deffcf0 Mon Sep 17 00:00:00 2001
From: Martijn Cuppens <martijn.cuppens@gmail.com>
Date: Mon, 6 Apr 2020 20:13:35 +0200
Subject: =?UTF-8?q?Create=20`scss-docs`=20shortcode=20to=20get=20some=20sn?=
 =?UTF-8?q?ippets=20from=20the=20Scs=E2=80=A6=20(#30502)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: XhmikosR <xhmikosr@gmail.com>
---
 scss/_alert.scss            | 4 ++--
 scss/_dropdown.scss         | 2 ++
 scss/_functions.scss        | 2 ++
 scss/_list-group.scss       | 4 +++-
 scss/_variables.scss        | 4 ++++
 scss/forms/_validation.scss | 2 ++
 scss/mixins/_clearfix.scss  | 2 ++
 7 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'scss')

diff --git a/scss/_alert.scss b/scss/_alert.scss
index 45d621806..19157b298 100644
--- a/scss/_alert.scss
+++ b/scss/_alert.scss
@@ -40,8 +40,7 @@
 }
 
 
-// Alternate styles
-//
+// scss-docs-start alert-modifiers
 // Generate contextual modifier classes for colorizing the alert.
 
 @each $color, $value in $theme-colors {
@@ -49,3 +48,4 @@
     @include alert-variant(color-level($value, $alert-bg-level), color-level($value, $alert-border-level), color-level($value, $alert-color-level));
   }
 }
+// scss-docs-end alert-modifiers
diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
index 3290f22cb..b30f2ba7e 100644
--- a/scss/_dropdown.scss
+++ b/scss/_dropdown.scss
@@ -34,6 +34,7 @@
   @include box-shadow($dropdown-box-shadow);
 }
 
+// scss-docs-start responsive-breakpoints
 @each $breakpoint in map-keys($grid-breakpoints) {
   @include media-breakpoint-up($breakpoint) {
     $infix: breakpoint-infix($breakpoint, $grid-breakpoints);
@@ -49,6 +50,7 @@
     }
   }
 }
+// scss-docs-end responsive-breakpoints
 
 // Allow for dropdowns to go bottom up (aka, dropup-menu)
 // Just add .dropup after the standard .dropdown class and you're set.
diff --git a/scss/_functions.scss b/scss/_functions.scss
index 00179049c..49a460466 100644
--- a/scss/_functions.scss
+++ b/scss/_functions.scss
@@ -128,12 +128,14 @@ $_luminance-list: .0008 .001 .0011 .0013 .0015 .0017 .002 .0022 .0025 .0027 .003
 }
 
 // Request a color level
+// scss-docs-start color-level
 @function color-level($color: $primary, $level: 0) {
   $color-base: if($level > 0, $black, $white);
   $level: abs($level);
 
   @return mix($color-base, $color, $level * $theme-color-interval);
 }
+// scss-docs-end color-level
 
 @function tint-color($color, $level) {
   @return mix(white, $color, $level * $theme-color-interval);
diff --git a/scss/_list-group.scss b/scss/_list-group.scss
index 8513cdd9d..7378a14b8 100644
--- a/scss/_list-group.scss
+++ b/scss/_list-group.scss
@@ -145,7 +145,8 @@
 }
 
 
-// Contextual variants
+// scss-docs-start list-group-modifiers
+// List group contextual variants
 //
 // Add modifier classes to change text and background color on individual items.
 // Organizationally, this must come after the `:hover` states.
@@ -153,3 +154,4 @@
 @each $color, $value in $theme-colors {
   @include list-group-item-variant($color, color-level($value, $list-group-item-bg-level), color-level($value, $list-group-item-color-level));
 }
+// scss-docs-end list-group-modifiers
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 66f7357b0..6f9abfa38 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -341,6 +341,7 @@ $transition-base:             all .2s ease-in-out !default;
 $transition-fade:             opacity .15s linear !default;
 $transition-collapse:         height .35s ease !default;
 
+// scss-docs-start embed-responsive-aspect-ratios
 $embed-responsive-aspect-ratios: (
   "21by9": (
     x: 21,
@@ -359,6 +360,7 @@ $embed-responsive-aspect-ratios: (
     y: 1
   )
 ) !default;
+// scss-docs-end embed-responsive-aspect-ratios
 
 // Typography
 //
@@ -774,6 +776,7 @@ $form-feedback-icon-valid:          url("data:image/svg+xml,<svg xmlns='http://w
 $form-feedback-icon-invalid-color:  $form-feedback-invalid-color !default;
 $form-feedback-icon-invalid:        url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='#{$form-feedback-icon-invalid-color}' viewBox='0 0 12 12'><circle cx='6' cy='6' r='4.5'/><path stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/><circle cx='6' cy='8.2' r='.6' fill='#{$form-feedback-icon-invalid-color}' stroke='none'/></svg>") !default;
 
+// scss-docs-start form-validation-states
 $form-validation-states: (
   "valid": (
     "color": $form-feedback-valid-color,
@@ -784,6 +787,7 @@ $form-validation-states: (
     "icon": $form-feedback-icon-invalid
   )
 ) !default;
+// scss-docs-end form-validation-states
 
 // Z-index master list
 //
diff --git a/scss/forms/_validation.scss b/scss/forms/_validation.scss
index d15e20899..acd68f2ed 100644
--- a/scss/forms/_validation.scss
+++ b/scss/forms/_validation.scss
@@ -5,6 +5,8 @@
 // pseudo-classes but also includes `.is-invalid` and `.is-valid` classes for
 // server-side validation.
 
+// scss-docs-start form-validation-states-loop
 @each $state, $data in $form-validation-states {
   @include form-validation-state($state, map-get($data, color), map-get($data, icon));
 }
+// scss-docs-end form-validation-states-loop
diff --git a/scss/mixins/_clearfix.scss b/scss/mixins/_clearfix.scss
index 11a977b73..ffc62bb28 100644
--- a/scss/mixins/_clearfix.scss
+++ b/scss/mixins/_clearfix.scss
@@ -1,3 +1,4 @@
+// scss-docs-start clearfix
 @mixin clearfix() {
   &::after {
     display: block;
@@ -5,3 +6,4 @@
     content: "";
   }
 }
+// scss-docs-end clearfix
-- 
cgit v1.2.3


From 64050f43bc28106c697cedb4c9291ac6572b4d4e Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Wed, 8 Apr 2020 10:58:23 -0700
Subject: Fix spinner-grow animation (#30504)

* Fix spinner-grow animation

Safari seems to be interpreting the old keyframes animation as incomplete. Adding `transform` to the second frame seems to resolve the issue.

Co-Authored-By: Martijn Cuppens <martijn.cuppens@gmail.com>
---
 scss/_spinners.scss | 1 +
 1 file changed, 1 insertion(+)

(limited to 'scss')

diff --git a/scss/_spinners.scss b/scss/_spinners.scss
index ac4d4c31b..e8e4c044e 100644
--- a/scss/_spinners.scss
+++ b/scss/_spinners.scss
@@ -34,6 +34,7 @@
   }
   50% {
     opacity: 1;
+    transform: none;
   }
 }
 
-- 
cgit v1.2.3


From 5e65b12f1cea463464419224f82163fa6a3c7432 Mon Sep 17 00:00:00 2001
From: Martijn Cuppens <martijn.cuppens@gmail.com>
Date: Thu, 9 Apr 2020 08:07:11 +0200
Subject: Add checkbox transition (#30528)

---
 scss/_variables.scss        | 3 +--
 scss/forms/_form-check.scss | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'scss')

diff --git a/scss/_variables.scss b/scss/_variables.scss
index 6f9abfa38..ec1ba224d 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -621,6 +621,7 @@ $form-check-padding-left:                 $form-check-input-width + .5em !defaul
 $form-check-margin-bottom:                .125rem !default;
 $form-check-label-color:                  null !default;
 $form-check-label-cursor:                 null !default;
+$form-check-transition:                   background-color .15s ease-in-out, background-position .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out !default;
 
 $form-check-input-active-filter:          brightness(90%) !default;
 
@@ -654,8 +655,6 @@ $form-switch-padding-left:        $form-switch-width + .5em !default;
 $form-switch-bg-image:            url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'><circle r='3' fill='#{$form-switch-color}'/></svg>") !default;
 $form-switch-bg-size:             contain !default;
 $form-switch-border-radius:       $form-switch-width !default;
-$form-switch-transition:          .2s ease-in-out !default;
-$form-switch-transition-property: background-position, background-color !default;
 
 $form-switch-focus-color:         hsla(211, 100%, 75%, 1) !default;
 $form-switch-focus-bg-image:      url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'><circle r='3' fill='#{$form-switch-focus-color}'/></svg>") !default;
diff --git a/scss/forms/_form-check.scss b/scss/forms/_form-check.scss
index 3666b6ab4..572bd547e 100644
--- a/scss/forms/_form-check.scss
+++ b/scss/forms/_form-check.scss
@@ -23,6 +23,7 @@
   border: $form-check-input-border;
   appearance: none;
   color-adjust: exact; // Keep themed appearance for print
+  @include transition($form-check-transition);
 
   &[type="checkbox"] {
     @include border-radius($form-check-input-border-radius);
@@ -119,9 +120,6 @@
     background-size: $form-switch-bg-size; // Get a 1px separation
     @include border-radius($form-switch-border-radius);
     color-adjust: exact; // Keep themed appearance for print
-    // Todo: Figure out how to tackle these, with or without mixin?
-    // transition: $form-switch-transition;
-    // transition-property: $form-switch-transition-property;
 
     &:focus {
       background-image: escape-svg($form-switch-focus-bg-image);
-- 
cgit v1.2.3


From bcdd8fbc0767115c204325363dcfc008eb4db76f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Poupard?= <ffoodd@users.noreply.github.com>
Date: Fri, 10 Apr 2020 20:31:58 +0200
Subject: Use custom properties for font-stacks (#30509)

---
 scss/_reboot.scss    | 2 +-
 scss/_utilities.scss | 2 +-
 scss/_variables.scss | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'scss')

diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index 488c0676d..e7a1f2a11 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -283,7 +283,7 @@ pre,
 code,
 kbd,
 samp {
-  font-family: $font-family-monospace;
+  font-family: var(--font-family-monospace);
   @include font-size(1em); // Correct the odd `em` font sizing in all browsers.
 }
 
diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index a872c6bb9..c02eec7b3 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -441,7 +441,7 @@ $utilities: map-merge(
     "font-family": (
       property: font-family,
       class: font,
-      values: (monospace: $font-family-monospace)
+      values: (monospace: var(--font-family-monospace))
     ),
     "user-select": (
       property: user-select,
diff --git a/scss/_variables.scss b/scss/_variables.scss
index ec1ba224d..6123f3ce1 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -369,7 +369,7 @@ $embed-responsive-aspect-ratios: (
 // stylelint-disable value-keyword-case
 $font-family-sans-serif:      -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
 $font-family-monospace:       SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default;
-$font-family-base:            $font-family-sans-serif !default;
+$font-family-base:            var(--font-family-sans-serif) !default;
 // stylelint-enable value-keyword-case
 
 // $font-size-root effects the value of `rem`, which is used for as well font sizes, paddings and margins
-- 
cgit v1.2.3


From 939beea6201778abfd2b844277a1e0635a93723a Mon Sep 17 00:00:00 2001
From: Catalin Zalog <c@zalog.ro>
Date: Sat, 11 Apr 2020 14:27:01 +0300
Subject: Use `box-shadow` mixin for `.form-select` (#30555)

---
 scss/forms/_form-select.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/forms/_form-select.scss b/scss/forms/_form-select.scss
index 8c410c97b..e4cab0878 100644
--- a/scss/forms/_form-select.scss
+++ b/scss/forms/_form-select.scss
@@ -28,8 +28,9 @@
     border-color: $form-select-focus-border-color;
     outline: 0;
     @if $enable-shadows {
-      box-shadow: $form-select-box-shadow, $form-select-focus-box-shadow;
+      @include box-shadow($form-select-box-shadow, $form-select-focus-box-shadow);
     } @else {
+      // Avoid using mixin so we can pass custom focus shadow properly
       box-shadow: $form-select-focus-box-shadow;
     }
 
-- 
cgit v1.2.3


From 8cb60bf043cedfa260259ca87113a6e018625599 Mon Sep 17 00:00:00 2001
From: Catalin Zalog <c@zalog.ro>
Date: Sat, 11 Apr 2020 14:40:39 +0300
Subject: Use `box-shadow` mixin for `.btn` (#30512)

Co-authored-by: Martijn Cuppens <martijn.cuppens@gmail.com>
---
 scss/mixins/_buttons.scss | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'scss')

diff --git a/scss/mixins/_buttons.scss b/scss/mixins/_buttons.scss
index 53a337ba0..4bb9feb8a 100644
--- a/scss/mixins/_buttons.scss
+++ b/scss/mixins/_buttons.scss
@@ -30,10 +30,10 @@
     color: $hover-color;
     @include gradient-bg($hover-background);
     border-color: $hover-border;
-    // Avoid using mixin so we can pass custom focus shadow properly
     @if $enable-shadows {
-      box-shadow: $btn-box-shadow, 0 0 0 $btn-focus-width rgba(mix($color, $border, 15%), .5);
+      @include box-shadow($btn-box-shadow, 0 0 0 $btn-focus-width rgba(mix($color, $border, 15%), .5));
     } @else {
+      // Avoid using mixin so we can pass custom focus shadow properly
       box-shadow: 0 0 0 $btn-focus-width rgba(mix($color, $border, 15%), .5);
     }
   }
@@ -48,10 +48,10 @@
     border-color: $active-border;
 
     &:focus {
-      // Avoid using mixin so we can pass custom focus shadow properly
-      @if $enable-shadows and $btn-active-box-shadow != none {
-        box-shadow: $btn-active-box-shadow, 0 0 0 $btn-focus-width rgba(mix($color, $border, 15%), .5);
+      @if $enable-shadows {
+        @include box-shadow($btn-active-box-shadow, 0 0 0 $btn-focus-width rgba(mix($color, $border, 15%), .5));
       } @else {
+        // Avoid using mixin so we can pass custom focus shadow properly
         box-shadow: 0 0 0 $btn-focus-width rgba(mix($color, $border, 15%), .5);
       }
     }
@@ -96,10 +96,10 @@
     border-color: $active-border;
 
     &:focus {
-      // Avoid using mixin so we can pass custom focus shadow properly
-      @if $enable-shadows and $btn-active-box-shadow != none {
-        box-shadow: $btn-active-box-shadow, 0 0 0 $btn-focus-width rgba($color, .5);
+      @if $enable-shadows {
+        @include box-shadow($btn-active-box-shadow, 0 0 0 $btn-focus-width rgba($color, .5));
       } @else {
+        // Avoid using mixin so we can pass custom focus shadow properly
         box-shadow: 0 0 0 $btn-focus-width rgba($color, .5);
       }
     }
-- 
cgit v1.2.3