mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-22 21:22:52 +02:00
Merge branch 'master' into pr/12462
Conflicts: dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
130
dist/css/bootstrap.css
vendored
130
dist/css/bootstrap.css
vendored
@@ -307,7 +307,11 @@ figure {
|
||||
img {
|
||||
vertical-align: middle;
|
||||
}
|
||||
.img-responsive {
|
||||
.img-responsive,
|
||||
.thumbnail > img,
|
||||
.thumbnail a > img,
|
||||
.carousel-inner > .item > img,
|
||||
.carousel-inner > .item > a > img {
|
||||
display: block;
|
||||
max-width: 100%;
|
||||
height: auto;
|
||||
@@ -1709,9 +1713,6 @@ output {
|
||||
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
|
||||
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
|
||||
}
|
||||
.form-control:-moz-placeholder {
|
||||
color: #999;
|
||||
}
|
||||
.form-control::-moz-placeholder {
|
||||
color: #999;
|
||||
opacity: 1;
|
||||
@@ -1732,6 +1733,9 @@ fieldset[disabled] .form-control {
|
||||
textarea.form-control {
|
||||
height: auto;
|
||||
}
|
||||
input[type="search"] {
|
||||
-webkit-appearance: none;
|
||||
}
|
||||
input[type="date"] {
|
||||
line-height: 34px;
|
||||
}
|
||||
@@ -1935,6 +1939,9 @@ select[multiple].input-lg {
|
||||
width: auto;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.form-inline .input-group > .form-control {
|
||||
width: 100%;
|
||||
}
|
||||
.form-inline .control-label {
|
||||
margin-bottom: 0;
|
||||
vertical-align: middle;
|
||||
@@ -1999,7 +2006,6 @@ select[multiple].input-lg {
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
-o-user-select: none;
|
||||
user-select: none;
|
||||
background-image: none;
|
||||
border: 1px solid transparent;
|
||||
@@ -2311,19 +2317,22 @@ fieldset[disabled] .btn-link:focus {
|
||||
color: #999;
|
||||
text-decoration: none;
|
||||
}
|
||||
.btn-lg {
|
||||
.btn-lg,
|
||||
.btn-group-lg > .btn {
|
||||
padding: 10px 16px;
|
||||
font-size: 18px;
|
||||
line-height: 1.33;
|
||||
border-radius: 6px;
|
||||
}
|
||||
.btn-sm {
|
||||
.btn-sm,
|
||||
.btn-group-sm > .btn {
|
||||
padding: 5px 10px;
|
||||
font-size: 12px;
|
||||
line-height: 1.5;
|
||||
border-radius: 3px;
|
||||
}
|
||||
.btn-xs {
|
||||
.btn-xs,
|
||||
.btn-group-xs > .btn {
|
||||
padding: 1px 5px;
|
||||
font-size: 12px;
|
||||
line-height: 1.5;
|
||||
@@ -3196,24 +3205,6 @@ input[type="button"].btn-block {
|
||||
.btn-group.open .dropdown-toggle {
|
||||
outline: 0;
|
||||
}
|
||||
.btn-group-xs > .btn {
|
||||
padding: 1px 5px;
|
||||
font-size: 12px;
|
||||
line-height: 1.5;
|
||||
border-radius: 3px;
|
||||
}
|
||||
.btn-group-sm > .btn {
|
||||
padding: 5px 10px;
|
||||
font-size: 12px;
|
||||
line-height: 1.5;
|
||||
border-radius: 3px;
|
||||
}
|
||||
.btn-group-lg > .btn {
|
||||
padding: 10px 16px;
|
||||
font-size: 18px;
|
||||
line-height: 1.33;
|
||||
border-radius: 6px;
|
||||
}
|
||||
.btn-group > .btn + .dropdown-toggle {
|
||||
padding-right: 8px;
|
||||
padding-left: 8px;
|
||||
@@ -3865,6 +3856,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
|
||||
width: auto;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.navbar-form .input-group > .form-control {
|
||||
width: 100%;
|
||||
}
|
||||
.navbar-form .control-label {
|
||||
margin-bottom: 0;
|
||||
vertical-align: middle;
|
||||
@@ -4416,9 +4410,6 @@ a.list-group-item.active > .badge,
|
||||
}
|
||||
.thumbnail > img,
|
||||
.thumbnail a > img {
|
||||
display: block;
|
||||
max-width: 100%;
|
||||
height: auto;
|
||||
margin-right: auto;
|
||||
margin-left: auto;
|
||||
}
|
||||
@@ -4771,6 +4762,31 @@ a.list-group-item-danger.active:focus {
|
||||
.panel-body {
|
||||
padding: 15px;
|
||||
}
|
||||
.panel-heading {
|
||||
padding: 10px 15px;
|
||||
border-bottom: 1px solid transparent;
|
||||
border-top-left-radius: 3px;
|
||||
border-top-right-radius: 3px;
|
||||
}
|
||||
.panel-heading > .dropdown .dropdown-toggle {
|
||||
color: inherit;
|
||||
}
|
||||
.panel-title {
|
||||
margin-top: 0;
|
||||
margin-bottom: 0;
|
||||
font-size: 16px;
|
||||
color: inherit;
|
||||
}
|
||||
.panel-title > a {
|
||||
color: inherit;
|
||||
}
|
||||
.panel-footer {
|
||||
padding: 10px 15px;
|
||||
background-color: #f5f5f5;
|
||||
border-top: 1px solid #ddd;
|
||||
border-bottom-right-radius: 3px;
|
||||
border-bottom-left-radius: 3px;
|
||||
}
|
||||
.panel > .list-group {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
@@ -4889,63 +4905,30 @@ a.list-group-item-danger.active:focus {
|
||||
.panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {
|
||||
border-right: 0;
|
||||
}
|
||||
.panel > .table-bordered > thead > tr:first-child > th,
|
||||
.panel > .table-responsive > .table-bordered > thead > tr:first-child > th,
|
||||
.panel > .table-bordered > tbody > tr:first-child > th,
|
||||
.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th,
|
||||
.panel > .table-bordered > tfoot > tr:first-child > th,
|
||||
.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > th,
|
||||
.panel > .table-bordered > thead > tr:first-child > td,
|
||||
.panel > .table-responsive > .table-bordered > thead > tr:first-child > td,
|
||||
.panel > .table-bordered > tbody > tr:first-child > td,
|
||||
.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td,
|
||||
.panel > .table-bordered > tfoot > tr:first-child > td,
|
||||
.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > td {
|
||||
border-top: 0;
|
||||
.panel > .table-bordered > thead > tr:first-child > th,
|
||||
.panel > .table-responsive > .table-bordered > thead > tr:first-child > th,
|
||||
.panel > .table-bordered > tbody > tr:first-child > th,
|
||||
.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th {
|
||||
border-bottom: 0;
|
||||
}
|
||||
.panel > .table-bordered > thead > tr:last-child > th,
|
||||
.panel > .table-responsive > .table-bordered > thead > tr:last-child > th,
|
||||
.panel > .table-bordered > tbody > tr:last-child > th,
|
||||
.panel > .table-responsive > .table-bordered > tbody > tr:last-child > th,
|
||||
.panel > .table-bordered > tfoot > tr:last-child > th,
|
||||
.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th,
|
||||
.panel > .table-bordered > thead > tr:last-child > td,
|
||||
.panel > .table-responsive > .table-bordered > thead > tr:last-child > td,
|
||||
.panel > .table-bordered > tbody > tr:last-child > td,
|
||||
.panel > .table-responsive > .table-bordered > tbody > tr:last-child > td,
|
||||
.panel > .table-bordered > tfoot > tr:last-child > td,
|
||||
.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td {
|
||||
.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td,
|
||||
.panel > .table-bordered > tbody > tr:last-child > th,
|
||||
.panel > .table-responsive > .table-bordered > tbody > tr:last-child > th,
|
||||
.panel > .table-bordered > tfoot > tr:last-child > th,
|
||||
.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th {
|
||||
border-bottom: 0;
|
||||
}
|
||||
.panel > .table-responsive {
|
||||
margin-bottom: 0;
|
||||
border: 0;
|
||||
}
|
||||
.panel-heading {
|
||||
padding: 10px 15px;
|
||||
border-bottom: 1px solid transparent;
|
||||
border-top-left-radius: 3px;
|
||||
border-top-right-radius: 3px;
|
||||
}
|
||||
.panel-heading > .dropdown .dropdown-toggle {
|
||||
color: inherit;
|
||||
}
|
||||
.panel-title {
|
||||
margin-top: 0;
|
||||
margin-bottom: 0;
|
||||
font-size: 16px;
|
||||
color: inherit;
|
||||
}
|
||||
.panel-title > a {
|
||||
color: inherit;
|
||||
}
|
||||
.panel-footer {
|
||||
padding: 10px 15px;
|
||||
background-color: #f5f5f5;
|
||||
border-top: 1px solid #ddd;
|
||||
border-bottom-right-radius: 3px;
|
||||
border-bottom-left-radius: 3px;
|
||||
}
|
||||
.panel-group {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
@@ -5446,9 +5429,6 @@ button.close {
|
||||
}
|
||||
.carousel-inner > .item > img,
|
||||
.carousel-inner > .item > a > img {
|
||||
display: block;
|
||||
max-width: 100%;
|
||||
height: auto;
|
||||
line-height: 1;
|
||||
}
|
||||
.carousel-inner > .active,
|
||||
|
||||
Reference in New Issue
Block a user