0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-29 21:52:22 +01:00
This commit is contained in:
Mark Otto 2016-11-26 17:01:17 -08:00
parent 7d3abdb9c7
commit 181e124bc1
16 changed files with 170 additions and 33 deletions

View File

@ -2575,7 +2575,26 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
flex-flow: row wrap;
}
.form-inline .form-check {
width: 100%;
}
@media (min-width: 576px) {
.form-inline label {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
-webkit-box-pack: center;
-webkit-justify-content: center;
-ms-flex-pack: center;
justify-content: center;
margin-bottom: 0;
}
.form-inline .form-group {
display: -webkit-box;
display: -webkit-flex;
@ -2606,10 +2625,21 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
vertical-align: middle;
}
.form-inline .form-check {
display: inline-block;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
-webkit-box-pack: center;
-webkit-justify-content: center;
-ms-flex-pack: center;
justify-content: center;
width: auto;
margin-top: 0;
margin-bottom: 0;
vertical-align: middle;
}
.form-inline .form-check-label {
padding-left: 0;
@ -2618,6 +2648,27 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
position: relative;
margin-left: 0;
}
.form-inline .custom-control {
padding-left: 0;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
-webkit-box-pack: center;
-webkit-justify-content: center;
-ms-flex-pack: center;
justify-content: center;
}
.form-inline .custom-control-indicator {
position: static;
display: inline-block;
margin-right: .25rem;
vertical-align: text-bottom;
}
.form-inline .has-feedback .form-control-feedback {
top: 0;
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -2313,6 +2313,9 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
}
@media (min-width: 576px) {
.form-inline label {
margin-bottom: 0;
}
.form-inline .form-group {
display: inline-block;
vertical-align: middle;
@ -2345,9 +2348,10 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
}
.form-inline .form-check {
display: inline-block;
vertical-align: middle;
width: auto;
margin-top: 0;
margin-bottom: 0;
vertical-align: middle;
}
.form-inline .form-check-label {
padding-left: 0;
@ -2356,6 +2360,15 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
position: relative;
margin-left: 0;
}
.form-inline .custom-control {
padding-left: 0;
vertical-align: middle;
}
.form-inline .custom-control-indicator {
position: static;
display: inline-block;
vertical-align: text-bottom;
}
.form-inline .has-feedback .form-control-feedback {
top: 0;
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -2565,11 +2565,49 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23d9534f' viewBox='-2 -2 7 7'%3E%3Cpath stroke='%23d9534f' d='M0 0l3 3m0-3L0 3'/%3E%3Ccircle r='.5'/%3E%3Ccircle cx='3' r='.5'/%3E%3Ccircle cy='3' r='.5'/%3E%3Ccircle cx='3' cy='3' r='.5'/%3E%3C/svg%3E");
}
.form-inline {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-flow: row wrap;
-ms-flex-flow: row wrap;
flex-flow: row wrap;
}
.form-inline .form-check {
width: 100%;
}
@media (min-width: 576px) {
.form-inline .form-group {
display: inline-block;
.form-inline label {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
-webkit-box-pack: center;
-webkit-justify-content: center;
-ms-flex-pack: center;
justify-content: center;
margin-bottom: 0;
}
.form-inline .form-group {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-flex: 0;
-webkit-flex: 0 0 auto;
-ms-flex: 0 0 auto;
flex: 0 0 auto;
-webkit-flex-flow: row wrap;
-ms-flex-flow: row wrap;
flex-flow: row wrap;
margin-bottom: 0;
vertical-align: middle;
}
.form-inline .form-control {
display: inline-block;
@ -2580,27 +2618,28 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
display: inline-block;
}
.form-inline .input-group {
display: inline-table;
width: auto;
vertical-align: middle;
}
.form-inline .input-group .input-group-addon,
.form-inline .input-group .input-group-btn,
.form-inline .input-group .form-control {
width: auto;
}
.form-inline .input-group > .form-control {
width: 100%;
}
.form-inline .form-control-label {
margin-bottom: 0;
vertical-align: middle;
}
.form-inline .form-check {
display: inline-block;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
-webkit-box-pack: center;
-webkit-justify-content: center;
-ms-flex-pack: center;
justify-content: center;
width: auto;
margin-top: 0;
margin-bottom: 0;
vertical-align: middle;
}
.form-inline .form-check-label {
padding-left: 0;
@ -2609,6 +2648,27 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
position: relative;
margin-left: 0;
}
.form-inline .custom-control {
padding-left: 0;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
-webkit-box-pack: center;
-webkit-justify-content: center;
-ms-flex-pack: center;
justify-content: center;
}
.form-inline .custom-control-indicator {
position: static;
display: inline-block;
margin-right: .25rem;
vertical-align: text-bottom;
}
.form-inline .has-feedback .form-control-feedback {
top: 0;
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -2313,10 +2313,13 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
}
@media (min-width: 576px) {
.form-inline label {
margin-bottom: 0;
}
.form-inline .form-group {
display: inline-block;
margin-bottom: 0;
vertical-align: middle;
margin-bottom: 0;
}
.form-inline .form-control {
display: inline-block;
@ -2327,8 +2330,8 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
display: inline-block;
}
.form-inline .input-group {
display: inline-table;
width: auto;
display: inline-table;
vertical-align: middle;
}
.form-inline .input-group .input-group-addon,
@ -2345,9 +2348,10 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
}
.form-inline .form-check {
display: inline-block;
vertical-align: middle;
width: auto;
margin-top: 0;
margin-bottom: 0;
vertical-align: middle;
}
.form-inline .form-check-label {
padding-left: 0;
@ -2356,6 +2360,15 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
position: relative;
margin-left: 0;
}
.form-inline .custom-control {
padding-left: 0;
vertical-align: middle;
}
.form-inline .custom-control-indicator {
position: static;
display: inline-block;
vertical-align: text-bottom;
}
.form-inline .has-feedback .form-control-feedback {
top: 0;
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long