diff options
| author | Mark Otto <[email protected]> | 2017-03-14 20:00:39 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-03-14 20:00:39 -0700 |
| commit | f61fb70eb102608f2b6653c604cb4fed71588d60 (patch) | |
| tree | 33c022997c904adb2978fb6534462bf9bc44c56f /scss | |
| parent | 7180b42aa12b78852f9b98d6849d044173b9cc0c (diff) | |
| parent | 08984ac8cd09bf096a42aac5fd17aa6af79cfc5a (diff) | |
| download | bootstrap-f61fb70eb102608f2b6653c604cb4fed71588d60.tar.xz bootstrap-f61fb70eb102608f2b6653c604cb4fed71588d60.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_buttons.scss | 12 | ||||
| -rw-r--r-- | scss/_dropdown.scss | 5 |
2 files changed, 6 insertions, 11 deletions
diff --git a/scss/_buttons.scss b/scss/_buttons.scss index e36ff0f1f..2964a526d 100644 --- 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 index 1c2741a2e..404483e77 100644 --- 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 { |