aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-11-26 16:55:18 -0800
committerGitHub <[email protected]>2016-11-26 16:55:18 -0800
commite17e75b7574d6877facb0eadd977c025a09fd749 (patch)
tree13a29b80206c5daf873ea1564a7c0e8be2485273 /dist/css/bootstrap.css
parentb456cb351d056b5884e9f0c089b28e84f08ee256 (diff)
downloadbootstrap-e17e75b7574d6877facb0eadd977c025a09fd749.tar.xz
bootstrap-e17e75b7574d6877facb0eadd977c025a09fd749.zip
Update inline forms (updated docs and new flexbox styles) (#21212)
* fix form-inline with flex enabled * grunt * fix alignment of labels * shorter if syntax * add new form example to docs for now * update inline form docs usage guidelines * responsive margins * better margin utils * fix sizing of .form-check * flexbox alignment of .form-check * no need to change direction * support custom controls in inline form, for default and flex modes * add example of custom select and checks to docs * remove hidden and visible label variants since we cover that in the usage guidelines at the start and include hidden labels everywhere * use property value instead of layout name * apply to all labels * add a visible label, space it out * add id
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css4
1 files changed, 2 insertions, 2 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 531a02965..d86305c65 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2315,8 +2315,8 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
@media (min-width: 576px) {
.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 +2327,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,