From 40723c8716d79e5f27791caa2da5787151a6ee6b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 21:26:43 -0700 Subject: fixes #9400: add box-sizing to pseudo elements as well --- dist/css/bootstrap.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 9046102c9..0987b7a1d 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; -- cgit v1.2.3 From 49576704ea6c24fbc4cb32f44c5986a1e7714634 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 21:27:15 -0700 Subject: finish fixing #9295: add button group buttons to new input group sizing --- dist/css/bootstrap.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 0987b7a1d..5ab29f216 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2255,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; @@ -2264,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; -- cgit v1.2.3