diff options
| author | Mark Otto <[email protected]> | 2014-02-07 18:36:27 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-07 18:36:27 -0800 |
| commit | 06f1293acfc767d950adc329cf4abfc2b5c0b78d (patch) | |
| tree | 738abb0672d3e0a5839a8657c431a202aa190ef0 /dist/css/bootstrap.css | |
| parent | d91d9b0ade9165c20d781ced128a751d0ae1fbda (diff) | |
| parent | a2f08158d032c1025ca0c6bf411b8282b606fb7b (diff) | |
| download | bootstrap-06f1293acfc767d950adc329cf4abfc2b5c0b78d.tar.xz bootstrap-06f1293acfc767d950adc329cf4abfc2b5c0b78d.zip | |
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
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index a583f11dc..1ac29b4eb 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -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; |