rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-19 16:54:24 +01:00
Code Issues Actions Packages Releases Activity

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

Browse Source
This commit is contained in:
Mark Otto 2017-03-14 20:00:39 -07:00
commit f61fb70eb1
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scss/_buttons.scss
View File

@ -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);
}

5
scss/_dropdown.scss
View File

@ -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 {