Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev

2 files changed, 15 insertions, 15 deletions

diff --git a/assets/scss/_buttons.scss b/assets/scss/_buttons.scss
index 82027459f..9be5f3cfe 100644
--- a/assets/scss/_buttons.scss
+++ b/assets/scss/_buttons.scss
@@ -2,7 +2,7 @@
 //
 // Custom buttons for the docs.
 
-.btn-bd-purple {
+.btn-bd-primary {
   font-weight: 500;
   color: $bd-purple-bright;
   border-color: $bd-purple-bright;
@@ -15,15 +15,15 @@
   }
 }
 
-.btn-bd-yellow {
+.btn-bd-download {
   font-weight: 500;
-  color: $bd-yellow;
-  border-color: $bd-yellow;
+  color: $bd-download;
+  border-color: $bd-download;
 
   &:hover,
   &:active {
-    color: $bd-graphite;
-    background-color: $bd-yellow;
-    border-color: $bd-yellow;
+    color: $bd-dark;
+    background-color: $bd-download;
+    border-color: $bd-download;
   }
 }
diff --git a/assets/scss/_variables.scss b/assets/scss/_variables.scss
index e3aed2e82..b60a21368 100644
--- a/assets/scss/_variables.scss
+++ b/assets/scss/_variables.scss
@@ -1,9 +1,9 @@
 // Local docs variables
-$bd-purple:          #563d7c;
-$bd-purple-bright:   lighten(saturate($bd-purple, 5%), 15%);
-$bd-purple-light:    #cdbfe3;
-$bd-graphite:        #2a2730;
-$bd-yellow:          #ffe484;
-$bd-danger:          #d9534f;
-$bd-warning:         #f0ad4e;
-$bd-info:            #5bc0de;
+$bd-purple:        #563d7c !default;
+$bd-purple-bright: lighten(saturate($bd-purple, 5%), 15%) !default;
+$bd-purple-light:  lighten(saturate($bd-purple, 5%), 45%) !default;
+$bd-dark:          #2a2730 !default;
+$bd-download:      #ffe484 !default;
+$bd-info:          #5bc0de !default;
+$bd-warning:       #f0ad4e !default;
+$bd-danger:        #d9534f !default;