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

Fixes #11268: Account for badges within buttons by matching background to text color and text color to background

Browse Source
This commit is contained in:
Mark Otto
2013-11-30 16:29:52 -08:00
parent 359ac8f66a
commit 6bc09dd949
4 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
dist/css/bootstrap.css vendored
View File

@@ -2335,6 +2335,11 @@ fieldset[disabled] .btn-default.active {
border-color: #cccccc;
}
.btn-default .badge {
color: #ffffff;
background-color: #fff;
}
.btn-primary {
color: #ffffff;
background-color: #428bca;
@@ -2376,6 +2381,11 @@ fieldset[disabled] .btn-primary.active {
border-color: #357ebd;
}
.btn-primary .badge {
color: #428bca;
background-color: #fff;
}
.btn-warning {
color: #ffffff;
background-color: #f0ad4e;
@@ -2417,6 +2427,11 @@ fieldset[disabled] .btn-warning.active {
border-color: #eea236;
}
.btn-warning .badge {
color: #f0ad4e;
background-color: #fff;
}
.btn-danger {
color: #ffffff;
background-color: #d9534f;
@@ -2458,6 +2473,11 @@ fieldset[disabled] .btn-danger.active {
border-color: #d43f3a;
}
.btn-danger .badge {
color: #d9534f;
background-color: #fff;
}
.btn-success {
color: #ffffff;
background-color: #5cb85c;
@@ -2499,6 +2519,11 @@ fieldset[disabled] .btn-success.active {
border-color: #4cae4c;
}
.btn-success .badge {
color: #5cb85c;
background-color: #fff;
}
.btn-info {
color: #ffffff;
background-color: #5bc0de;
@@ -2540,6 +2565,11 @@ fieldset[disabled] .btn-info.active {
border-color: #46b8da;
}
.btn-info .badge {
color: #5bc0de;
background-color: #fff;
}
.btn-link {
font-weight: normal;
color: #428bca;