aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-06-29 23:01:35 -0700
committerGitHub <[email protected]>2017-06-29 23:01:35 -0700
commitac2ce9e412790f4abbf5e417b80425dee725c525 (patch)
tree21521fb1bc8be0cf844b5c1d9af5e2dea604a6b9 /dist/css/bootstrap.css
parent6fbceb2f704ac9701588ab3882988a62155135e0 (diff)
parentf46f26bbaa16486bdfe07789a1491cc05eec8dcb (diff)
downloadbootstrap-ac2ce9e412790f4abbf5e417b80425dee725c525.tar.xz
bootstrap-ac2ce9e412790f4abbf5e417b80425dee725c525.zip
Merge branch 'v4-dev' into colors-redux
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css2
1 files changed, 1 insertions, 1 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 4062c73a2..6d42c2798 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2542,7 +2542,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
width: auto;
vertical-align: middle;
}
- .form-inline .form-control-static {
+ .form-inline .form-control-plaintext {
display: inline-block;
}
.form-inline .input-group {