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

Merge branch 'master' into pr/12670

Browse Source
This commit is contained in:
Mark Otto
2014-03-07 00:23:52 -08:00
parent cb7eb674ac 6452b409aa
commit c03b8f1f0f
17 changed files with 48 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dist/css/bootstrap.css vendored
View File

@@ -2683,7 +2683,7 @@ fieldset[disabled] .btn {
.btn-default.active,
.open .dropdown-toggle.btn-default {
color: #333;
background-color: #ebebeb;
background-color: #e6e6e6;
border-color: #adadad;
}
.btn-default:active,
@@ -2724,7 +2724,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;
}
.btn-primary:active,
@@ -2765,7 +2765,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;
}
.btn-success:active,
@@ -2806,7 +2806,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;
}
.btn-info:active,
@@ -2847,7 +2847,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;
}
.btn-warning:active,
@@ -2888,7 +2888,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;
}
.btn-danger:active,
@@ -3316,7 +3316,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 {
position: relative;
@@ -4722,6 +4724,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;
}