Merge remote-tracking branch 'origin/master'

scss/bootstrap/_navbar.scss

@@ -4,8 +4,10 @@
 
   .nav-link {
     white-space: nowrap;
+  }
 
-    &:hover {
+  &.navbar-dark {
+    .nav-link:hover {
       color: #fff;
     }
   }

scss/bootstrap/_variables.scss

@@ -20,6 +20,24 @@ $warning: $orange !default;
 // Options
 $enable-shadows: true !default;
 
+// Spacing
+$spacer: 1rem !default;
+$spacers: (
+        0: 0,
+        1: $spacer * .25,
+        2: $spacer * .5,
+        3: $spacer,
+        4: $spacer * 1.5,
+        45: $spacer * 2,
+        5: $spacer * 3,
+        6: $spacer * 4,
+        7: $spacer * 5,
+        8: $spacer * 6,
+        9: $spacer * 7,
+        10: $spacer * 8,
+        11: $spacer * 9,
+) !default;
+
 // Links
 $link-hover-decoration: none !default;
 

scss/vendors/_prismjs.scss

@@ -33,7 +33,6 @@ pre {
     padding: 0;
     color: #fff;
     background: $prism-bg;
-
   }
 }