From 8d613846d3b06f27417b8403a1f6a64edc56eefb Mon Sep 17 00:00:00 2001
From: Jeremy Thomas <bbxdesign@gmail.com>
Date: Sat, 15 Aug 2020 16:47:59 +0100
Subject: [PATCH] Fix box and navbar shadows

---
 sass/components/navbar.sass | 15 +++++++++------
 sass/elements/box.sass      | 12 +++++++++---
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/sass/components/navbar.sass b/sass/components/navbar.sass
index 9ccc1c3b..a0fe1ef3 100644
--- a/sass/components/navbar.sass
+++ b/sass/components/navbar.sass
@@ -6,6 +6,7 @@ $navbar-padding-vertical: 1rem !default
 $navbar-padding-horizontal: 2rem !default
 $navbar-z: 30 !default
 $navbar-fixed-z: 30 !default
+$navbar-shadow-color: rgba(var(--scheme-invert-rgb, #{bulmaToRGB($black)}), 0.1) !default
 
 $navbar-item-color: $text !default
 $navbar-item-hover-color: $link !default
@@ -32,7 +33,9 @@ $navbar-dropdown-radius: $radius-large !default
 $navbar-dropdown-z: 20 !default
 
 $navbar-dropdown-boxed-radius: $radius-large !default
-$navbar-dropdown-boxed-shadow: 0 8px 8px bulmaRgba(#{$scheme-invert-rgb}, 0.1,), 0 0 0 1px bulmaRgba(#{$scheme-invert-rgb}, 0.1,) !default
+$navbar-dropdown-boxed-shadow-color: rgba(var(--scheme-invert-rgb, #{bulmaToRGB($black)}), 0.1) !default
+$navbar-dropdown-boxed-shadow-color-bis: rgba(var(--scheme-invert-rgb, #{bulmaToRGB($black)}), 0.1) !default
+$navbar-dropdown-boxed-shadow: 0 8px 8px $navbar-dropdown-boxed-shadow-color, 0 0 0 1px $navbar-dropdown-boxed-shadow-color-bis !default
 
 $navbar-dropdown-item-hover-color: $scheme-invert !default
 $navbar-dropdown-item-hover-background-color: $background !default
@@ -244,7 +247,7 @@ a.navbar-item,
       display: none
   .navbar-menu
     background-color: $navbar-background-color
-    box-shadow: 0 8px 16px rgba(var(--scheme-invert-rgb), 0.1)
+    box-shadow: 0 8px 16px $navbar-shadow-color
     padding: 0.5rem 0
     &.is-active
       display: block
@@ -256,7 +259,7 @@ a.navbar-item,
     &.is-fixed-bottom-touch
       bottom: 0
       &.has-shadow
-        box-shadow: 0 -2px 3px rgba(var(--scheme-invert-rgb), 0.1)
+        box-shadow: 0 -2px 3px $navbar-shadow-color
     &.is-fixed-top-touch
       top: 0
     &.is-fixed-top,
@@ -329,7 +332,7 @@ a.navbar-item,
         border-radius: $navbar-dropdown-radius $navbar-dropdown-radius 0 0
         border-top: none
         bottom: 100%
-        box-shadow: 0 -8px 8px rgba(var(--scheme-invert-rgb), 0.1)
+        box-shadow: 0 -8px 8px $navbar-shadow-color
         top: auto
     &.is-active,
     &.is-hoverable:focus,
@@ -356,7 +359,7 @@ a.navbar-item,
     border-bottom-left-radius: $navbar-dropdown-radius
     border-bottom-right-radius: $navbar-dropdown-radius
     border-top: $navbar-dropdown-border-top
-    box-shadow: 0 8px 8px rgba(var(--scheme-invert-rgb), 0.1)
+    box-shadow: 0 8px 8px $navbar-shadow-color
     display: none
     font-size: 0.875rem
     +ltr-position(0, false)
@@ -407,7 +410,7 @@ a.navbar-item,
     &.is-fixed-bottom-desktop
       bottom: 0
       &.has-shadow
-        box-shadow: 0 -2px 3px rgba(var(--scheme-invert-rgb), 0.1)
+        box-shadow: 0 -2px 3px $navbar-shadow-color
     &.is-fixed-top-desktop
       top: 0
   html,
diff --git a/sass/elements/box.sass b/sass/elements/box.sass
index 1adfd4a7..4fd593ba 100644
--- a/sass/elements/box.sass
+++ b/sass/elements/box.sass
@@ -1,11 +1,17 @@
 $box-color: var(--text, #{$text}) !default
 $box-background-color: var(--scheme-main, #{$scheme-main}) !default
 $box-radius: var(--radius-large, #{$radius-large}) !default
-$box-shadow: 0 0.5em 1em -0.125em rgba($scheme-invert, 0.1), 0 0px 0 1px rgba($scheme-invert, 0.02) !default
+$box-shadow-color: rgba(var(--scheme-invert-rgb, #{bulmaToRGB($black)}), 0.1) !default
+$box-shadow-color-bis: rgba(var(--scheme-invert-rgb, #{bulmaToRGB($black)}), 0.02) !default
+$box-shadow: 0 0.5em 1em -0.125em $box-shadow-color, 0 0px 0 1px $box-shadow-color-bis !default
 $box-padding: 1.25rem !default
 
-$box-link-hover-shadow: 0 0.5em 1em -0.125em rgba($scheme-invert, 0.1), 0 0 0 1px $link !default
-$box-link-active-shadow: inset 0 1px 2px rgba($scheme-invert, 0.2), 0 0 0 1px $link !default
+$box-link-hover-shadow-color: rgba(var(--scheme-invert-rgb, #{bulmaToRGB($black)}), 0.1) !default
+$box-link-hover-shadow-color-bis: var(--link, #{$link}) !default
+$box-link-hover-shadow: 0 0.5em 1em -0.125em $box-link-hover-shadow-color, 0 0 0 1px $box-link-hover-shadow-color-bis !default
+$box-link-active-shadow-color: rgba(var(--scheme-invert-rgb, #{bulmaToRGB($black)}), 0.2) !default
+$box-link-active-shadow-color-bis: var(--link, #{$link}) !default
+$box-link-active-shadow: inset 0 1px 2px $box-link-active-shadow-color, 0 0 0 1px $box-link-active-shadow-color-bis !default
 
 .box
   --box-background-color: #{$box-background-color}