Merge branch 'v4-dev' into colors-redux

2017-06-26 15:17:48 -07:00 · 2017-06-26 15:17:48 -07:00 · 41f4ddbdb5
parent 3db4984d18 0622a59897
commit 41f4ddbdb5
1 changed files with 1 additions and 1 deletions
--- 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;
    }