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

pvdlg · Mar 15, 2017 · f61fb70 · f61fb70
2 parents 7180b42 + 08984ac
commit f61fb70
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/scss/_buttons.scss b/scss/_buttons.scss
@@ -73,22 +73,22 @@ fieldset[disabled] a.btn {
 
 // Remove all backgrounds
 .btn-outline-primary {
-  @include button-outline-variant($btn-primary-bg);
+  @include button-outline-variant($btn-primary-bg, $btn-primary-color);
 }
 .btn-outline-secondary {
-  @include button-outline-variant($btn-secondary-border);
+  @include button-outline-variant($btn-secondary-border, $btn-secondary-color);
 }
 .btn-outline-info {
-  @include button-outline-variant($btn-info-bg);
+  @include button-outline-variant($btn-info-bg, $btn-info-color);
 }
 .btn-outline-success {
-  @include button-outline-variant($btn-success-bg);
+  @include button-outline-variant($btn-success-bg, $btn-success-color);
 }
 .btn-outline-warning {
-  @include button-outline-variant($btn-warning-bg);
+  @include button-outline-variant($btn-warning-bg, $btn-warning-color);
 }
 .btn-outline-danger {
-  @include button-outline-variant($btn-danger-bg);
+  @include button-outline-variant($btn-danger-bg, $btn-danger-color);
 }
 
 

diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
@@ -17,11 +17,6 @@
     border-right: $caret-width solid transparent;
     border-left: $caret-width solid transparent;
   }
-
-  // Prevent the focus on the dropdown toggle when closing dropdowns
-  &:focus {
-    outline: 0;
-  }
 }
 
 .dropup {