2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-24 14:04:09 +03:00

Merge branch 'master' into pr/12670

This commit is contained in:
Mark Otto
2014-03-07 00:23:52 -08:00
17 changed files with 48 additions and 26 deletions
+10 -7
View File
@@ -3444,7 +3444,7 @@ fieldset[disabled] .btn {
.btn-default.active,
.open .dropdown-toggle.btn-default {
color: #333;
background-color: #ebebeb;
background-color: #e6e6e6;
border-color: #adadad;
}
@@ -3490,7 +3490,7 @@ fieldset[disabled] .btn-default.active {
.btn-primary.active,
.open .dropdown-toggle.btn-primary {
color: #fff;
background-color: #3276b1;
background-color: #3071a9;
border-color: #285e8e;
}
@@ -3536,7 +3536,7 @@ fieldset[disabled] .btn-primary.active {
.btn-success.active,
.open .dropdown-toggle.btn-success {
color: #fff;
background-color: #47a447;
background-color: #449d44;
border-color: #398439;
}
@@ -3582,7 +3582,7 @@ fieldset[disabled] .btn-success.active {
.btn-info.active,
.open .dropdown-toggle.btn-info {
color: #fff;
background-color: #39b3d7;
background-color: #31b0d5;
border-color: #269abc;
}
@@ -3628,7 +3628,7 @@ fieldset[disabled] .btn-info.active {
.btn-warning.active,
.open .dropdown-toggle.btn-warning {
color: #fff;
background-color: #ed9c28;
background-color: #ec971f;
border-color: #d58512;
}
@@ -3674,7 +3674,7 @@ fieldset[disabled] .btn-warning.active {
.btn-danger.active,
.open .dropdown-toggle.btn-danger {
color: #fff;
background-color: #d2322d;
background-color: #c9302c;
border-color: #ac2925;
}
@@ -4182,7 +4182,9 @@ tbody.collapse.in {
[data-toggle="buttons"] > .btn > input[type="radio"],
[data-toggle="buttons"] > .btn > input[type="checkbox"] {
display: none;
position: absolute;
z-index: -1;
opacity: 0;
}
.input-group {
@@ -5877,6 +5879,7 @@ a.list-group-item .list-group-item-heading {
a.list-group-item:hover,
a.list-group-item:focus {
color: #555;
text-decoration: none;
background-color: #f5f5f5;
}