Fixes #14221: Make .form-control-static work in inline forms as well

078aafe7 · Mark Otto · abbb4d64 · 078aafe7 · 078aafe7 · 078aafe7
Commit 078aafe7 authored 10 years ago by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 20 additions and 3 deletions
+20 -3
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2671,6 +2671,9 @@ select[multiple].form-group-lg .form-control {
    width: auto;
    vertical-align: middle;
  }
+  .form-inline .form-control-static {
+    display: inline-block;
+  }
  .form-inline .input-group {
    display: inline-table;
    vertical-align: middle;
@@ -4045,6 +4048,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
    width: auto;
    vertical-align: middle;
  }
+  .navbar-form .form-control-static {
+    display: inline-block;
+  }
  .navbar-form .input-group {
    display: inline-table;
    vertical-align: middle;

--- a/dist/css/bootstrap.css.map
+++ b/dist/css/bootstrap.css.map
--- a/dist/css/bootstrap.min.css
+++ b/dist/css/bootstrap.min.css
--- a/docs/assets/css/docs.min.css
+++ b/docs/assets/css/docs.min.css
--- a/docs/dist/css/bootstrap.css
+++ b/docs/dist/css/bootstrap.css
@@ -2671,6 +2671,9 @@ select[multiple].form-group-lg .form-control {
    width: auto;
    vertical-align: middle;
  }
+  .form-inline .form-control-static {
+    display: inline-block;
+  }
  .form-inline .input-group {
    display: inline-table;
    vertical-align: middle;
@@ -4045,6 +4048,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
    width: auto;
    vertical-align: middle;
  }
+  .navbar-form .form-control-static {
+    display: inline-block;
+  }
  .navbar-form .input-group {
    display: inline-table;
    vertical-align: middle;

--- a/docs/dist/css/bootstrap.css.map
+++ b/docs/dist/css/bootstrap.css.map
--- a/docs/dist/css/bootstrap.min.css
+++ b/docs/dist/css/bootstrap.min.css
--- a/less/forms.less
+++ b/less/forms.less
@@ -421,6 +421,11 @@ input[type="checkbox"] {
      vertical-align: middle;
    }

+    // Make static controls behave like regular ones
+    .form-control-static {
+      display: inline-block;
+    }
+
    .input-group {
      display: inline-table;
      vertical-align: middle;