From dcbf1e51c41ea774aa3ad62ca87ac5478c837275 Mon Sep 17 00:00:00 2001 From: Brian Nelson Date: Tue, 30 Jul 2013 11:35:13 -0400 Subject: Compiles changes to CSS --- dist/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 6afdbde29..28f8192d2 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3917,7 +3917,7 @@ a.thumbnail:focus { color: #ffffff; text-align: center; white-space: nowrap; - vertical-align: middle; + vertical-align: baseline; background-color: #999999; border-radius: .25em; } @@ -3976,7 +3976,7 @@ a.thumbnail:focus { color: #ffffff; text-align: center; white-space: nowrap; - vertical-align: middle; + vertical-align: baseline; background-color: #999999; border-radius: 10px; } -- cgit v1.2.3 From 4c27f3ce8018cab6340b8b801ee5e8f362fbe3d3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 31 Jul 2013 17:07:55 -0700 Subject: Run make on prev work --- dist/css/bootstrap.css | 54 +++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 28f8192d2..1d8885943 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2504,6 +2504,33 @@ button.close { background-color: #e5e5e5; } +.nav-justified { + width: 100%; +} + +.nav-justified > li { + display: table-cell; + float: none; + width: 1%; +} + +.nav-justified > li > a { + text-align: center; +} + +.nav-tabs-justified { + border-bottom: 0; +} + +.nav-tabs-justified > li > a { + margin-right: 0; + border-bottom: 1px solid #dddddd; +} + +.nav-tabs-justified > .active > a { + border-bottom-color: #ffffff; +} + .nav-tabs { border-bottom: 1px solid #dddddd; } @@ -2586,33 +2613,6 @@ button.close { margin-left: 0; } -.nav-justified { - width: 100%; -} - -.nav-justified > li { - display: table-cell; - float: none; - width: 1%; -} - -.nav-justified > li > a { - text-align: center; -} - -.nav-tabs-justified { - border-bottom: 0; -} - -.nav-tabs-justified > li > a { - margin-right: 0; - border-bottom: 1px solid #dddddd; -} - -.nav-tabs-justified > .active > a { - border-bottom-color: #ffffff; -} - .tabbable:before, .tabbable:after { display: table; -- cgit v1.2.3 From e9413315b55ec036a6de9846e4fb2fed1f910b7c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 31 Jul 2013 18:06:20 -0700 Subject: fixes #8937: align the dropdown menus in input groups --- dist/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 1d8885943..e0862209e 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1894,6 +1894,7 @@ input[type="button"].btn-block { } .input-group { + position: relative; display: table; border-collapse: separate; } -- cgit v1.2.3 From 1583dd55e9f05275ee054884720dce2be8e2f07a Mon Sep 17 00:00:00 2001 From: Jeff Tickle Date: Thu, 1 Aug 2013 11:49:16 -0400 Subject: Added classes for lg-pull, lg-push, lg-offset, sm-pull, sm-push, sm-offset --- dist/css/bootstrap.css | 165 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 132 insertions(+), 33 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index e0862209e..b971fddb3 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -931,72 +931,105 @@ pre code { .col-sm-12 { width: 100%; } - .col-push-1 { + .col-sm-push-1 { left: 8.333333333333332%; } - .col-push-2 { + .col-sm-push-2 { left: 16.666666666666664%; } - .col-push-3 { + .col-sm-push-3 { left: 25%; } - .col-push-4 { + .col-sm-push-4 { left: 33.33333333333333%; } - .col-push-5 { + .col-sm-push-5 { left: 41.66666666666667%; } - .col-push-6 { + .col-sm-push-6 { left: 50%; } - .col-push-7 { + .col-sm-push-7 { left: 58.333333333333336%; } - .col-push-8 { + .col-sm-push-8 { left: 66.66666666666666%; } - .col-push-9 { + .col-sm-push-9 { left: 75%; } - .col-push-10 { + .col-sm-push-10 { left: 83.33333333333334%; } - .col-push-11 { + .col-sm-push-11 { left: 91.66666666666666%; } - .col-pull-1 { + .col-sm-pull-1 { right: 8.333333333333332%; } - .col-pull-2 { + .col-sm-pull-2 { right: 16.666666666666664%; } - .col-pull-3 { + .col-sm-pull-3 { right: 25%; } - .col-pull-4 { + .col-sm-pull-4 { right: 33.33333333333333%; } - .col-pull-5 { + .col-sm-pull-5 { right: 41.66666666666667%; } - .col-pull-6 { + .col-sm-pull-6 { right: 50%; } - .col-pull-7 { + .col-sm-pull-7 { right: 58.333333333333336%; } - .col-pull-8 { + .col-sm-pull-8 { right: 66.66666666666666%; } - .col-pull-9 { + .col-sm-pull-9 { right: 75%; } - .col-pull-10 { + .col-sm-pull-10 { right: 83.33333333333334%; } - .col-pull-11 { + .col-sm-pull-11 { right: 91.66666666666666%; } + .col-sm-offset-1 { + margin-left: 8.333333333333332%; + } + .col-sm-offset-2 { + margin-left: 16.666666666666664%; + } + .col-sm-offset-3 { + margin-left: 25%; + } + .col-sm-offset-4 { + margin-left: 33.33333333333333%; + } + .col-sm-offset-5 { + margin-left: 41.66666666666667%; + } + .col-sm-offset-6 { + margin-left: 50%; + } + .col-sm-offset-7 { + margin-left: 58.333333333333336%; + } + .col-sm-offset-8 { + margin-left: 66.66666666666666%; + } + .col-sm-offset-9 { + margin-left: 75%; + } + .col-sm-offset-10 { + margin-left: 83.33333333333334%; + } + .col-sm-offset-11 { + margin-left: 91.66666666666666%; + } } @media (min-width: 992px) { @@ -1053,37 +1086,103 @@ pre code { .col-lg-12 { width: 100%; } - .col-offset-1 { + .col-lg-push-1 { + left: 8.333333333333332%; + } + .col-lg-push-2 { + left: 16.666666666666664%; + } + .col-lg-push-3 { + left: 25%; + } + .col-lg-push-4 { + left: 33.33333333333333%; + } + .col-lg-push-5 { + left: 41.66666666666667%; + } + .col-lg-push-6 { + left: 50%; + } + .col-lg-push-7 { + left: 58.333333333333336%; + } + .col-lg-push-8 { + left: 66.66666666666666%; + } + .col-lg-push-9 { + left: 75%; + } + .col-lg-push-10 { + left: 83.33333333333334%; + } + .col-lg-push-11 { + left: 91.66666666666666%; + } + .col-lg-pull-1 { + right: 8.333333333333332%; + } + .col-lg-pull-2 { + right: 16.666666666666664%; + } + .col-lg-pull-3 { + right: 25%; + } + .col-lg-pull-4 { + right: 33.33333333333333%; + } + .col-lg-pull-5 { + right: 41.66666666666667%; + } + .col-lg-pull-6 { + right: 50%; + } + .col-lg-pull-7 { + right: 58.333333333333336%; + } + .col-lg-pull-8 { + right: 66.66666666666666%; + } + .col-lg-pull-9 { + right: 75%; + } + .col-lg-pull-10 { + right: 83.33333333333334%; + } + .col-lg-pull-11 { + right: 91.66666666666666%; + } + .col-lg-offset-1 { margin-left: 8.333333333333332%; } - .col-offset-2 { + .col-lg-offset-2 { margin-left: 16.666666666666664%; } - .col-offset-3 { + .col-lg-offset-3 { margin-left: 25%; } - .col-offset-4 { + .col-lg-offset-4 { margin-left: 33.33333333333333%; } - .col-offset-5 { + .col-lg-offset-5 { margin-left: 41.66666666666667%; } - .col-offset-6 { + .col-lg-offset-6 { margin-left: 50%; } - .col-offset-7 { + .col-lg-offset-7 { margin-left: 58.333333333333336%; } - .col-offset-8 { + .col-lg-offset-8 { margin-left: 66.66666666666666%; } - .col-offset-9 { + .col-lg-offset-9 { margin-left: 75%; } - .col-offset-10 { + .col-lg-offset-10 { margin-left: 83.33333333333334%; } - .col-offset-11 { + .col-lg-offset-11 { margin-left: 91.66666666666666%; } } -- cgit v1.2.3 From d0b94ead9a660adeca599b2cc49ce5134d432f2f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Aug 2013 09:32:58 -0700 Subject: Fix #9008: consolidate `.alert-block` styles into `.alert` --- dist/css/bootstrap.css | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index e0862209e..22de1e417 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3751,7 +3751,7 @@ button.close { } .alert { - padding: 10px 35px 10px 15px; + padding: 15px 35px 15px 15px; margin-bottom: 20px; color: #c09853; background-color: #fcf8e3; @@ -3780,6 +3780,15 @@ button.close { color: inherit; } +.alert > p, +.alert > ul { + margin-bottom: 0; +} + +.alert > p + p { + margin-top: 5px; +} + .alert-success { color: #468847; background-color: #dff0d8; @@ -3822,20 +3831,6 @@ button.close { color: #2d6987; } -.alert-block { - padding-top: 15px; - padding-bottom: 15px; -} - -.alert-block > p, -.alert-block > ul { - margin-bottom: 0; -} - -.alert-block p + p { - margin-top: 5px; -} - .thumbnail, .img-thumbnail { padding: 4px; -- cgit v1.2.3 From 048e19b8921ff0cae8ade7ace7700f0563c1fb82 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Aug 2013 09:42:50 -0700 Subject: Fixes #8996: shift placement of justified CSS for nav component --- dist/css/bootstrap.css | 54 +++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 22de1e417..a3ade6e5d 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2505,33 +2505,6 @@ button.close { background-color: #e5e5e5; } -.nav-justified { - width: 100%; -} - -.nav-justified > li { - display: table-cell; - float: none; - width: 1%; -} - -.nav-justified > li > a { - text-align: center; -} - -.nav-tabs-justified { - border-bottom: 0; -} - -.nav-tabs-justified > li > a { - margin-right: 0; - border-bottom: 1px solid #dddddd; -} - -.nav-tabs-justified > .active > a { - border-bottom-color: #ffffff; -} - .nav-tabs { border-bottom: 1px solid #dddddd; } @@ -2614,6 +2587,33 @@ button.close { margin-left: 0; } +.nav-justified { + width: 100%; +} + +.nav-justified > li { + display: table-cell; + float: none; + width: 1%; +} + +.nav-justified > li > a { + text-align: center; +} + +.nav-tabs-justified { + border-bottom: 0; +} + +.nav-tabs-justified > li > a { + margin-right: 0; + border-bottom: 1px solid #dddddd; +} + +.nav-tabs-justified > .active > a { + border-bottom-color: #ffffff; +} + .tabbable:before, .tabbable:after { display: table; -- cgit v1.2.3 From 08ce3ef9e1767fa57ebdccd6dfbae5a8fbcb9fa3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Aug 2013 10:11:39 -0700 Subject: run grunt dist for #8967 --- dist/css/bootstrap.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index a3ade6e5d..b032d251d 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2016,7 +2016,9 @@ input[type="button"].btn-block { margin-bottom: 0; } -.form-horizontal .control-label { +.form-horizontal .control-label, +.form-horizontal .radio-inline, +.form-horizontal .checkbox-inline { padding-top: 9px; } @@ -2070,6 +2072,10 @@ input[type="button"].btn-block { content: ""; } +.dropdown { + position: relative; +} + .dropdown-menu { position: absolute; top: 100%; -- cgit v1.2.3 From d46e645a0f19b24280bf700f4d4fb56caadb4409 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Aug 2013 14:07:26 -0700 Subject: fixes #9015: bold links not semibold in alerts --- dist/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 293a5274d..d27ee8065 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3874,7 +3874,7 @@ button.close { } .alert .alert-link { - font-weight: 500; + font-weight: bold; color: #a47e3c; } -- cgit v1.2.3 From 173dac4e54281312ebb7ff993df20caffbc56840 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Aug 2013 15:09:48 -0700 Subject: Tighten up buttons and form controls * Smaller padding on buttons and large buttons * Same with inputs and large inputs * Remove about 10px from height of large inputs/buttons and 4px from regular ones Fixes #8707 and #8700. (Also relevant: #8711) --- dist/css/bootstrap.css | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index d27ee8065..183ffb983 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1453,8 +1453,8 @@ input[type="number"]::-webkit-inner-spin-button { .form-control { display: block; width: 100%; - height: 38px; - padding: 8px 12px; + height: 34px; + padding: 6px 12px; font-size: 14px; line-height: 1.428571429; color: #555555; @@ -1538,9 +1538,10 @@ textarea.form-control { } .input-large { - height: 56px; - padding: 14px 16px; + height: 45px; + padding: 10px 16px; font-size: 18px; + line-height: 1.33; border-radius: 6px; } @@ -1548,12 +1549,13 @@ textarea.form-control { height: 30px; padding: 5px 10px; font-size: 12px; + line-height: 1.5; border-radius: 3px; } select.input-large { - height: 56px; - line-height: 56px; + height: 45px; + line-height: 45px; } select.input-small { @@ -1647,7 +1649,7 @@ textarea.input-small { .btn { display: inline-block; - padding: 8px 12px; + padding: 6px 12px; margin-bottom: 0; font-size: 14px; font-weight: 500; @@ -1932,8 +1934,9 @@ fieldset[disabled] .btn-link:focus { } .btn-large { - padding: 14px 16px; + padding: 10px 16px; font-size: 18px; + line-height: 1.33; border-radius: 6px; } @@ -2029,7 +2032,7 @@ input[type="button"].btn-block { } .input-group-addon { - padding: 8px 12px; + padding: 6px 12px; font-size: 14px; font-weight: normal; line-height: 1.428571429; @@ -2049,7 +2052,7 @@ input[type="button"].btn-block { } .input-group-addon.input-large { - padding: 14px 16px; + padding: 10px 16px; font-size: 18px; border-radius: 6px; } @@ -2904,8 +2907,8 @@ button.close { } .navbar-form { - margin-top: 6px; - margin-bottom: 6px; + margin-top: 8px; + margin-bottom: 8px; } .navbar-form .form-control, @@ -3076,7 +3079,7 @@ button.close { } .navbar-btn { - margin-top: 6px; + margin-top: 8px; } .navbar-text { @@ -3357,7 +3360,7 @@ button.close { .pagination-large > li > a, .pagination-large > li > span { - padding: 14px 16px; + padding: 10px 16px; font-size: 18px; } -- cgit v1.2.3