diff options
| author | Mark Otto <[email protected]> | 2014-07-07 22:10:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-07 22:10:22 -0700 |
| commit | 81b59d35368bc51d361d0352cc92fe99dc580fbf (patch) | |
| tree | 2395d5e79edaaa8c0a7ad82e99931ec895421532 /less/input-groups.less | |
| parent | fed2b0f7eb78438eb1b768782b04651881d88740 (diff) | |
| parent | ddee04038f946ac103eb4e70c8eb7adeb2cf563b (diff) | |
| download | bootstrap-81b59d35368bc51d361d0352cc92fe99dc580fbf.tar.xz bootstrap-81b59d35368bc51d361d0352cc92fe99dc580fbf.zip | |
Merge branch 'master' into derp
Conflicts:
docs/_layouts/default.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/docs.min.js
docs/assets/js/src/application.js
Diffstat (limited to 'less/input-groups.less')
| -rw-r--r-- | less/input-groups.less | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/less/input-groups.less b/less/input-groups.less index a11147463..a8712f25b 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -39,10 +39,14 @@ .input-group-lg > .form-control, .input-group-lg > .input-group-addon, -.input-group-lg > .input-group-btn > .btn { .input-lg(); } +.input-group-lg > .input-group-btn > .btn { + .input-lg(); +} .input-group-sm > .form-control, .input-group-sm > .input-group-addon, -.input-group-sm > .input-group-btn > .btn { .input-sm(); } +.input-group-sm > .input-group-btn > .btn { + .input-sm(); +} // Display as table-cell |