diff options
| author | Mark Otto <[email protected]> | 2013-06-25 09:37:56 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-06-25 09:37:56 -0700 |
| commit | e9951385b0507d2f28e332d7d5dcaea41b7e1d41 (patch) | |
| tree | 7d1b8adccca40017670fd61dc941e4140dbac444 | |
| parent | 5fe3de1cb34b8a0307ce3f095e8d08f3fc4bf871 (diff) | |
| parent | 9ed5b5e6534b45f29f318d983a7e09be1f7ac946 (diff) | |
| download | bootstrap-e9951385b0507d2f28e332d7d5dcaea41b7e1d41.tar.xz bootstrap-e9951385b0507d2f28e332d7d5dcaea41b7e1d41.zip | |
Merge pull request #8283 from luishdez/hotfix/add-on-breaks
Fix line breaks on add-ons with spaces
| -rw-r--r-- | docs/assets/css/bootstrap.css | 1 | ||||
| -rw-r--r-- | less/forms.less | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b7e026dbb..487d7eb2f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1711,6 +1711,7 @@ input[type="color"].input-small { .input-group-addon, .input-group-btn { width: 1%; + white-space: nowrap; vertical-align: middle; } diff --git a/less/forms.less b/less/forms.less index 609580928..912487610 100644 --- a/less/forms.less +++ b/less/forms.less @@ -321,6 +321,7 @@ input[type="color"] { .input-group-addon, .input-group-btn { width: 1%; + white-space: nowrap; vertical-align: middle; // Match the inputs } |