0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-06 04:08:22 +01:00

Merge branch 'master' into input_sizing

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto 2015-03-28 20:31:53 -07:00
commit 57c8e3cd51
15 changed files with 363 additions and 59 deletions

View File

@ -346,7 +346,7 @@ module.exports = function (grunt) {
watch: { watch: {
src: { src: {
files: '<%= jshint.core.src %>', files: '<%= jshint.core.src %>',
tasks: ['jshint:src', 'qunit', 'concat'] tasks: ['jshint:core', 'qunit', 'concat']
}, },
test: { test: {
files: '<%= jshint.test.src %>', files: '<%= jshint.test.src %>',

View File

@ -1344,62 +1344,72 @@ mark,
.text-primary { .text-primary {
color: #337ab7; color: #337ab7;
} }
a.text-primary:hover { a.text-primary:hover,
a.text-primary:focus {
color: #286090; color: #286090;
} }
.text-success { .text-success {
color: #3c763d; color: #3c763d;
} }
a.text-success:hover { a.text-success:hover,
a.text-success:focus {
color: #2b542c; color: #2b542c;
} }
.text-info { .text-info {
color: #31708f; color: #31708f;
} }
a.text-info:hover { a.text-info:hover,
a.text-info:focus {
color: #245269; color: #245269;
} }
.text-warning { .text-warning {
color: #8a6d3b; color: #8a6d3b;
} }
a.text-warning:hover { a.text-warning:hover,
a.text-warning:focus {
color: #66512c; color: #66512c;
} }
.text-danger { .text-danger {
color: #a94442; color: #a94442;
} }
a.text-danger:hover { a.text-danger:hover,
a.text-danger:focus {
color: #843534; color: #843534;
} }
.bg-primary { .bg-primary {
color: #fff; color: #fff;
background-color: #337ab7; background-color: #337ab7;
} }
a.bg-primary:hover { a.bg-primary:hover,
a.bg-primary:focus {
background-color: #286090; background-color: #286090;
} }
.bg-success { .bg-success {
background-color: #dff0d8; background-color: #dff0d8;
} }
a.bg-success:hover { a.bg-success:hover,
a.bg-success:focus {
background-color: #c1e2b3; background-color: #c1e2b3;
} }
.bg-info { .bg-info {
background-color: #d9edf7; background-color: #d9edf7;
} }
a.bg-info:hover { a.bg-info:hover,
a.bg-info:focus {
background-color: #afd9ee; background-color: #afd9ee;
} }
.bg-warning { .bg-warning {
background-color: #fcf8e3; background-color: #fcf8e3;
} }
a.bg-warning:hover { a.bg-warning:hover,
a.bg-warning:focus {
background-color: #f7ecb5; background-color: #f7ecb5;
} }
.bg-danger { .bg-danger {
background-color: #f2dede; background-color: #f2dede;
} }
a.bg-danger:hover { a.bg-danger:hover,
a.bg-danger:focus {
background-color: #e4b9b9; background-color: #e4b9b9;
} }
.page-header { .page-header {
@ -3033,21 +3043,32 @@ select[multiple].input-lg {
.btn.disabled, .btn.disabled,
.btn[disabled], .btn[disabled],
fieldset[disabled] .btn { fieldset[disabled] .btn {
pointer-events: none;
cursor: not-allowed; cursor: not-allowed;
filter: alpha(opacity=65); filter: alpha(opacity=65);
-webkit-box-shadow: none; -webkit-box-shadow: none;
box-shadow: none; box-shadow: none;
opacity: .65; opacity: .65;
} }
a.btn.disabled,
fieldset[disabled] a.btn {
pointer-events: none;
}
.btn-default { .btn-default {
color: #333; color: #333;
background-color: #fff; background-color: #fff;
border-color: #ccc; border-color: #ccc;
} }
.btn-default:hover,
.btn-default:focus, .btn-default:focus,
.btn-default.focus, .btn-default.focus {
color: #333;
background-color: #e6e6e6;
border-color: #8c8c8c;
}
.btn-default:hover {
color: #333;
background-color: #e6e6e6;
border-color: #adadad;
}
.btn-default:active, .btn-default:active,
.btn-default.active, .btn-default.active,
.open > .dropdown-toggle.btn-default { .open > .dropdown-toggle.btn-default {
@ -3055,6 +3076,19 @@ fieldset[disabled] .btn {
background-color: #e6e6e6; background-color: #e6e6e6;
border-color: #adadad; border-color: #adadad;
} }
.btn-default:active:hover,
.btn-default.active:hover,
.open > .dropdown-toggle.btn-default:hover,
.btn-default:active:focus,
.btn-default.active:focus,
.open > .dropdown-toggle.btn-default:focus,
.btn-default:active.focus,
.btn-default.active.focus,
.open > .dropdown-toggle.btn-default.focus {
color: #333;
background-color: #d4d4d4;
border-color: #8c8c8c;
}
.btn-default:active, .btn-default:active,
.btn-default.active, .btn-default.active,
.open > .dropdown-toggle.btn-default { .open > .dropdown-toggle.btn-default {
@ -3090,9 +3124,17 @@ fieldset[disabled] .btn-default.active {
background-color: #337ab7; background-color: #337ab7;
border-color: #2e6da4; border-color: #2e6da4;
} }
.btn-primary:hover,
.btn-primary:focus, .btn-primary:focus,
.btn-primary.focus, .btn-primary.focus {
color: #fff;
background-color: #286090;
border-color: #122b40;
}
.btn-primary:hover {
color: #fff;
background-color: #286090;
border-color: #204d74;
}
.btn-primary:active, .btn-primary:active,
.btn-primary.active, .btn-primary.active,
.open > .dropdown-toggle.btn-primary { .open > .dropdown-toggle.btn-primary {
@ -3100,6 +3142,19 @@ fieldset[disabled] .btn-default.active {
background-color: #286090; background-color: #286090;
border-color: #204d74; border-color: #204d74;
} }
.btn-primary:active:hover,
.btn-primary.active:hover,
.open > .dropdown-toggle.btn-primary:hover,
.btn-primary:active:focus,
.btn-primary.active:focus,
.open > .dropdown-toggle.btn-primary:focus,
.btn-primary:active.focus,
.btn-primary.active.focus,
.open > .dropdown-toggle.btn-primary.focus {
color: #fff;
background-color: #204d74;
border-color: #122b40;
}
.btn-primary:active, .btn-primary:active,
.btn-primary.active, .btn-primary.active,
.open > .dropdown-toggle.btn-primary { .open > .dropdown-toggle.btn-primary {
@ -3135,9 +3190,17 @@ fieldset[disabled] .btn-primary.active {
background-color: #5cb85c; background-color: #5cb85c;
border-color: #4cae4c; border-color: #4cae4c;
} }
.btn-success:hover,
.btn-success:focus, .btn-success:focus,
.btn-success.focus, .btn-success.focus {
color: #fff;
background-color: #449d44;
border-color: #255625;
}
.btn-success:hover {
color: #fff;
background-color: #449d44;
border-color: #398439;
}
.btn-success:active, .btn-success:active,
.btn-success.active, .btn-success.active,
.open > .dropdown-toggle.btn-success { .open > .dropdown-toggle.btn-success {
@ -3145,6 +3208,19 @@ fieldset[disabled] .btn-primary.active {
background-color: #449d44; background-color: #449d44;
border-color: #398439; border-color: #398439;
} }
.btn-success:active:hover,
.btn-success.active:hover,
.open > .dropdown-toggle.btn-success:hover,
.btn-success:active:focus,
.btn-success.active:focus,
.open > .dropdown-toggle.btn-success:focus,
.btn-success:active.focus,
.btn-success.active.focus,
.open > .dropdown-toggle.btn-success.focus {
color: #fff;
background-color: #398439;
border-color: #255625;
}
.btn-success:active, .btn-success:active,
.btn-success.active, .btn-success.active,
.open > .dropdown-toggle.btn-success { .open > .dropdown-toggle.btn-success {
@ -3180,9 +3256,17 @@ fieldset[disabled] .btn-success.active {
background-color: #5bc0de; background-color: #5bc0de;
border-color: #46b8da; border-color: #46b8da;
} }
.btn-info:hover,
.btn-info:focus, .btn-info:focus,
.btn-info.focus, .btn-info.focus {
color: #fff;
background-color: #31b0d5;
border-color: #1b6d85;
}
.btn-info:hover {
color: #fff;
background-color: #31b0d5;
border-color: #269abc;
}
.btn-info:active, .btn-info:active,
.btn-info.active, .btn-info.active,
.open > .dropdown-toggle.btn-info { .open > .dropdown-toggle.btn-info {
@ -3190,6 +3274,19 @@ fieldset[disabled] .btn-success.active {
background-color: #31b0d5; background-color: #31b0d5;
border-color: #269abc; border-color: #269abc;
} }
.btn-info:active:hover,
.btn-info.active:hover,
.open > .dropdown-toggle.btn-info:hover,
.btn-info:active:focus,
.btn-info.active:focus,
.open > .dropdown-toggle.btn-info:focus,
.btn-info:active.focus,
.btn-info.active.focus,
.open > .dropdown-toggle.btn-info.focus {
color: #fff;
background-color: #269abc;
border-color: #1b6d85;
}
.btn-info:active, .btn-info:active,
.btn-info.active, .btn-info.active,
.open > .dropdown-toggle.btn-info { .open > .dropdown-toggle.btn-info {
@ -3225,9 +3322,17 @@ fieldset[disabled] .btn-info.active {
background-color: #f0ad4e; background-color: #f0ad4e;
border-color: #eea236; border-color: #eea236;
} }
.btn-warning:hover,
.btn-warning:focus, .btn-warning:focus,
.btn-warning.focus, .btn-warning.focus {
color: #fff;
background-color: #ec971f;
border-color: #985f0d;
}
.btn-warning:hover {
color: #fff;
background-color: #ec971f;
border-color: #d58512;
}
.btn-warning:active, .btn-warning:active,
.btn-warning.active, .btn-warning.active,
.open > .dropdown-toggle.btn-warning { .open > .dropdown-toggle.btn-warning {
@ -3235,6 +3340,19 @@ fieldset[disabled] .btn-info.active {
background-color: #ec971f; background-color: #ec971f;
border-color: #d58512; border-color: #d58512;
} }
.btn-warning:active:hover,
.btn-warning.active:hover,
.open > .dropdown-toggle.btn-warning:hover,
.btn-warning:active:focus,
.btn-warning.active:focus,
.open > .dropdown-toggle.btn-warning:focus,
.btn-warning:active.focus,
.btn-warning.active.focus,
.open > .dropdown-toggle.btn-warning.focus {
color: #fff;
background-color: #d58512;
border-color: #985f0d;
}
.btn-warning:active, .btn-warning:active,
.btn-warning.active, .btn-warning.active,
.open > .dropdown-toggle.btn-warning { .open > .dropdown-toggle.btn-warning {
@ -3270,9 +3388,17 @@ fieldset[disabled] .btn-warning.active {
background-color: #d9534f; background-color: #d9534f;
border-color: #d43f3a; border-color: #d43f3a;
} }
.btn-danger:hover,
.btn-danger:focus, .btn-danger:focus,
.btn-danger.focus, .btn-danger.focus {
color: #fff;
background-color: #c9302c;
border-color: #761c19;
}
.btn-danger:hover {
color: #fff;
background-color: #c9302c;
border-color: #ac2925;
}
.btn-danger:active, .btn-danger:active,
.btn-danger.active, .btn-danger.active,
.open > .dropdown-toggle.btn-danger { .open > .dropdown-toggle.btn-danger {
@ -3280,6 +3406,19 @@ fieldset[disabled] .btn-warning.active {
background-color: #c9302c; background-color: #c9302c;
border-color: #ac2925; border-color: #ac2925;
} }
.btn-danger:active:hover,
.btn-danger.active:hover,
.open > .dropdown-toggle.btn-danger:hover,
.btn-danger:active:focus,
.btn-danger.active:focus,
.open > .dropdown-toggle.btn-danger:focus,
.btn-danger:active.focus,
.btn-danger.active.focus,
.open > .dropdown-toggle.btn-danger.focus {
color: #fff;
background-color: #ac2925;
border-color: #761c19;
}
.btn-danger:active, .btn-danger:active,
.btn-danger.active, .btn-danger.active,
.open > .dropdown-toggle.btn-danger { .open > .dropdown-toggle.btn-danger {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -3,7 +3,7 @@
<h2 id="tabs-examples">Example tabs</h2> <h2 id="tabs-examples">Example tabs</h2>
<p>Add quick, dynamic tab functionality to transition through panes of local content, even via dropdown menus.</p> <p>Add quick, dynamic tab functionality to transition through panes of local content, even via dropdown menus.</p>
<div class="bs-example bs-example-tabs" role="tabpanel" data-example-id="togglable-tabs"> <div class="bs-example bs-example-tabs" data-example-id="togglable-tabs">
<ul id="myTabs" class="nav nav-tabs" role="tablist"> <ul id="myTabs" class="nav nav-tabs" role="tablist">
<li role="presentation" class="active"><a href="#home" id="home-tab" role="tab" data-toggle="tab" aria-controls="home" aria-expanded="true">Home</a></li> <li role="presentation" class="active"><a href="#home" id="home-tab" role="tab" data-toggle="tab" aria-controls="home" aria-expanded="true">Home</a></li>
<li role="presentation"><a href="#profile" role="tab" id="profile-tab" data-toggle="tab" aria-controls="profile">Profile</a></li> <li role="presentation"><a href="#profile" role="tab" id="profile-tab" data-toggle="tab" aria-controls="profile">Profile</a></li>
@ -59,7 +59,7 @@ $('#myTabs li:eq(2) a').tab('show') // Select third tab (0-indexed)
<h3>Markup</h3> <h3>Markup</h3>
<p>You can activate a tab or pill navigation without writing any JavaScript by simply specifying <code>data-toggle="tab"</code> or <code>data-toggle="pill"</code> on an element. Adding the <code>nav</code> and <code>nav-tabs</code> classes to the tab <code>ul</code> will apply the Bootstrap <a href="../components/#nav-tabs">tab styling</a>, while adding the <code>nav</code> and <code>nav-pills</code> classes will apply <a href="../components/#nav-pills">pill styling</a>.</p> <p>You can activate a tab or pill navigation without writing any JavaScript by simply specifying <code>data-toggle="tab"</code> or <code>data-toggle="pill"</code> on an element. Adding the <code>nav</code> and <code>nav-tabs</code> classes to the tab <code>ul</code> will apply the Bootstrap <a href="../components/#nav-tabs">tab styling</a>, while adding the <code>nav</code> and <code>nav-pills</code> classes will apply <a href="../components/#nav-pills">pill styling</a>.</p>
{% highlight html %} {% highlight html %}
<div role="tabpanel"> <div>
<!-- Nav tabs --> <!-- Nav tabs -->
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">

View File

@ -1344,62 +1344,72 @@ mark,
.text-primary { .text-primary {
color: #337ab7; color: #337ab7;
} }
a.text-primary:hover { a.text-primary:hover,
a.text-primary:focus {
color: #286090; color: #286090;
} }
.text-success { .text-success {
color: #3c763d; color: #3c763d;
} }
a.text-success:hover { a.text-success:hover,
a.text-success:focus {
color: #2b542c; color: #2b542c;
} }
.text-info { .text-info {
color: #31708f; color: #31708f;
} }
a.text-info:hover { a.text-info:hover,
a.text-info:focus {
color: #245269; color: #245269;
} }
.text-warning { .text-warning {
color: #8a6d3b; color: #8a6d3b;
} }
a.text-warning:hover { a.text-warning:hover,
a.text-warning:focus {
color: #66512c; color: #66512c;
} }
.text-danger { .text-danger {
color: #a94442; color: #a94442;
} }
a.text-danger:hover { a.text-danger:hover,
a.text-danger:focus {
color: #843534; color: #843534;
} }
.bg-primary { .bg-primary {
color: #fff; color: #fff;
background-color: #337ab7; background-color: #337ab7;
} }
a.bg-primary:hover { a.bg-primary:hover,
a.bg-primary:focus {
background-color: #286090; background-color: #286090;
} }
.bg-success { .bg-success {
background-color: #dff0d8; background-color: #dff0d8;
} }
a.bg-success:hover { a.bg-success:hover,
a.bg-success:focus {
background-color: #c1e2b3; background-color: #c1e2b3;
} }
.bg-info { .bg-info {
background-color: #d9edf7; background-color: #d9edf7;
} }
a.bg-info:hover { a.bg-info:hover,
a.bg-info:focus {
background-color: #afd9ee; background-color: #afd9ee;
} }
.bg-warning { .bg-warning {
background-color: #fcf8e3; background-color: #fcf8e3;
} }
a.bg-warning:hover { a.bg-warning:hover,
a.bg-warning:focus {
background-color: #f7ecb5; background-color: #f7ecb5;
} }
.bg-danger { .bg-danger {
background-color: #f2dede; background-color: #f2dede;
} }
a.bg-danger:hover { a.bg-danger:hover,
a.bg-danger:focus {
background-color: #e4b9b9; background-color: #e4b9b9;
} }
.page-header { .page-header {
@ -3033,21 +3043,32 @@ select[multiple].form-group-lg .form-control {
.btn.disabled, .btn.disabled,
.btn[disabled], .btn[disabled],
fieldset[disabled] .btn { fieldset[disabled] .btn {
pointer-events: none;
cursor: not-allowed; cursor: not-allowed;
filter: alpha(opacity=65); filter: alpha(opacity=65);
-webkit-box-shadow: none; -webkit-box-shadow: none;
box-shadow: none; box-shadow: none;
opacity: .65; opacity: .65;
} }
a.btn.disabled,
fieldset[disabled] a.btn {
pointer-events: none;
}
.btn-default { .btn-default {
color: #333; color: #333;
background-color: #fff; background-color: #fff;
border-color: #ccc; border-color: #ccc;
} }
.btn-default:hover,
.btn-default:focus, .btn-default:focus,
.btn-default.focus, .btn-default.focus {
color: #333;
background-color: #e6e6e6;
border-color: #8c8c8c;
}
.btn-default:hover {
color: #333;
background-color: #e6e6e6;
border-color: #adadad;
}
.btn-default:active, .btn-default:active,
.btn-default.active, .btn-default.active,
.open > .dropdown-toggle.btn-default { .open > .dropdown-toggle.btn-default {
@ -3055,6 +3076,19 @@ fieldset[disabled] .btn {
background-color: #e6e6e6; background-color: #e6e6e6;
border-color: #adadad; border-color: #adadad;
} }
.btn-default:active:hover,
.btn-default.active:hover,
.open > .dropdown-toggle.btn-default:hover,
.btn-default:active:focus,
.btn-default.active:focus,
.open > .dropdown-toggle.btn-default:focus,
.btn-default:active.focus,
.btn-default.active.focus,
.open > .dropdown-toggle.btn-default.focus {
color: #333;
background-color: #d4d4d4;
border-color: #8c8c8c;
}
.btn-default:active, .btn-default:active,
.btn-default.active, .btn-default.active,
.open > .dropdown-toggle.btn-default { .open > .dropdown-toggle.btn-default {
@ -3090,9 +3124,17 @@ fieldset[disabled] .btn-default.active {
background-color: #337ab7; background-color: #337ab7;
border-color: #2e6da4; border-color: #2e6da4;
} }
.btn-primary:hover,
.btn-primary:focus, .btn-primary:focus,
.btn-primary.focus, .btn-primary.focus {
color: #fff;
background-color: #286090;
border-color: #122b40;
}
.btn-primary:hover {
color: #fff;
background-color: #286090;
border-color: #204d74;
}
.btn-primary:active, .btn-primary:active,
.btn-primary.active, .btn-primary.active,
.open > .dropdown-toggle.btn-primary { .open > .dropdown-toggle.btn-primary {
@ -3100,6 +3142,19 @@ fieldset[disabled] .btn-default.active {
background-color: #286090; background-color: #286090;
border-color: #204d74; border-color: #204d74;
} }
.btn-primary:active:hover,
.btn-primary.active:hover,
.open > .dropdown-toggle.btn-primary:hover,
.btn-primary:active:focus,
.btn-primary.active:focus,
.open > .dropdown-toggle.btn-primary:focus,
.btn-primary:active.focus,
.btn-primary.active.focus,
.open > .dropdown-toggle.btn-primary.focus {
color: #fff;
background-color: #204d74;
border-color: #122b40;
}
.btn-primary:active, .btn-primary:active,
.btn-primary.active, .btn-primary.active,
.open > .dropdown-toggle.btn-primary { .open > .dropdown-toggle.btn-primary {
@ -3135,9 +3190,17 @@ fieldset[disabled] .btn-primary.active {
background-color: #5cb85c; background-color: #5cb85c;
border-color: #4cae4c; border-color: #4cae4c;
} }
.btn-success:hover,
.btn-success:focus, .btn-success:focus,
.btn-success.focus, .btn-success.focus {
color: #fff;
background-color: #449d44;
border-color: #255625;
}
.btn-success:hover {
color: #fff;
background-color: #449d44;
border-color: #398439;
}
.btn-success:active, .btn-success:active,
.btn-success.active, .btn-success.active,
.open > .dropdown-toggle.btn-success { .open > .dropdown-toggle.btn-success {
@ -3145,6 +3208,19 @@ fieldset[disabled] .btn-primary.active {
background-color: #449d44; background-color: #449d44;
border-color: #398439; border-color: #398439;
} }
.btn-success:active:hover,
.btn-success.active:hover,
.open > .dropdown-toggle.btn-success:hover,
.btn-success:active:focus,
.btn-success.active:focus,
.open > .dropdown-toggle.btn-success:focus,
.btn-success:active.focus,
.btn-success.active.focus,
.open > .dropdown-toggle.btn-success.focus {
color: #fff;
background-color: #398439;
border-color: #255625;
}
.btn-success:active, .btn-success:active,
.btn-success.active, .btn-success.active,
.open > .dropdown-toggle.btn-success { .open > .dropdown-toggle.btn-success {
@ -3180,9 +3256,17 @@ fieldset[disabled] .btn-success.active {
background-color: #5bc0de; background-color: #5bc0de;
border-color: #46b8da; border-color: #46b8da;
} }
.btn-info:hover,
.btn-info:focus, .btn-info:focus,
.btn-info.focus, .btn-info.focus {
color: #fff;
background-color: #31b0d5;
border-color: #1b6d85;
}
.btn-info:hover {
color: #fff;
background-color: #31b0d5;
border-color: #269abc;
}
.btn-info:active, .btn-info:active,
.btn-info.active, .btn-info.active,
.open > .dropdown-toggle.btn-info { .open > .dropdown-toggle.btn-info {
@ -3190,6 +3274,19 @@ fieldset[disabled] .btn-success.active {
background-color: #31b0d5; background-color: #31b0d5;
border-color: #269abc; border-color: #269abc;
} }
.btn-info:active:hover,
.btn-info.active:hover,
.open > .dropdown-toggle.btn-info:hover,
.btn-info:active:focus,
.btn-info.active:focus,
.open > .dropdown-toggle.btn-info:focus,
.btn-info:active.focus,
.btn-info.active.focus,
.open > .dropdown-toggle.btn-info.focus {
color: #fff;
background-color: #269abc;
border-color: #1b6d85;
}
.btn-info:active, .btn-info:active,
.btn-info.active, .btn-info.active,
.open > .dropdown-toggle.btn-info { .open > .dropdown-toggle.btn-info {
@ -3225,9 +3322,17 @@ fieldset[disabled] .btn-info.active {
background-color: #f0ad4e; background-color: #f0ad4e;
border-color: #eea236; border-color: #eea236;
} }
.btn-warning:hover,
.btn-warning:focus, .btn-warning:focus,
.btn-warning.focus, .btn-warning.focus {
color: #fff;
background-color: #ec971f;
border-color: #985f0d;
}
.btn-warning:hover {
color: #fff;
background-color: #ec971f;
border-color: #d58512;
}
.btn-warning:active, .btn-warning:active,
.btn-warning.active, .btn-warning.active,
.open > .dropdown-toggle.btn-warning { .open > .dropdown-toggle.btn-warning {
@ -3235,6 +3340,19 @@ fieldset[disabled] .btn-info.active {
background-color: #ec971f; background-color: #ec971f;
border-color: #d58512; border-color: #d58512;
} }
.btn-warning:active:hover,
.btn-warning.active:hover,
.open > .dropdown-toggle.btn-warning:hover,
.btn-warning:active:focus,
.btn-warning.active:focus,
.open > .dropdown-toggle.btn-warning:focus,
.btn-warning:active.focus,
.btn-warning.active.focus,
.open > .dropdown-toggle.btn-warning.focus {
color: #fff;
background-color: #d58512;
border-color: #985f0d;
}
.btn-warning:active, .btn-warning:active,
.btn-warning.active, .btn-warning.active,
.open > .dropdown-toggle.btn-warning { .open > .dropdown-toggle.btn-warning {
@ -3270,9 +3388,17 @@ fieldset[disabled] .btn-warning.active {
background-color: #d9534f; background-color: #d9534f;
border-color: #d43f3a; border-color: #d43f3a;
} }
.btn-danger:hover,
.btn-danger:focus, .btn-danger:focus,
.btn-danger.focus, .btn-danger.focus {
color: #fff;
background-color: #c9302c;
border-color: #761c19;
}
.btn-danger:hover {
color: #fff;
background-color: #c9302c;
border-color: #ac2925;
}
.btn-danger:active, .btn-danger:active,
.btn-danger.active, .btn-danger.active,
.open > .dropdown-toggle.btn-danger { .open > .dropdown-toggle.btn-danger {
@ -3280,6 +3406,19 @@ fieldset[disabled] .btn-warning.active {
background-color: #c9302c; background-color: #c9302c;
border-color: #ac2925; border-color: #ac2925;
} }
.btn-danger:active:hover,
.btn-danger.active:hover,
.open > .dropdown-toggle.btn-danger:hover,
.btn-danger:active:focus,
.btn-danger.active:focus,
.open > .dropdown-toggle.btn-danger:focus,
.btn-danger:active.focus,
.btn-danger.active.focus,
.open > .dropdown-toggle.btn-danger.focus {
color: #fff;
background-color: #ac2925;
border-color: #761c19;
}
.btn-danger:active, .btn-danger:active,
.btn-danger.active, .btn-danger.active,
.open > .dropdown-toggle.btn-danger { .open > .dropdown-toggle.btn-danger {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -8,6 +8,7 @@
"disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"], "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
"disallowSpaceBeforeBinaryOperators": [","], "disallowSpaceBeforeBinaryOperators": [","],
"disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
"disallowSpacesInFunctionDeclaration": { "beforeOpeningRoundBrace": true },
"disallowSpacesInNamedFunctionExpression": { "beforeOpeningRoundBrace": true }, "disallowSpacesInNamedFunctionExpression": { "beforeOpeningRoundBrace": true },
"disallowSpacesInsideArrayBrackets": true, "disallowSpacesInsideArrayBrackets": true,
"disallowSpacesInsideParentheses": true, "disallowSpacesInsideParentheses": true,

View File

@ -47,10 +47,16 @@
&[disabled], &[disabled],
fieldset[disabled] & { fieldset[disabled] & {
cursor: @cursor-disabled; cursor: @cursor-disabled;
pointer-events: none; // Future-proof disabling of clicks
.opacity(.65); .opacity(.65);
.box-shadow(none); .box-shadow(none);
} }
a& {
&.disabled,
fieldset[disabled] & {
pointer-events: none; // Future-proof disabling of clicks on `<a>` elements
}
}
} }

View File

@ -44,7 +44,7 @@
h1, h1,
.h1 { .h1 {
font-size: (@font-size-base * 4.5); font-size: @jumbotron-heading-font-size;
} }
} }
} }

View File

@ -2,7 +2,8 @@
.bg-variant(@color) { .bg-variant(@color) {
background-color: @color; background-color: @color;
a&:hover { a&:hover,
a&:focus {
background-color: darken(@color, 10%); background-color: darken(@color, 10%);
} }
} }

View File

@ -8,15 +8,31 @@
background-color: @background; background-color: @background;
border-color: @border; border-color: @border;
&:hover,
&:focus, &:focus,
&.focus, &.focus {
color: @color;
background-color: darken(@background, 10%);
border-color: darken(@border, 25%);
}
&:hover {
color: @color;
background-color: darken(@background, 10%);
border-color: darken(@border, 12%);
}
&:active, &:active,
&.active, &.active,
.open > .dropdown-toggle& { .open > .dropdown-toggle& {
color: @color; color: @color;
background-color: darken(@background, 10%); background-color: darken(@background, 10%);
border-color: darken(@border, 12%); border-color: darken(@border, 12%);
&:hover,
&:focus,
&.focus {
color: @color;
background-color: darken(@background, 17%);
border-color: darken(@border, 25%);
}
} }
&:active, &:active,
&.active, &.active,

View File

@ -2,7 +2,8 @@
.text-emphasis-variant(@color) { .text-emphasis-variant(@color) {
color: @color; color: @color;
a&:hover { a&:hover,
a&:focus {
color: darken(@color, 10%); color: darken(@color, 10%);
} }
} }

View File

@ -484,6 +484,7 @@
@jumbotron-bg: @gray-lighter; @jumbotron-bg: @gray-lighter;
@jumbotron-heading-color: inherit; @jumbotron-heading-color: inherit;
@jumbotron-font-size: ceil((@font-size-base * 1.5)); @jumbotron-font-size: ceil((@font-size-base * 1.5));
@jumbotron-heading-font-size: ceil((@font-size-base * 4.5));
//== Form states and alerts //== Form states and alerts