2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-15 11:59:39 +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;
}
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+10 -7
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;
}
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+4
View File
@@ -1352,6 +1352,10 @@
<label for="input-@list-group-link-color">@list-group-link-color</label>
<input id="input-@list-group-link-color" type="text" value="#555" data-var="@list-group-link-color" class="form-control"/>
</div>
<div class="bs-customizer-input">
<label for="input-@list-group-link-hover-color">@list-group-link-hover-color</label>
<input id="input-@list-group-link-hover-color" type="text" value="@list-group-link-color" data-var="@list-group-link-hover-color" class="form-control"/>
</div>
<div class="bs-customizer-input">
<label for="input-@list-group-link-heading-color">@list-group-link-heading-color</label>
<input id="input-@list-group-link-heading-color" type="text" value="#333" data-var="@list-group-link-heading-color" class="form-control"/>
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+11 -1
View File
@@ -220,7 +220,17 @@
// Checkbox and radio options
//
// In order to support the browser's form validation feedback, powered by the
// `required` attribute, we have to "hide" the inputs via `opacity`. We cannot
// use `display: none;` or `visibility: hidden;` as that also hides the popover.
// This way, we ensure a DOM element is visible to position the popover from.
//
// See https://github.com/twbs/bootstrap/pull/12794 for more.
[data-toggle="buttons"] > .btn > input[type="radio"],
[data-toggle="buttons"] > .btn > input[type="checkbox"] {
display: none;
position: absolute;
z-index: -1;
opacity: 0;
}
+1
View File
@@ -62,6 +62,7 @@ a.list-group-item {
&:hover,
&:focus {
text-decoration: none;
color: @list-group-link-hover-color;
background-color: @list-group-hover-bg;
}
}
+1 -1
View File
@@ -602,7 +602,7 @@
&.active,
.open .dropdown-toggle& {
color: @color;
background-color: darken(@background, 8%);
background-color: darken(@background, 10%);
border-color: darken(@border, 12%);
}
&:active,
+1
View File
@@ -662,6 +662,7 @@
@list-group-disabled-text-color: @list-group-disabled-color;
@list-group-link-color: #555;
@list-group-link-hover-color: @list-group-link-color;
@list-group-link-heading-color: #333;
File diff suppressed because one or more lines are too long