From 89187718c41fe24ecade16f4d9ac593992ace1cc Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Thu, 24 Jun 2021 21:34:01 -0700
Subject: [PATCH] Fix z-indexes for modals and offcanvases

This jostles a couple things, but for some reason we had the modal and offcanvas z-indexes interwoven. That's problematic, so this shifts the modal backdrop to be 5 less than the modal. The same applies to the offcanvas now, with offcanvas being _under_ modals and it's backdrop's z-index being 5 under.
---
 scss/_offcanvas.scss | 2 +-
 scss/_variables.scss | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/scss/_offcanvas.scss b/scss/_offcanvas.scss
index e6072b9c0..a089c2a08 100644
--- a/scss/_offcanvas.scss
+++ b/scss/_offcanvas.scss
@@ -15,7 +15,7 @@
 }
 
 .offcanvas-backdrop {
-  @include overlay-backdrop(subtract($zindex-offcanvas, 1), $offcanvas-backdrop-bg, $offcanvas-backdrop-opacity);
+  @include overlay-backdrop($zindex-offcanvas-backdrop, $offcanvas-backdrop-bg, $offcanvas-backdrop-opacity);
 }
 
 .offcanvas-header {
diff --git a/scss/_variables.scss b/scss/_variables.scss
index d8a65193e..455f942c8 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -907,8 +907,9 @@ $form-validation-states: (
 $zindex-dropdown:                   1000 !default;
 $zindex-sticky:                     1020 !default;
 $zindex-fixed:                      1030 !default;
-$zindex-modal-backdrop:             1040 !default;
+$zindex-offcanvas-backdrop:         1045 !default;
 $zindex-offcanvas:                  1050 !default;
+$zindex-modal-backdrop:             1055 !default;
 $zindex-modal:                      1060 !default;
 $zindex-popover:                    1070 !default;
 $zindex-tooltip:                    1080 !default;