From 58f9c09bb80215adf7770806db754072eace11dc Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Mon, 26 Nov 2018 13:15:33 -0800
Subject: [PATCH] fix(scrollbars): use standard CSS for scrollbars (#697)

Also use correct SCSS escaping everywhere, and fix a missing semicolon. Fixes #691
---
 scss/themes/_scrollbars.scss | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/scss/themes/_scrollbars.scss b/scss/themes/_scrollbars.scss
index 8adcd7d..89391e8 100644
--- a/scss/themes/_scrollbars.scss
+++ b/scss/themes/_scrollbars.scss
@@ -1,6 +1,10 @@
 html {
-  scrollbar-face-color: $scrollbar-face;
-  scrollbar-track-color: $scrollbar-track;
+  // Firefox with scrollbar config changes as of 2018-11
+  scrollbar-face-color: #{$scrollbar-face};
+  scrollbar-track-color: #{$scrollbar-track};
+  // Firefox nightly as of 2018-11, new standard version
+  // https://developer.mozilla.org/en-US/docs/Web/CSS/scrollbar-color
+  scrollbar-color: #{$scrollbar-face $scrollbar-track};
 }
 
 ::-webkit-scrollbar {
@@ -9,22 +13,22 @@ html {
 }
 
 ::-webkit-scrollbar-thumb {
-  background: $scrollbar-face;
+  background: #{$scrollbar-face};
   border-radius: 0;
 }
 
 ::-webkit-scrollbar-thumb:hover {
-  background: $scrollbar-face-hover;
+  background: #{$scrollbar-face-hover};
 }
 
 ::-webkit-scrollbar-thumb:active {
-  background: $scrollbar-face-active;
+  background: #{$scrollbar-face-active};
 }
 
 ::-webkit-scrollbar-track, ::-webkit-scrollbar-track:hover, ::-webkit-scrollbar-track:active {
-  background: $scrollbar-track
+  background: #{$scrollbar-track};
 }
 
 ::-webkit-scrollbar-corner {
   background: transparent;
-}
\ No newline at end of file
+}