diff options
| author | Mark Otto <[email protected]> | 2013-08-12 21:34:55 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-12 21:34:55 -0700 |
| commit | 80eb09cc1b1db0e7899039f67adf78f0b14ac9a5 (patch) | |
| tree | 7bbfd5e26396c20bd0fecfc5f6aa17eb0a51d019 /less/input-groups.less | |
| parent | 8bb7def26cac4d3166fbf2cc98f16c4151794676 (diff) | |
| parent | 49576704ea6c24fbc4cb32f44c5986a1e7714634 (diff) | |
| download | bootstrap-80eb09cc1b1db0e7899039f67adf78f0b14ac9a5.tar.xz bootstrap-80eb09cc1b1db0e7899039f67adf78f0b14ac9a5.zip | |
Merge branch '3.0.0-wip' into bs3_navbar_overhaul
Conflicts:
components.html
dist/css/bootstrap.min.css
Diffstat (limited to 'less/input-groups.less')
| -rw-r--r-- | less/input-groups.less | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/less/input-groups.less b/less/input-groups.less index e5e6100d3..153b22957 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -28,9 +28,11 @@ // manipulation. .input-group-lg > .form-control, -.input-group-lg > .input-group-addon { .input-lg(); } +.input-group-lg > .input-group-addon, +.input-group-lg > .input-group-btn > .btn { .input-lg(); } .input-group-sm > .form-control, -.input-group-sm > .input-group-addon { .input-sm(); } +.input-group-sm > .input-group-addon, +.input-group-lg > .input-group-btn > .btn { .input-sm(); } // Display as table-cell |