root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Merge branch 'v4' of github.com:twbs/derpstrap into v4

This commit is contained in:
Jacob Thornton 2015-08-12 21:18:36 -07:00
parent 17ba95c201 35f064f96c
commit 7ba24450be
10 changed files with 10 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dist/css/bootstrap.css
View File

@ -2374,11 +2374,6 @@ fieldset[disabled] .btn-primary:hover {
border-color: #0275d8;
}
.btn-primary .badge {
color: #0275d8;
background-color: #fff;
}
.btn-secondary {
color: #373a3c;
background-color: #fff;
@ -2424,11 +2419,6 @@ fieldset[disabled] .btn-secondary:hover {
border-color: #ccc;
}
.btn-secondary .badge {
color: #fff;
background-color: #373a3c;
}
.btn-info {
color: #fff;
background-color: #5bc0de;
@ -2474,11 +2464,6 @@ fieldset[disabled] .btn-info:hover {
border-color: #5bc0de;
}
.btn-info .badge {
color: #5bc0de;
background-color: #fff;
}
.btn-success {
color: #fff;
background-color: #5cb85c;
@ -2524,11 +2509,6 @@ fieldset[disabled] .btn-success:hover {
border-color: #5cb85c;
}
.btn-success .badge {
color: #5cb85c;
background-color: #fff;
}
.btn-warning {
color: #fff;
background-color: #f0ad4e;
@ -2574,11 +2554,6 @@ fieldset[disabled] .btn-warning:hover {
border-color: #f0ad4e;
}
.btn-warning .badge {
color: #f0ad4e;
background-color: #fff;
}
.btn-danger {
color: #fff;
background-color: #d9534f;
@ -2624,11 +2599,6 @@ fieldset[disabled] .btn-danger:hover {
border-color: #d9534f;
}
.btn-danger .badge {
color: #d9534f;
background-color: #fff;
}
.btn-primary-outline {
color: #0275d8;
background-color: #fff;

2
dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/bootstrap.min.css.map vendored
View File

File diff suppressed because one or more lines are too long

4
docs/assets/css/docs.min.css vendored
View File

File diff suppressed because one or more lines are too long

30
docs/dist/css/bootstrap.css
View File

@ -2374,11 +2374,6 @@ fieldset[disabled] .btn-primary:hover {
border-color: #0275d8;
}
.btn-primary .badge {
color: #0275d8;
background-color: #fff;
}
.btn-secondary {
color: #373a3c;
background-color: #fff;
@ -2424,11 +2419,6 @@ fieldset[disabled] .btn-secondary:hover {
border-color: #ccc;
}
.btn-secondary .badge {
color: #fff;
background-color: #373a3c;
}
.btn-info {
color: #fff;
background-color: #5bc0de;
@ -2474,11 +2464,6 @@ fieldset[disabled] .btn-info:hover {
border-color: #5bc0de;
}
.btn-info .badge {
color: #5bc0de;
background-color: #fff;
}
.btn-success {
color: #fff;
background-color: #5cb85c;
@ -2524,11 +2509,6 @@ fieldset[disabled] .btn-success:hover {
border-color: #5cb85c;
}
.btn-success .badge {
color: #5cb85c;
background-color: #fff;
}
.btn-warning {
color: #fff;
background-color: #f0ad4e;
@ -2574,11 +2554,6 @@ fieldset[disabled] .btn-warning:hover {
border-color: #f0ad4e;
}
.btn-warning .badge {
color: #f0ad4e;
background-color: #fff;
}
.btn-danger {
color: #fff;
background-color: #d9534f;
@ -2624,11 +2599,6 @@ fieldset[disabled] .btn-danger:hover {
border-color: #d9534f;
}
.btn-danger .badge {
color: #d9534f;
background-color: #fff;
}
.btn-primary-outline {
color: #0275d8;
background-color: #fff;

2
docs/dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
docs/dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
docs/dist/css/bootstrap.min.css.map vendored
View File

File diff suppressed because one or more lines are too long

5
scss/mixins/_buttons.scss
View File

@ -47,11 +47,6 @@
border-color: $border;
}
}
.badge {
color: $background;
background-color: $color;
}
}
@mixin button-outline-variant($color) {