mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-30 16:50:00 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Otto
2015-08-12 21:16:56 -07:00
parent a0ae458a8a 7ba24450be
commit 5e928c7c2b
61 changed files with 1031 additions and 1121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
dist/css/bootstrap.css
View File

@@ -2332,11 +2332,6 @@ fieldset[disabled] .btn-primary:hover {
border-color: #0275d8;
}
.btn-primary .badge {
color: #0275d8;
background-color: #fff;
}
.btn-secondary {
color: #373a3c;
background-color: #fff;
@@ -2382,11 +2377,6 @@ fieldset[disabled] .btn-secondary:hover {
border-color: #ccc;
}
.btn-secondary .badge {
color: #fff;
background-color: #373a3c;
}
.btn-info {
color: #fff;
background-color: #5bc0de;
@@ -2432,11 +2422,6 @@ fieldset[disabled] .btn-info:hover {
border-color: #5bc0de;
}
.btn-info .badge {
color: #5bc0de;
background-color: #fff;
}
.btn-success {
color: #fff;
background-color: #5cb85c;
@@ -2482,11 +2467,6 @@ fieldset[disabled] .btn-success:hover {
border-color: #5cb85c;
}
.btn-success .badge {
color: #5cb85c;
background-color: #fff;
}
.btn-warning {
color: #fff;
background-color: #f0ad4e;
@@ -2532,11 +2512,6 @@ fieldset[disabled] .btn-warning:hover {
border-color: #f0ad4e;
}
.btn-warning .badge {
color: #f0ad4e;
background-color: #fff;
}
.btn-danger {
color: #fff;
background-color: #d9534f;
@@ -2582,11 +2557,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;