rake update[v4-dev]

2 files changed, 12 insertions, 9 deletions

diff --git a/assets/javascripts/bootstrap-sprockets.js b/assets/javascripts/bootstrap-sprockets.js
index aa18064..2a56362 100644
--- a/assets/javascripts/bootstrap-sprockets.js
+++ b/assets/javascripts/bootstrap-sprockets.js
@@ -1,11 +1,11 @@
 //= require ./bootstrap/util
-//= require ./bootstrap/tab
-//= require ./bootstrap/collapse
-//= require ./bootstrap/alert
 //= require ./bootstrap/tooltip
 //= require ./bootstrap/popover
 //= require ./bootstrap/dropdown
 //= require ./bootstrap/button
+//= require ./bootstrap/collapse
+//= require ./bootstrap/tab
 //= require ./bootstrap/scrollspy
-//= require ./bootstrap/modal
 //= require ./bootstrap/carousel
+//= require ./bootstrap/modal
+//= require ./bootstrap/alert
diff --git a/assets/stylesheets/bootstrap/_root.scss b/assets/stylesheets/bootstrap/_root.scss
index 78ac039..ad550df 100644
--- a/assets/stylesheets/bootstrap/_root.scss
+++ b/assets/stylesheets/bootstrap/_root.scss
@@ -1,16 +1,19 @@
 :root {
+  // Custom variable values only support SassScript inside `#{}`.
   @each $color, $value in $colors {
-    --#{$color}: $value;
+    --#{$color}: #{$value};
   }
 
   @each $color, $value in $theme-colors {
-    --#{$color}: $value;
+    --#{$color}: #{$value};
   }
 
   @each $bp, $value in $grid-breakpoints {
-    --breakpoint-#{$bp}: $value;
+    --breakpoint-#{$bp}: #{$value};
   }
 
-  --font-family-sans-serif: $font-family-sans-serif;
-  --font-family-monospace: $font-family-monospace;
+  // Use `inspect` for lists so that quoted items keep the quotes.
+  // See https://github.com/sass/sass/issues/2383#issuecomment-336349172
+  --font-family-sans-serif: #{inspect($font-family-sans-serif)};
+  --font-family-monospace: #{inspect($font-family-monospace)};
 }