mirror of
https://github.com/twbs/bootstrap.git
synced 2024-12-01 13:24:25 +01:00
Merge branch 'master' into new_striped_progress_bar_class
This commit is contained in:
commit
d4eb5552b3
30
dist/css/bootstrap-theme.css
vendored
30
dist/css/bootstrap-theme.css
vendored
@ -55,6 +55,11 @@
|
|||||||
background-color: #e0e0e0;
|
background-color: #e0e0e0;
|
||||||
border-color: #dbdbdb;
|
border-color: #dbdbdb;
|
||||||
}
|
}
|
||||||
|
.btn-default:disabled,
|
||||||
|
.btn-default[disabled] {
|
||||||
|
background-color: #e0e0e0;
|
||||||
|
background-image: none;
|
||||||
|
}
|
||||||
.btn-primary {
|
.btn-primary {
|
||||||
background-image: -webkit-linear-gradient(top, #428bca 0%, #2d6ca2 100%);
|
background-image: -webkit-linear-gradient(top, #428bca 0%, #2d6ca2 100%);
|
||||||
background-image: -o-linear-gradient(top, #428bca 0%, #2d6ca2 100%);
|
background-image: -o-linear-gradient(top, #428bca 0%, #2d6ca2 100%);
|
||||||
@ -75,6 +80,11 @@
|
|||||||
background-color: #2d6ca2;
|
background-color: #2d6ca2;
|
||||||
border-color: #2b669a;
|
border-color: #2b669a;
|
||||||
}
|
}
|
||||||
|
.btn-primary:disabled,
|
||||||
|
.btn-primary[disabled] {
|
||||||
|
background-color: #2d6ca2;
|
||||||
|
background-image: none;
|
||||||
|
}
|
||||||
.btn-success {
|
.btn-success {
|
||||||
background-image: -webkit-linear-gradient(top, #5cb85c 0%, #419641 100%);
|
background-image: -webkit-linear-gradient(top, #5cb85c 0%, #419641 100%);
|
||||||
background-image: -o-linear-gradient(top, #5cb85c 0%, #419641 100%);
|
background-image: -o-linear-gradient(top, #5cb85c 0%, #419641 100%);
|
||||||
@ -95,6 +105,11 @@
|
|||||||
background-color: #419641;
|
background-color: #419641;
|
||||||
border-color: #3e8f3e;
|
border-color: #3e8f3e;
|
||||||
}
|
}
|
||||||
|
.btn-success:disabled,
|
||||||
|
.btn-success[disabled] {
|
||||||
|
background-color: #419641;
|
||||||
|
background-image: none;
|
||||||
|
}
|
||||||
.btn-info {
|
.btn-info {
|
||||||
background-image: -webkit-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
|
background-image: -webkit-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
|
||||||
background-image: -o-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
|
background-image: -o-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
|
||||||
@ -115,6 +130,11 @@
|
|||||||
background-color: #2aabd2;
|
background-color: #2aabd2;
|
||||||
border-color: #28a4c9;
|
border-color: #28a4c9;
|
||||||
}
|
}
|
||||||
|
.btn-info:disabled,
|
||||||
|
.btn-info[disabled] {
|
||||||
|
background-color: #2aabd2;
|
||||||
|
background-image: none;
|
||||||
|
}
|
||||||
.btn-warning {
|
.btn-warning {
|
||||||
background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
|
background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
|
||||||
background-image: -o-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
|
background-image: -o-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
|
||||||
@ -135,6 +155,11 @@
|
|||||||
background-color: #eb9316;
|
background-color: #eb9316;
|
||||||
border-color: #e38d13;
|
border-color: #e38d13;
|
||||||
}
|
}
|
||||||
|
.btn-warning:disabled,
|
||||||
|
.btn-warning[disabled] {
|
||||||
|
background-color: #eb9316;
|
||||||
|
background-image: none;
|
||||||
|
}
|
||||||
.btn-danger {
|
.btn-danger {
|
||||||
background-image: -webkit-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
|
background-image: -webkit-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
|
||||||
background-image: -o-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
|
background-image: -o-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
|
||||||
@ -155,6 +180,11 @@
|
|||||||
background-color: #c12e2a;
|
background-color: #c12e2a;
|
||||||
border-color: #b92c28;
|
border-color: #b92c28;
|
||||||
}
|
}
|
||||||
|
.btn-danger:disabled,
|
||||||
|
.btn-danger[disabled] {
|
||||||
|
background-color: #c12e2a;
|
||||||
|
background-image: none;
|
||||||
|
}
|
||||||
.thumbnail,
|
.thumbnail,
|
||||||
.img-thumbnail {
|
.img-thumbnail {
|
||||||
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
|
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
|
||||||
|
2
dist/css/bootstrap-theme.css.map
vendored
2
dist/css/bootstrap-theme.css.map
vendored
File diff suppressed because one or more lines are too long
2
dist/css/bootstrap-theme.min.css
vendored
2
dist/css/bootstrap-theme.min.css
vendored
File diff suppressed because one or more lines are too long
9
dist/css/bootstrap.css
vendored
9
dist/css/bootstrap.css
vendored
@ -3200,6 +3200,7 @@ tbody.collapse.in {
|
|||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
line-height: 1.42857143;
|
line-height: 1.42857143;
|
||||||
color: #777;
|
color: #777;
|
||||||
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
.dropdown-backdrop {
|
.dropdown-backdrop {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
@ -4866,7 +4867,13 @@ a.list-group-item:focus {
|
|||||||
}
|
}
|
||||||
.list-group-item.active .list-group-item-heading,
|
.list-group-item.active .list-group-item-heading,
|
||||||
.list-group-item.active:hover .list-group-item-heading,
|
.list-group-item.active:hover .list-group-item-heading,
|
||||||
.list-group-item.active:focus .list-group-item-heading {
|
.list-group-item.active:focus .list-group-item-heading,
|
||||||
|
.list-group-item.active .list-group-item-heading > small,
|
||||||
|
.list-group-item.active:hover .list-group-item-heading > small,
|
||||||
|
.list-group-item.active:focus .list-group-item-heading > small,
|
||||||
|
.list-group-item.active .list-group-item-heading > .small,
|
||||||
|
.list-group-item.active:hover .list-group-item-heading > .small,
|
||||||
|
.list-group-item.active:focus .list-group-item-heading > .small {
|
||||||
color: inherit;
|
color: inherit;
|
||||||
}
|
}
|
||||||
.list-group-item.active .list-group-item-text,
|
.list-group-item.active .list-group-item-text,
|
||||||
|
2
dist/css/bootstrap.css.map
vendored
2
dist/css/bootstrap.css.map
vendored
File diff suppressed because one or more lines are too long
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
@ -22,6 +22,7 @@
|
|||||||
|
|
||||||
<h3 id="panels-heading">Panel with heading</h3>
|
<h3 id="panels-heading">Panel with heading</h3>
|
||||||
<p>Easily add a heading container to your panel with <code>.panel-heading</code>. You may also include any <code><h1></code>-<code><h6></code> with a <code>.panel-title</code> class to add a pre-styled heading.</p>
|
<p>Easily add a heading container to your panel with <code>.panel-heading</code>. You may also include any <code><h1></code>-<code><h6></code> with a <code>.panel-title</code> class to add a pre-styled heading.</p>
|
||||||
|
<p>For proper link coloring, be sure to place links in headings within <code>.panel-title</code>.</p>
|
||||||
<div class="bs-example">
|
<div class="bs-example">
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<div class="panel-heading">Panel heading without title</div>
|
<div class="panel-heading">Panel heading without title</div>
|
||||||
|
@ -1735,6 +1735,11 @@
|
|||||||
<input id="input-@page-header-border-color" type="text" value="@gray-lighter" data-var="@page-header-border-color" class="form-control"/>
|
<input id="input-@page-header-border-color" type="text" value="@gray-lighter" data-var="@page-header-border-color" class="form-control"/>
|
||||||
<p class="help-block">Page header border color</p>
|
<p class="help-block">Page header border color</p>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="bs-customizer-input">
|
||||||
|
<label for="input-@dl-horizontal-offset">@dl-horizontal-offset</label>
|
||||||
|
<input id="input-@dl-horizontal-offset" type="text" value="@component-offset-horizontal" data-var="@dl-horizontal-offset" class="form-control"/>
|
||||||
|
<p class="help-block">Width of horizontal description list titles</p>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<h2 id="miscellaneous">Miscellaneous</h2>
|
<h2 id="miscellaneous">Miscellaneous</h2>
|
||||||
<p></p>
|
<p></p>
|
||||||
|
2
docs/assets/js/customize.min.js
vendored
2
docs/assets/js/customize.min.js
vendored
File diff suppressed because one or more lines are too long
2
docs/assets/js/raw-files.min.js
vendored
2
docs/assets/js/raw-files.min.js
vendored
File diff suppressed because one or more lines are too long
2
docs/dist/css/bootstrap-theme.css.map
vendored
2
docs/dist/css/bootstrap-theme.css.map
vendored
File diff suppressed because one or more lines are too long
2
docs/dist/css/bootstrap-theme.min.css
vendored
2
docs/dist/css/bootstrap-theme.min.css
vendored
File diff suppressed because one or more lines are too long
2
docs/dist/css/bootstrap.css.map
vendored
2
docs/dist/css/bootstrap.css.map
vendored
File diff suppressed because one or more lines are too long
2
docs/dist/css/bootstrap.min.css
vendored
2
docs/dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
@ -131,10 +131,10 @@
|
|||||||
transform: scaleY(@ratio);
|
transform: scaleY(@ratio);
|
||||||
}
|
}
|
||||||
.skew(@x; @y) {
|
.skew(@x; @y) {
|
||||||
-webkit-transform: skew(@x, @y);
|
-webkit-transform: skewX(@x) skewY(@y);
|
||||||
-ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+
|
-ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+
|
||||||
-o-transform: skew(@x, @y);
|
-o-transform: skewX(@x) skewY(@y);
|
||||||
transform: skew(@x, @y);
|
transform: skewX(@x) skewY(@y);
|
||||||
}
|
}
|
||||||
.translate(@x; @y) {
|
.translate(@x; @y) {
|
||||||
-webkit-transform: translate(@x, @y);
|
-webkit-transform: translate(@x, @y);
|
||||||
|
@ -219,13 +219,13 @@ dd {
|
|||||||
@media (min-width: @grid-float-breakpoint) {
|
@media (min-width: @grid-float-breakpoint) {
|
||||||
dt {
|
dt {
|
||||||
float: left;
|
float: left;
|
||||||
width: (@component-offset-horizontal - 20);
|
width: (@dl-horizontal-offset - 20);
|
||||||
clear: left;
|
clear: left;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
.text-overflow();
|
.text-overflow();
|
||||||
}
|
}
|
||||||
dd {
|
dd {
|
||||||
margin-left: @component-offset-horizontal;
|
margin-left: @dl-horizontal-offset;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -836,6 +836,8 @@
|
|||||||
@blockquote-border-color: @gray-lighter;
|
@blockquote-border-color: @gray-lighter;
|
||||||
//** Page header border color
|
//** Page header border color
|
||||||
@page-header-border-color: @gray-lighter;
|
@page-header-border-color: @gray-lighter;
|
||||||
|
//** Width of horizontal description list titles
|
||||||
|
@dl-horizontal-offset: @component-offset-horizontal;
|
||||||
|
|
||||||
|
|
||||||
//== Miscellaneous
|
//== Miscellaneous
|
||||||
|
Loading…
Reference in New Issue
Block a user