Skip to content

B
bootstrap
Commit 7ba24450 authored by Jacob Thornton's avatar Jacob Thornton
Browse files
Options

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

parents 17ba95c2 35f064f9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 67 deletions
dist/css/bootstrap.css
View file @ 7ba24450
...@@ -2374,11 +2374,6 @@ fieldset[disabled] .btn-primary:hover { ...@@ -2374,11 +2374,6 @@ fieldset[disabled] .btn-primary:hover {
border-color: #0275d8; border-color: #0275d8;
} }
.btn-primary .badge {
color: #0275d8;
background-color: #fff;
}
.btn-secondary { .btn-secondary {
color: #373a3c; color: #373a3c;
background-color: #fff; background-color: #fff;
...@@ -2424,11 +2419,6 @@ fieldset[disabled] .btn-secondary:hover { ...@@ -2424,11 +2419,6 @@ fieldset[disabled] .btn-secondary:hover {
border-color: #ccc; border-color: #ccc;
} }
.btn-secondary .badge {
color: #fff;
background-color: #373a3c;
}
.btn-info { .btn-info {
color: #fff; color: #fff;
background-color: #5bc0de; background-color: #5bc0de;
...@@ -2474,11 +2464,6 @@ fieldset[disabled] .btn-info:hover { ...@@ -2474,11 +2464,6 @@ fieldset[disabled] .btn-info:hover {
border-color: #5bc0de; border-color: #5bc0de;
} }
.btn-info .badge {
color: #5bc0de;
background-color: #fff;
}
.btn-success { .btn-success {
color: #fff; color: #fff;
background-color: #5cb85c; background-color: #5cb85c;
...@@ -2524,11 +2509,6 @@ fieldset[disabled] .btn-success:hover { ...@@ -2524,11 +2509,6 @@ fieldset[disabled] .btn-success:hover {
border-color: #5cb85c; border-color: #5cb85c;
} }
.btn-success .badge {
color: #5cb85c;
background-color: #fff;
}
.btn-warning { .btn-warning {
color: #fff; color: #fff;
background-color: #f0ad4e; background-color: #f0ad4e;
...@@ -2574,11 +2554,6 @@ fieldset[disabled] .btn-warning:hover { ...@@ -2574,11 +2554,6 @@ fieldset[disabled] .btn-warning:hover {
border-color: #f0ad4e; border-color: #f0ad4e;
} }
.btn-warning .badge {
color: #f0ad4e;
background-color: #fff;
}
.btn-danger { .btn-danger {
color: #fff; color: #fff;
background-color: #d9534f; background-color: #d9534f;
...@@ -2624,11 +2599,6 @@ fieldset[disabled] .btn-danger:hover { ...@@ -2624,11 +2599,6 @@ fieldset[disabled] .btn-danger:hover {
border-color: #d9534f; border-color: #d9534f;
} }
.btn-danger .badge {
color: #d9534f;
background-color: #fff;
}
.btn-primary-outline { .btn-primary-outline {
color: #0275d8; color: #0275d8;
background-color: #fff; background-color: #fff;
......
dist/css/bootstrap.css.map
View file @ 7ba24450
This diff was suppressed by a .gitattributes entry.
dist/css/bootstrap.min.css
View file @ 7ba24450
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/css/bootstrap.min.css.map
View file @ 7ba24450
This diff was suppressed by a .gitattributes entry.
docs/assets/css/docs.min.css
View file @ 7ba24450
This diff is collapsed.
docs/dist/css/bootstrap.css
View file @ 7ba24450
...@@ -2374,11 +2374,6 @@ fieldset[disabled] .btn-primary:hover { ...@@ -2374,11 +2374,6 @@ fieldset[disabled] .btn-primary:hover {
border-color: #0275d8; border-color: #0275d8;
} }
.btn-primary .badge {
color: #0275d8;
background-color: #fff;
}
.btn-secondary { .btn-secondary {
color: #373a3c; color: #373a3c;
background-color: #fff; background-color: #fff;
...@@ -2424,11 +2419,6 @@ fieldset[disabled] .btn-secondary:hover { ...@@ -2424,11 +2419,6 @@ fieldset[disabled] .btn-secondary:hover {
border-color: #ccc; border-color: #ccc;
} }
.btn-secondary .badge {
color: #fff;
background-color: #373a3c;
}
.btn-info { .btn-info {
color: #fff; color: #fff;
background-color: #5bc0de; background-color: #5bc0de;
...@@ -2474,11 +2464,6 @@ fieldset[disabled] .btn-info:hover { ...@@ -2474,11 +2464,6 @@ fieldset[disabled] .btn-info:hover {
border-color: #5bc0de; border-color: #5bc0de;
} }
.btn-info .badge {
color: #5bc0de;
background-color: #fff;
}
.btn-success { .btn-success {
color: #fff; color: #fff;
background-color: #5cb85c; background-color: #5cb85c;
...@@ -2524,11 +2509,6 @@ fieldset[disabled] .btn-success:hover { ...@@ -2524,11 +2509,6 @@ fieldset[disabled] .btn-success:hover {
border-color: #5cb85c; border-color: #5cb85c;
} }
.btn-success .badge {
color: #5cb85c;
background-color: #fff;
}
.btn-warning { .btn-warning {
color: #fff; color: #fff;
background-color: #f0ad4e; background-color: #f0ad4e;
...@@ -2574,11 +2554,6 @@ fieldset[disabled] .btn-warning:hover { ...@@ -2574,11 +2554,6 @@ fieldset[disabled] .btn-warning:hover {
border-color: #f0ad4e; border-color: #f0ad4e;
} }
.btn-warning .badge {
color: #f0ad4e;
background-color: #fff;
}
.btn-danger { .btn-danger {
color: #fff; color: #fff;
background-color: #d9534f; background-color: #d9534f;
...@@ -2624,11 +2599,6 @@ fieldset[disabled] .btn-danger:hover { ...@@ -2624,11 +2599,6 @@ fieldset[disabled] .btn-danger:hover {
border-color: #d9534f; border-color: #d9534f;
} }
.btn-danger .badge {
color: #d9534f;
background-color: #fff;
}
.btn-primary-outline { .btn-primary-outline {
color: #0275d8; color: #0275d8;
background-color: #fff; background-color: #fff;
......
docs/dist/css/bootstrap.css.map
View file @ 7ba24450
This diff was suppressed by a .gitattributes entry.
docs/dist/css/bootstrap.min.css
View file @ 7ba24450
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/dist/css/bootstrap.min.css.map
View file @ 7ba24450
This diff was suppressed by a .gitattributes entry.
scss/mixins/_buttons.scss
View file @ 7ba24450
...@@ -47,11 +47,6 @@ ...@@ -47,11 +47,6 @@
border-color: $border; border-color: $border;
} }
} }
.badge {
color: $background;
background-color: $color;
}
} }
@mixin button-outline-variant($color) { @mixin button-outline-variant($color) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment