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 /dist/css/bootstrap.css | |
| 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 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 59901bef6..364047ee3 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -286,7 +286,9 @@ table { } } -* { +*, +*:before, +*:after { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; @@ -2253,7 +2255,8 @@ input[type="button"].btn-block { } .input-group-lg > .form-control, -.input-group-lg > .input-group-addon { +.input-group-lg > .input-group-addon, +.input-group-lg > .input-group-btn > .btn { height: 45px; padding: 10px 16px; font-size: 18px; @@ -2262,7 +2265,8 @@ input[type="button"].btn-block { } .input-group-sm > .form-control, -.input-group-sm > .input-group-addon { +.input-group-sm > .input-group-addon, +.input-group-lg > .input-group-btn > .btn { height: 30px; padding: 5px 10px; font-size: 12px; |