Skip to content

B
bootstrap
Commit 510f56f3 authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch 'master' into fix_15830 

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
parents a2c69b81 9c41aee7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 390 additions and 114 deletions
CONTRIBUTING.md
View file @ 510f56f3
...@@ -66,7 +66,7 @@ Guidelines for bug reports: ...@@ -66,7 +66,7 @@ Guidelines for bug reports:
latest `master` or development branch in the repository. latest `master` or development branch in the repository.
3. **Isolate the problem** — ideally create a [reduced test 3. **Isolate the problem** — ideally create a [reduced test
case](http://css-tricks.com/6263-reduced-test-cases/) and a live example. case](https://css-tricks.com/reduced-test-cases/) and a live example.
[This JS Bin](http://jsbin.com/lefey/1/edit?html,output) is a helpful template. [This JS Bin](http://jsbin.com/lefey/1/edit?html,output) is a helpful template.
......
dist/css/bootstrap-theme.css
View file @ 510f56f3
...@@ -29,6 +29,27 @@ ...@@ -29,6 +29,27 @@
-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125); -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125); box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
} }
.btn-default.disabled,
.btn-primary.disabled,
.btn-success.disabled,
.btn-info.disabled,
.btn-warning.disabled,
.btn-danger.disabled,
.btn-default[disabled],
.btn-primary[disabled],
.btn-success[disabled],
.btn-info[disabled],
.btn-warning[disabled],
.btn-danger[disabled],
fieldset[disabled] .btn-default,
fieldset[disabled] .btn-primary,
fieldset[disabled] .btn-success,
fieldset[disabled] .btn-info,
fieldset[disabled] .btn-warning,
fieldset[disabled] .btn-danger {
-webkit-box-shadow: none;
box-shadow: none;
}
.btn-default .badge, .btn-default .badge,
.btn-primary .badge, .btn-primary .badge,
.btn-success .badge, .btn-success .badge,
...@@ -64,8 +85,23 @@ ...@@ -64,8 +85,23 @@
border-color: #dbdbdb; border-color: #dbdbdb;
} }
.btn-default.disabled, .btn-default.disabled,
.btn-default:disabled, .btn-default[disabled],
.btn-default[disabled] { fieldset[disabled] .btn-default,
.btn-default.disabled:hover,
.btn-default[disabled]:hover,
fieldset[disabled] .btn-default:hover,
.btn-default.disabled:focus,
.btn-default[disabled]:focus,
fieldset[disabled] .btn-default:focus,
.btn-default.disabled.focus,
.btn-default[disabled].focus,
fieldset[disabled] .btn-default.focus,
.btn-default.disabled:active,
.btn-default[disabled]:active,
fieldset[disabled] .btn-default:active,
.btn-default.disabled.active,
.btn-default[disabled].active,
fieldset[disabled] .btn-default.active {
background-color: #e0e0e0; background-color: #e0e0e0;
background-image: none; background-image: none;
} }
...@@ -90,8 +126,23 @@ ...@@ -90,8 +126,23 @@
border-color: #245580; border-color: #245580;
} }
.btn-primary.disabled, .btn-primary.disabled,
.btn-primary:disabled, .btn-primary[disabled],
.btn-primary[disabled] { fieldset[disabled] .btn-primary,
.btn-primary.disabled:hover,
.btn-primary[disabled]:hover,
fieldset[disabled] .btn-primary:hover,
.btn-primary.disabled:focus,
.btn-primary[disabled]:focus,
fieldset[disabled] .btn-primary:focus,
.btn-primary.disabled.focus,
.btn-primary[disabled].focus,
fieldset[disabled] .btn-primary.focus,
.btn-primary.disabled:active,
.btn-primary[disabled]:active,
fieldset[disabled] .btn-primary:active,
.btn-primary.disabled.active,
.btn-primary[disabled].active,
fieldset[disabled] .btn-primary.active {
background-color: #265a88; background-color: #265a88;
background-image: none; background-image: none;
} }
...@@ -116,8 +167,23 @@ ...@@ -116,8 +167,23 @@
border-color: #3e8f3e; border-color: #3e8f3e;
} }
.btn-success.disabled, .btn-success.disabled,
.btn-success:disabled, .btn-success[disabled],
.btn-success[disabled] { fieldset[disabled] .btn-success,
.btn-success.disabled:hover,
.btn-success[disabled]:hover,
fieldset[disabled] .btn-success:hover,
.btn-success.disabled:focus,
.btn-success[disabled]:focus,
fieldset[disabled] .btn-success:focus,
.btn-success.disabled.focus,
.btn-success[disabled].focus,
fieldset[disabled] .btn-success.focus,
.btn-success.disabled:active,
.btn-success[disabled]:active,
fieldset[disabled] .btn-success:active,
.btn-success.disabled.active,
.btn-success[disabled].active,
fieldset[disabled] .btn-success.active {
background-color: #419641; background-color: #419641;
background-image: none; background-image: none;
} }
...@@ -142,8 +208,23 @@ ...@@ -142,8 +208,23 @@
border-color: #28a4c9; border-color: #28a4c9;
} }
.btn-info.disabled, .btn-info.disabled,
.btn-info:disabled, .btn-info[disabled],
.btn-info[disabled] { fieldset[disabled] .btn-info,
.btn-info.disabled:hover,
.btn-info[disabled]:hover,
fieldset[disabled] .btn-info:hover,
.btn-info.disabled:focus,
.btn-info[disabled]:focus,
fieldset[disabled] .btn-info:focus,
.btn-info.disabled.focus,
.btn-info[disabled].focus,
fieldset[disabled] .btn-info.focus,
.btn-info.disabled:active,
.btn-info[disabled]:active,
fieldset[disabled] .btn-info:active,
.btn-info.disabled.active,
.btn-info[disabled].active,
fieldset[disabled] .btn-info.active {
background-color: #2aabd2; background-color: #2aabd2;
background-image: none; background-image: none;
} }
...@@ -168,8 +249,23 @@ ...@@ -168,8 +249,23 @@
border-color: #e38d13; border-color: #e38d13;
} }
.btn-warning.disabled, .btn-warning.disabled,
.btn-warning:disabled, .btn-warning[disabled],
.btn-warning[disabled] { fieldset[disabled] .btn-warning,
.btn-warning.disabled:hover,
.btn-warning[disabled]:hover,
fieldset[disabled] .btn-warning:hover,
.btn-warning.disabled:focus,
.btn-warning[disabled]:focus,
fieldset[disabled] .btn-warning:focus,
.btn-warning.disabled.focus,
.btn-warning[disabled].focus,
fieldset[disabled] .btn-warning.focus,
.btn-warning.disabled:active,
.btn-warning[disabled]:active,
fieldset[disabled] .btn-warning:active,
.btn-warning.disabled.active,
.btn-warning[disabled].active,
fieldset[disabled] .btn-warning.active {
background-color: #eb9316; background-color: #eb9316;
background-image: none; background-image: none;
} }
...@@ -194,8 +290,23 @@ ...@@ -194,8 +290,23 @@
border-color: #b92c28; border-color: #b92c28;
} }
.btn-danger.disabled, .btn-danger.disabled,
.btn-danger:disabled, .btn-danger[disabled],
.btn-danger[disabled] { fieldset[disabled] .btn-danger,
.btn-danger.disabled:hover,
.btn-danger[disabled]:hover,
fieldset[disabled] .btn-danger:hover,
.btn-danger.disabled:focus,
.btn-danger[disabled]:focus,
fieldset[disabled] .btn-danger:focus,
.btn-danger.disabled.focus,
.btn-danger[disabled].focus,
fieldset[disabled] .btn-danger.focus,
.btn-danger.disabled:active,
.btn-danger[disabled]:active,
fieldset[disabled] .btn-danger:active,
.btn-danger.disabled.active,
.btn-danger[disabled].active,
fieldset[disabled] .btn-danger.active {
background-color: #c12e2a; background-color: #c12e2a;
background-image: none; background-image: none;
} }
......
dist/css/bootstrap-theme.css.map
View file @ 510f56f3
This diff was suppressed by a .gitattributes entry.
dist/css/bootstrap-theme.min.css
View file @ 510f56f3
This diff is collapsed.
dist/css/bootstrap.css
View file @ 510f56f3
...@@ -2728,18 +2728,18 @@ select[multiple].input-sm { ...@@ -2728,18 +2728,18 @@ select[multiple].input-sm {
line-height: 1.5; line-height: 1.5;
border-radius: 3px; border-radius: 3px;
} }
select.form-group-sm .form-control { .form-group-sm select.form-control {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
} }
textarea.form-group-sm .form-control, .form-group-sm textarea.form-control,
select[multiple].form-group-sm .form-control { .form-group-sm select[multiple].form-control {
height: auto; height: auto;
} }
.form-group-sm .form-control-static { .form-group-sm .form-control-static {
height: 30px; height: 30px;
min-height: 32px; min-height: 32px;
padding: 5px 10px; padding: 6px 10px;
font-size: 12px; font-size: 12px;
line-height: 1.5; line-height: 1.5;
} }
...@@ -2765,18 +2765,18 @@ select[multiple].input-lg { ...@@ -2765,18 +2765,18 @@ select[multiple].input-lg {
line-height: 1.3333333; line-height: 1.3333333;
border-radius: 6px; border-radius: 6px;
} }
select.form-group-lg .form-control { .form-group-lg select.form-control {
height: 46px; height: 46px;
line-height: 46px; line-height: 46px;
} }
textarea.form-group-lg .form-control, .form-group-lg textarea.form-control,
select[multiple].form-group-lg .form-control { .form-group-lg select[multiple].form-control {
height: auto; height: auto;
} }
.form-group-lg .form-control-static { .form-group-lg .form-control-static {
height: 46px; height: 46px;
min-height: 38px; min-height: 38px;
padding: 10px 16px; padding: 11px 16px;
font-size: 18px; font-size: 18px;
line-height: 1.3333333; line-height: 1.3333333;
} }
...@@ -2798,12 +2798,14 @@ select[multiple].form-group-lg .form-control { ...@@ -2798,12 +2798,14 @@ select[multiple].form-group-lg .form-control {
text-align: center; text-align: center;
pointer-events: none; pointer-events: none;
} }
.input-lg + .form-control-feedback { .input-lg + .form-control-feedback,
.input-group-lg + .form-control-feedback {
width: 46px; width: 46px;
height: 46px; height: 46px;
line-height: 46px; line-height: 46px;
} }
.input-sm + .form-control-feedback { .input-sm + .form-control-feedback,
.input-group-sm + .form-control-feedback {
width: 30px; width: 30px;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
...@@ -2989,11 +2991,13 @@ select[multiple].form-group-lg .form-control { ...@@ -2989,11 +2991,13 @@ select[multiple].form-group-lg .form-control {
@media (min-width: 768px) { @media (min-width: 768px) {
.form-horizontal .form-group-lg .control-label { .form-horizontal .form-group-lg .control-label {
padding-top: 14.333333px; padding-top: 14.333333px;
font-size: 18px;
} }
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.form-horizontal .form-group-sm .control-label { .form-horizontal .form-group-sm .control-label {
padding-top: 6px; padding-top: 6px;
font-size: 12px;
} }
} }
.btn { .btn {
...@@ -6542,7 +6546,7 @@ button.close { ...@@ -6542,7 +6546,7 @@ button.close {
display: block !important; display: block !important;
} }
table.visible-xs { table.visible-xs {
display: table; display: table !important;
} }
tr.visible-xs { tr.visible-xs {
display: table-row !important; display: table-row !important;
...@@ -6572,7 +6576,7 @@ button.close { ...@@ -6572,7 +6576,7 @@ button.close {
display: block !important; display: block !important;
} }
table.visible-sm { table.visible-sm {
display: table; display: table !important;
} }
tr.visible-sm { tr.visible-sm {
display: table-row !important; display: table-row !important;
...@@ -6602,7 +6606,7 @@ button.close { ...@@ -6602,7 +6606,7 @@ button.close {
display: block !important; display: block !important;
} }
table.visible-md { table.visible-md {
display: table; display: table !important;
} }
tr.visible-md { tr.visible-md {
display: table-row !important; display: table-row !important;
...@@ -6632,7 +6636,7 @@ button.close { ...@@ -6632,7 +6636,7 @@ button.close {
display: block !important; display: block !important;
} }
table.visible-lg { table.visible-lg {
display: table; display: table !important;
} }
tr.visible-lg { tr.visible-lg {
display: table-row !important; display: table-row !important;
...@@ -6685,7 +6689,7 @@ button.close { ...@@ -6685,7 +6689,7 @@ button.close {
display: block !important; display: block !important;
} }
table.visible-print { table.visible-print {
display: table; display: table !important;
} }
tr.visible-print { tr.visible-print {
display: table-row !important; display: table-row !important;
......
dist/css/bootstrap.css.map
View file @ 510f56f3
This diff was suppressed by a .gitattributes entry.
dist/css/bootstrap.min.css
View file @ 510f56f3
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/bootstrap.min.js
View file @ 510f56f3
This diff is collapsed.
docs/_includes/customizer-variables.html
View file @ 510f56f3
...@@ -1044,6 +1044,10 @@ ...@@ -1044,6 +1044,10 @@
<label for="input-@jumbotron-font-size">@jumbotron-font-size</label> <label for="input-@jumbotron-font-size">@jumbotron-font-size</label>
<input id="input-@jumbotron-font-size" type="text" value="ceil((@font-size-base * 1.5))" data-var="@jumbotron-font-size" class="form-control"/> <input id="input-@jumbotron-font-size" type="text" value="ceil((@font-size-base * 1.5))" data-var="@jumbotron-font-size" class="form-control"/>
</div> </div>
<div class="col-xs-4">
<label for="input-@jumbotron-heading-font-size">@jumbotron-heading-font-size</label>
<input id="input-@jumbotron-heading-font-size" type="text" value="ceil((@font-size-base * 4.5))" data-var="@jumbotron-heading-font-size" class="form-control"/>
</div>
</div> </div>
<h2 id="form-states-and-alerts">Form states and alerts</h2> <h2 id="form-states-and-alerts">Form states and alerts</h2>
<p>Define colors for form feedback states and, by default, alerts.</p> <p>Define colors for form feedback states and, by default, alerts.</p>
......
docs/_includes/js/modal.html
View file @ 510f56f3
...@@ -270,47 +270,47 @@ $('#myModal').on('shown.bs.modal', function () { ...@@ -270,47 +270,47 @@ $('#myModal').on('shown.bs.modal', function () {
</div><!-- /example --> </div><!-- /example -->
{% highlight html %} {% highlight html %}
<div class="modal fade" role="dialog" aria-labelledby="gridSystemModalLabel"> <div class="modal fade" role="dialog" aria-labelledby="gridSystemModalLabel">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="gridSystemModalLabel">Modal title</h4> <h4 class="modal-title" id="gridSystemModalLabel">Modal title</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-md-4">.col-md-4</div> <div class="col-md-4">.col-md-4</div>
<div class="col-md-4 col-md-offset-4">.col-md-4 .col-md-offset-4</div> <div class="col-md-4 col-md-offset-4">.col-md-4 .col-md-offset-4</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-3 col-md-offset-3">.col-md-3 .col-md-offset-3</div> <div class="col-md-3 col-md-offset-3">.col-md-3 .col-md-offset-3</div>
<div class="col-md-2 col-md-offset-4">.col-md-2 .col-md-offset-4</div> <div class="col-md-2 col-md-offset-4">.col-md-2 .col-md-offset-4</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6 col-md-offset-3">.col-md-6 .col-md-offset-3</div> <div class="col-md-6 col-md-offset-3">.col-md-6 .col-md-offset-3</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-9"> <div class="col-sm-9">
Level 1: .col-sm-9 Level 1: .col-sm-9
<div class="row"> <div class="row">
<div class="col-xs-8 col-sm-6"> <div class="col-xs-8 col-sm-6">
Level 2: .col-xs-8 .col-sm-6 Level 2: .col-xs-8 .col-sm-6
</div> </div>
<div class="col-xs-4 col-sm-6"> <div class="col-xs-4 col-sm-6">
Level 2: .col-xs-4 .col-sm-6 Level 2: .col-xs-4 .col-sm-6
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="modal-footer"> </div>
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button> <div class="modal-footer">
<button type="button" class="btn btn-primary">Save changes</button> <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div> <button type="button" class="btn btn-primary">Save changes</button>
</div><!-- /.modal-content --> </div>
</div><!-- /.modal-dialog --> </div><!-- /.modal-content -->
</div><!-- /.modal --> </div><!-- /.modal-dialog -->
</div><!-- /.modal -->
{% endhighlight %} {% endhighlight %}
......
docs/assets/css/src/docs.css
View file @ 510f56f3
...@@ -236,7 +236,7 @@ h4 code { ...@@ -236,7 +236,7 @@ h4 code {
.bs-docs-masthead, .bs-docs-masthead,
.bs-docs-header { .bs-docs-header {
position: relative; position: relative;
padding: 30px 15px; padding: 30px 0;
color: #cdbfe3; color: #cdbfe3;
text-align: center; text-align: center;
text-shadow: 0 1px 0 rgba(0,0,0,.1); text-shadow: 0 1px 0 rgba(0,0,0,.1);
......
docs/assets/js/customize.min.js
View file @ 510f56f3
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/assets/js/raw-files.min.js
View file @ 510f56f3
This diff is collapsed.
docs/dist/css/bootstrap-theme.css
View file @ 510f56f3
...@@ -29,6 +29,27 @@ ...@@ -29,6 +29,27 @@
-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125); -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125); box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
} }
.btn-default.disabled,
.btn-primary.disabled,
.btn-success.disabled,
.btn-info.disabled,
.btn-warning.disabled,
.btn-danger.disabled,
.btn-default[disabled],
.btn-primary[disabled],
.btn-success[disabled],
.btn-info[disabled],
.btn-warning[disabled],
.btn-danger[disabled],
fieldset[disabled] .btn-default,
fieldset[disabled] .btn-primary,
fieldset[disabled] .btn-success,
fieldset[disabled] .btn-info,
fieldset[disabled] .btn-warning,
fieldset[disabled] .btn-danger {
-webkit-box-shadow: none;
box-shadow: none;
}
.btn-default .badge, .btn-default .badge,
.btn-primary .badge, .btn-primary .badge,
.btn-success .badge, .btn-success .badge,
...@@ -64,8 +85,23 @@ ...@@ -64,8 +85,23 @@
border-color: #dbdbdb; border-color: #dbdbdb;
} }
.btn-default.disabled, .btn-default.disabled,
.btn-default:disabled, .btn-default[disabled],
.btn-default[disabled] { fieldset[disabled] .btn-default,
.btn-default.disabled:hover,
.btn-default[disabled]:hover,
fieldset[disabled] .btn-default:hover,
.btn-default.disabled:focus,
.btn-default[disabled]:focus,
fieldset[disabled] .btn-default:focus,
.btn-default.disabled.focus,
.btn-default[disabled].focus,
fieldset[disabled] .btn-default.focus,
.btn-default.disabled:active,
.btn-default[disabled]:active,
fieldset[disabled] .btn-default:active,
.btn-default.disabled.active,
.btn-default[disabled].active,
fieldset[disabled] .btn-default.active {
background-color: #e0e0e0; background-color: #e0e0e0;
background-image: none; background-image: none;
} }
...@@ -90,8 +126,23 @@ ...@@ -90,8 +126,23 @@
border-color: #245580; border-color: #245580;
} }
.btn-primary.disabled, .btn-primary.disabled,
.btn-primary:disabled, .btn-primary[disabled],
.btn-primary[disabled] { fieldset[disabled] .btn-primary,
.btn-primary.disabled:hover,
.btn-primary[disabled]:hover,
fieldset[disabled] .btn-primary:hover,
.btn-primary.disabled:focus,
.btn-primary[disabled]:focus,
fieldset[disabled] .btn-primary:focus,
.btn-primary.disabled.focus,
.btn-primary[disabled].focus,
fieldset[disabled] .btn-primary.focus,
.btn-primary.disabled:active,
.btn-primary[disabled]:active,
fieldset[disabled] .btn-primary:active,
.btn-primary.disabled.active,
.btn-primary[disabled].active,
fieldset[disabled] .btn-primary.active {
background-color: #265a88; background-color: #265a88;
background-image: none; background-image: none;
} }
...@@ -116,8 +167,23 @@ ...@@ -116,8 +167,23 @@
border-color: #3e8f3e; border-color: #3e8f3e;
} }
.btn-success.disabled, .btn-success.disabled,
.btn-success:disabled, .btn-success[disabled],
.btn-success[disabled] { fieldset[disabled] .btn-success,
.btn-success.disabled:hover,
.btn-success[disabled]:hover,
fieldset[disabled] .btn-success:hover,
.btn-success.disabled:focus,
.btn-success[disabled]:focus,
fieldset[disabled] .btn-success:focus,
.btn-success.disabled.focus,
.btn-success[disabled].focus,
fieldset[disabled] .btn-success.focus,
.btn-success.disabled:active,
.btn-success[disabled]:active,
fieldset[disabled] .btn-success:active,
.btn-success.disabled.active,
.btn-success[disabled].active,
fieldset[disabled] .btn-success.active {
background-color: #419641; background-color: #419641;
background-image: none; background-image: none;
} }
...@@ -142,8 +208,23 @@ ...@@ -142,8 +208,23 @@
border-color: #28a4c9; border-color: #28a4c9;
} }
.btn-info.disabled, .btn-info.disabled,
.btn-info:disabled, .btn-info[disabled],
.btn-info[disabled] { fieldset[disabled] .btn-info,
.btn-info.disabled:hover,
.btn-info[disabled]:hover,
fieldset[disabled] .btn-info:hover,
.btn-info.disabled:focus,
.btn-info[disabled]:focus,
fieldset[disabled] .btn-info:focus,
.btn-info.disabled.focus,
.btn-info[disabled].focus,
fieldset[disabled] .btn-info.focus,
.btn-info.disabled:active,
.btn-info[disabled]:active,
fieldset[disabled] .btn-info:active,
.btn-info.disabled.active,
.btn-info[disabled].active,
fieldset[disabled] .btn-info.active {
background-color: #2aabd2; background-color: #2aabd2;
background-image: none; background-image: none;
} }
...@@ -168,8 +249,23 @@ ...@@ -168,8 +249,23 @@
border-color: #e38d13; border-color: #e38d13;
} }
.btn-warning.disabled, .btn-warning.disabled,
.btn-warning:disabled, .btn-warning[disabled],
.btn-warning[disabled] { fieldset[disabled] .btn-warning,
.btn-warning.disabled:hover,
.btn-warning[disabled]:hover,
fieldset[disabled] .btn-warning:hover,
.btn-warning.disabled:focus,
.btn-warning[disabled]:focus,
fieldset[disabled] .btn-warning:focus,
.btn-warning.disabled.focus,
.btn-warning[disabled].focus,
fieldset[disabled] .btn-warning.focus,
.btn-warning.disabled:active,
.btn-warning[disabled]:active,
fieldset[disabled] .btn-warning:active,
.btn-warning.disabled.active,
.btn-warning[disabled].active,
fieldset[disabled] .btn-warning.active {
background-color: #eb9316; background-color: #eb9316;
background-image: none; background-image: none;
} }
...@@ -194,8 +290,23 @@ ...@@ -194,8 +290,23 @@
border-color: #b92c28; border-color: #b92c28;
} }
.btn-danger.disabled, .btn-danger.disabled,
.btn-danger:disabled, .btn-danger[disabled],
.btn-danger[disabled] { fieldset[disabled] .btn-danger,
.btn-danger.disabled:hover,
.btn-danger[disabled]:hover,
fieldset[disabled] .btn-danger:hover,
.btn-danger.disabled:focus,
.btn-danger[disabled]:focus,
fieldset[disabled] .btn-danger:focus,
.btn-danger.disabled.focus,
.btn-danger[disabled].focus,
fieldset[disabled] .btn-danger.focus,
.btn-danger.disabled:active,
.btn-danger[disabled]:active,
fieldset[disabled] .btn-danger:active,
.btn-danger.disabled.active,
.btn-danger[disabled].active,
fieldset[disabled] .btn-danger.active {
background-color: #c12e2a; background-color: #c12e2a;
background-image: none; background-image: none;
} }
......
docs/dist/css/bootstrap-theme.css.map
View file @ 510f56f3
This diff was suppressed by a .gitattributes entry.
docs/dist/css/bootstrap-theme.min.css
View file @ 510f56f3
This diff is collapsed.
docs/dist/css/bootstrap.css
View file @ 510f56f3
...@@ -2728,18 +2728,18 @@ select[multiple].input-sm { ...@@ -2728,18 +2728,18 @@ select[multiple].input-sm {
line-height: 1.5; line-height: 1.5;
border-radius: 3px; border-radius: 3px;
} }
select.form-group-sm .form-control { .form-group-sm select.form-control {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
} }
textarea.form-group-sm .form-control, .form-group-sm textarea.form-control,
select[multiple].form-group-sm .form-control { .form-group-sm select[multiple].form-control {
height: auto; height: auto;
} }
.form-group-sm .form-control-static { .form-group-sm .form-control-static {
height: 30px; height: 30px;
min-height: 32px; min-height: 32px;
padding: 5px 10px; padding: 6px 10px;
font-size: 12px; font-size: 12px;
line-height: 1.5; line-height: 1.5;
} }
...@@ -2765,18 +2765,18 @@ select[multiple].input-lg { ...@@ -2765,18 +2765,18 @@ select[multiple].input-lg {
line-height: 1.3333333; line-height: 1.3333333;
border-radius: 6px; border-radius: 6px;
} }
select.form-group-lg .form-control { .form-group-lg select.form-control {
height: 46px; height: 46px;
line-height: 46px; line-height: 46px;
} }
textarea.form-group-lg .form-control, .form-group-lg textarea.form-control,
select[multiple].form-group-lg .form-control { .form-group-lg select[multiple].form-control {
height: auto; height: auto;
} }
.form-group-lg .form-control-static { .form-group-lg .form-control-static {
height: 46px; height: 46px;
min-height: 38px; min-height: 38px;
padding: 10px 16px; padding: 11px 16px;
font-size: 18px; font-size: 18px;
line-height: 1.3333333; line-height: 1.3333333;
} }
...@@ -2798,12 +2798,14 @@ select[multiple].form-group-lg .form-control { ...@@ -2798,12 +2798,14 @@ select[multiple].form-group-lg .form-control {
text-align: center; text-align: center;
pointer-events: none; pointer-events: none;
} }
.input-lg + .form-control-feedback { .input-lg + .form-control-feedback,
.input-group-lg + .form-control-feedback {
width: 46px; width: 46px;
height: 46px; height: 46px;
line-height: 46px; line-height: 46px;
} }
.input-sm + .form-control-feedback { .input-sm + .form-control-feedback,
.input-group-sm + .form-control-feedback {
width: 30px; width: 30px;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
...@@ -2989,11 +2991,13 @@ select[multiple].form-group-lg .form-control { ...@@ -2989,11 +2991,13 @@ select[multiple].form-group-lg .form-control {
@media (min-width: 768px) { @media (min-width: 768px) {
.form-horizontal .form-group-lg .control-label { .form-horizontal .form-group-lg .control-label {
padding-top: 14.333333px; padding-top: 14.333333px;
font-size: 18px;
} }
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.form-horizontal .form-group-sm .control-label { .form-horizontal .form-group-sm .control-label {
padding-top: 6px; padding-top: 6px;
font-size: 12px;
} }
} }
.btn { .btn {
...@@ -6538,7 +6542,7 @@ button.close { ...@@ -6538,7 +6542,7 @@ button.close {
display: block !important; display: block !important;
} }
table.visible-xs { table.visible-xs {
display: table; display: table !important;
} }
tr.visible-xs { tr.visible-xs {
display: table-row !important; display: table-row !important;
...@@ -6568,7 +6572,7 @@ button.close { ...@@ -6568,7 +6572,7 @@ button.close {
display: block !important; display: block !important;
} }
table.visible-sm { table.visible-sm {
display: table; display: table !important;
} }
tr.visible-sm { tr.visible-sm {
display: table-row !important; display: table-row !important;
...@@ -6598,7 +6602,7 @@ button.close { ...@@ -6598,7 +6602,7 @@ button.close {
display: block !important; display: block !important;
} }
table.visible-md { table.visible-md {
display: table; display: table !important;
} }
tr.visible-md { tr.visible-md {
display: table-row !important; display: table-row !important;
...@@ -6628,7 +6632,7 @@ button.close { ...@@ -6628,7 +6632,7 @@ button.close {
display: block !important; display: block !important;
} }
table.visible-lg { table.visible-lg {
display: table; display: table !important;
} }
tr.visible-lg { tr.visible-lg {
display: table-row !important; display: table-row !important;
...@@ -6681,7 +6685,7 @@ button.close { ...@@ -6681,7 +6685,7 @@ button.close {
display: block !important; display: block !important;
} }
table.visible-print { table.visible-print {
display: table; display: table !important;
} }
tr.visible-print { tr.visible-print {
display: table-row !important; display: table-row !important;
......
docs/dist/css/bootstrap.css.map
View file @ 510f56f3
This diff was suppressed by a .gitattributes entry.
docs/dist/css/bootstrap.min.css
View file @ 510f56f3
This source diff could not be displayed because it is too large. You can view the blob instead.
less/forms.less
View file @ 510f56f3
...@@ -322,14 +322,26 @@ input[type="checkbox"] { ...@@ -322,14 +322,26 @@ input[type="checkbox"] {
} }
.form-group-sm { .form-group-sm {
.form-control { .form-control {
.input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @input-border-radius-small);
}
.form-control-static {
height: @input-height-small; height: @input-height-small;
padding: @padding-small-vertical @padding-small-horizontal; padding: @padding-small-vertical @padding-small-horizontal;
font-size: @font-size-small; font-size: @font-size-small;
line-height: @line-height-small; line-height: @line-height-small;
border-radius: @input-border-radius-small;
}
select.form-control {
height: @input-height-small;
line-height: @input-height-small;
}
textarea.form-control,
select[multiple].form-control {
height: auto;
}
.form-control-static {
height: @input-height-small;
min-height: (@line-height-computed + @font-size-small); min-height: (@line-height-computed + @font-size-small);
padding: (@padding-small-vertical + 1) @padding-small-horizontal;
font-size: @font-size-small;
line-height: @line-height-small;
} }
} }
...@@ -338,14 +350,26 @@ input[type="checkbox"] { ...@@ -338,14 +350,26 @@ input[type="checkbox"] {
} }
.form-group-lg { .form-group-lg {
.form-control { .form-control {
.input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @input-border-radius-large);
}
.form-control-static {
height: @input-height-large; height: @input-height-large;
padding: @padding-large-vertical @padding-large-horizontal; padding: @padding-large-vertical @padding-large-horizontal;
font-size: @font-size-large; font-size: @font-size-large;
line-height: @line-height-large; line-height: @line-height-large;
border-radius: @input-border-radius-large;
}
select.form-control {
height: @input-height-large;
line-height: @input-height-large;
}
textarea.form-control,
select[multiple].form-control {
height: auto;
}
.form-control-static {
height: @input-height-large;
min-height: (@line-height-computed + @font-size-large); min-height: (@line-height-computed + @font-size-large);
padding: (@padding-large-vertical + 1) @padding-large-horizontal;
font-size: @font-size-large;
line-height: @line-height-large;
} }
} }
...@@ -376,12 +400,14 @@ input[type="checkbox"] { ...@@ -376,12 +400,14 @@ input[type="checkbox"] {
text-align: center; text-align: center;
pointer-events: none; pointer-events: none;
} }
.input-lg + .form-control-feedback { .input-lg + .form-control-feedback,
.input-group-lg + .form-control-feedback {
width: @input-height-large; width: @input-height-large;
height: @input-height-large; height: @input-height-large;
line-height: @input-height-large; line-height: @input-height-large;
} }
.input-sm + .form-control-feedback { .input-sm + .form-control-feedback,
.input-group-sm + .form-control-feedback {
width: @input-height-small; width: @input-height-small;
height: @input-height-small; height: @input-height-small;
line-height: @input-height-small; line-height: @input-height-small;
...@@ -561,6 +587,7 @@ input[type="checkbox"] { ...@@ -561,6 +587,7 @@ input[type="checkbox"] {
@media (min-width: @screen-sm-min) { @media (min-width: @screen-sm-min) {
.control-label { .control-label {
padding-top: ((@padding-large-vertical * @line-height-large) + 1); padding-top: ((@padding-large-vertical * @line-height-large) + 1);
font-size: @font-size-large;
} }
} }
} }
...@@ -568,6 +595,7 @@ input[type="checkbox"] { ...@@ -568,6 +595,7 @@ input[type="checkbox"] {
@media (min-width: @screen-sm-min) { @media (min-width: @screen-sm-min) {
.control-label { .control-label {
padding-top: (@padding-small-vertical + 1); padding-top: (@padding-small-vertical + 1);
font-size: @font-size-small;
} }
} }
} }
......
less/mixins/responsive-visibility.less
View file @ 510f56f3
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
// More easily include all the states for responsive-utilities.less. // More easily include all the states for responsive-utilities.less.
.responsive-visibility() { .responsive-visibility() {
display: block !important; display: block !important;
table& { display: table; } table& { display: table !important; }
tr& { display: table-row !important; } tr& { display: table-row !important; }
th&, th&,
td& { display: table-cell !important; } td& { display: table-cell !important; }
......
less/theme.less
View file @ 510f56f3
...@@ -28,6 +28,12 @@ ...@@ -28,6 +28,12 @@
.box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
} }
&.disabled,
&[disabled],
fieldset[disabled] & {
.box-shadow(none);
}
.badge { .badge {
text-shadow: none; text-shadow: none;
} }
...@@ -53,10 +59,17 @@ ...@@ -53,10 +59,17 @@
} }
&.disabled, &.disabled,
&:disabled, &[disabled],
&[disabled] { fieldset[disabled] & {
background-color: darken(@btn-color, 12%); &,
background-image: none; &:hover,
&:focus,
&.focus,
&:active,
&.active {
background-color: darken(@btn-color, 12%);
background-image: none;
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment