aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-11-30 16:29:52 -0800
committerMark Otto <[email protected]>2013-11-30 16:29:52 -0800
commit6bc09dd94949e05827c541795e4133b0cdbf7cae (patch)
treef4c16f2f83e8161340cb996e8107e6db33fa5754 /dist/css/bootstrap.css
parent359ac8f66a4f3de6ea4f5ab9cbe409879f3eeb90 (diff)
downloadbootstrap-6bc09dd94949e05827c541795e4133b0cdbf7cae.tar.xz
bootstrap-6bc09dd94949e05827c541795e4133b0cdbf7cae.zip
Fixes #11268: Account for badges within buttons by matching background to text color and text color to background
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css30
1 files changed, 30 insertions, 0 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index ebd20fc44..69a2009f3 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -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;