Merge branch 'master' into panels_and_tables

Conflicts: dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css
2026-06-05 16:42:29 +03:00 · 2014-02-07 18:36:27 -08:00
parent d91d9b0ade a2f08158d0
commit 06f1293acf
15 changed files with 28 additions and 19 deletions
@@ -1939,6 +1939,9 @@ select[multiple].input-lg {
    width: auto;
    vertical-align: middle;
  }
+  .form-inline .input-group > .form-control {
+    width: 100%;
+  }
  .form-inline .control-label {
    margin-bottom: 0;
    vertical-align: middle;
@@ -3854,6 +3857,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
    width: auto;
    vertical-align: middle;
  }
+  .navbar-form .input-group > .form-control {
+    width: 100%;
+  }
  .navbar-form .control-label {
    margin-bottom: 0;
    vertical-align: middle;