aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-06-26 15:17:48 -0700
committerGitHub <[email protected]>2017-06-26 15:17:48 -0700
commit41f4ddbdb567c200a27bd78799d63971d634f5e8 (patch)
tree5f4a207ae70aba076d02e4f01c1f7b4b8fe082e0
parent3db4984d18a6435dc4a60dcf1d3375e04d650e5c (diff)
parent0622a59897c2482a29a270d1b57956456783af3a (diff)
downloadbootstrap-41f4ddbdb567c200a27bd78799d63971d634f5e8.tar.xz
bootstrap-41f4ddbdb567c200a27bd78799d63971d634f5e8.zip
Merge branch 'v4-dev' into colors-redux
-rw-r--r--scss/_forms.scss2
1 files changed, 1 insertions, 1 deletions
diff --git a/scss/_forms.scss b/scss/_forms.scss
index ecf0a3df1..519554b47 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -335,7 +335,7 @@ select.form-control-lg {
}
// Make static controls behave like regular ones
- .form-control-static {
+ .form-control-plaintext {
display: inline-block;
}