1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-22 13:13:03 +02:00
This commit is contained in:
Mark Otto
2017-08-14 20:23:45 -07:00
parent a80198db4d
commit ca7b7cd377
35 changed files with 205 additions and 207 deletions

View File

@@ -597,11 +597,11 @@ pre code {
}
.container {
width: 100%;
margin-right: auto;
margin-left: auto;
padding-right: 15px;
padding-left: 15px;
width: 100%;
}
@media (min-width: 576px) {
@@ -634,7 +634,6 @@ pre code {
margin-left: auto;
padding-right: 15px;
padding-left: 15px;
width: 100%;
}
.row {
@@ -1728,16 +1727,13 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
.form-check-inline {
display: inline-block;
margin-right: 0.75rem;
}
.form-check-inline .form-check-label {
vertical-align: middle;
}
.form-check-inline + .form-check-inline {
margin-left: 0.75rem;
}
.invalid-feedback {
display: none;
margin-top: .25rem;
@@ -2442,36 +2438,26 @@ fieldset[disabled] a.btn {
.btn-link {
font-weight: normal;
color: #007bff;
background-color: transparent;
border-radius: 0;
}
.btn-link, .btn-link:active, .btn-link.active, .btn-link:disabled {
.btn-link:hover {
color: #0056b3;
text-decoration: underline;
background-color: transparent;
border-color: transparent;
}
.btn-link, .btn-link:focus, .btn-link:active {
.btn-link:focus, .btn-link.focus {
border-color: transparent;
box-shadow: none;
}
.btn-link:hover {
border-color: transparent;
}
.btn-link:focus, .btn-link:hover {
color: #0056b3;
text-decoration: underline;
background-color: transparent;
}
.btn-link:disabled {
.btn-link:disabled, .btn-link.disabled {
color: #868e96;
}
.btn-link:disabled:focus, .btn-link:disabled:hover {
text-decoration: none;
}
.btn-lg, .btn-group-lg > .btn {
padding: 0.5rem 1rem;
font-size: 1.25rem;
@@ -2651,7 +2637,6 @@ tbody.collapse.show {
position: relative;
-ms-flex: 0 1 auto;
flex: 0 1 auto;
margin-bottom: 0;
}
.btn-group > .btn:hover,
@@ -2748,8 +2733,6 @@ tbody.collapse.show {
}
.btn-group-vertical {
display: -ms-inline-flexbox;
display: inline-flex;
-ms-flex-direction: column;
flex-direction: column;
-ms-flex-align: start;
@@ -2775,12 +2758,12 @@ tbody.collapse.show {
border-radius: 0;
}
.btn-group-vertical > .btn:first-child:not(:last-child) {
.btn-group-vertical:first-child:not(:last-child) {
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
}
.btn-group-vertical > .btn:last-child:not(:first-child) {
.btn-group-vertical:last-child:not(:first-child) {
border-top-left-radius: 0;
border-top-right-radius: 0;
}
@@ -3754,10 +3737,19 @@ tbody.collapse.show {
border-bottom-left-radius: calc(0.25rem - 1px);
}
.card-deck {
display: -ms-flexbox;
display: flex;
-ms-flex-direction: column;
flex-direction: column;
}
.card-deck .card {
margin-bottom: 15px;
}
@media (min-width: 576px) {
.card-deck {
display: -ms-flexbox;
display: flex;
-ms-flex-flow: row wrap;
flex-flow: row wrap;
margin-right: -15px;
@@ -3771,14 +3763,24 @@ tbody.collapse.show {
-ms-flex-direction: column;
flex-direction: column;
margin-right: 15px;
margin-bottom: 0;
margin-left: 15px;
}
}
.card-group {
display: -ms-flexbox;
display: flex;
-ms-flex-direction: column;
flex-direction: column;
}
.card-group .card {
margin-bottom: 15px;
}
@media (min-width: 576px) {
.card-group {
display: -ms-flexbox;
display: flex;
-ms-flex-flow: row wrap;
flex-flow: row wrap;
}
@@ -3787,6 +3789,7 @@ tbody.collapse.show {
flex: 1 0 0%;
}
.card-group .card + .card {
margin-bottom: 0;
margin-left: 0;
border-left: 0;
}