From 771ac3207e1f5c0a624680a11e8245da13dcac12 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Aug 2013 11:08:29 -0700 Subject: xs button is xs-er (fixes #9695) --- 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 958e9302f..c07134015 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2277,7 +2277,7 @@ fieldset[disabled] .btn-link:focus { } .btn-xs { - padding: 3px 5px; + padding: 1px 5px; } .btn-block { @@ -3838,7 +3838,7 @@ button.close { .btn-group-xs > .btn { padding: 5px 10px; - padding: 3px 5px; + padding: 1px 5px; font-size: 12px; line-height: 1.5; border-radius: 3px; -- cgit v1.2.3 From ed4316d9b28e532d0bdbe3b5ddd23006ea7f7f9b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Aug 2013 11:16:32 -0700 Subject: fixes #9642: open dropdown nav items get proper styling --- dist/css/bootstrap.css | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index c07134015..9d1c8daed 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2978,21 +2978,13 @@ button.close { background-color: transparent; } -.nav.open > a, -.nav.open > a:hover, -.nav.open > a:focus { - color: #ffffff; - background-color: #428bca; +.nav .open > a, +.nav .open > a:hover, +.nav .open > a:focus { + background-color: #eeeeee; border-color: #428bca; } -.nav.open > a .caret, -.nav.open > a:hover .caret, -.nav.open > a:focus .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - .nav .nav-divider { height: 1px; margin: 9px 0; -- cgit v1.2.3 From e5f38207e0f8a356728e78f91a83b945934fd71d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Aug 2013 11:34:30 -0700 Subject: fixed navbar static top borders --- dist/css/bootstrap.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 9d1c8daed..9bfc19b20 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3266,9 +3266,12 @@ button.close { } } +.navbar-static-top { + border-width: 0 0 1px; +} + @media (min-width: 768px) { .navbar-static-top { - border-width: 0 0 1px; border-radius: 0; } } -- cgit v1.2.3 From c13772d5f7584a83476a12fec379d8424ea312d1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Aug 2013 12:38:41 -0700 Subject: switch to margin on navbar-nav to avoid stacking negative space reported in #9705 --- dist/css/bootstrap.css | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 9bfc19b20..b161caada 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3355,10 +3355,7 @@ button.close { } .navbar-nav { - padding-top: 7.5px; - padding-bottom: 7.5px; - margin-right: -15px; - margin-left: -15px; + margin: 7.5px -15px; } .navbar-nav > li > a { @@ -3429,8 +3426,6 @@ button.close { @media (min-width: 768px) { .navbar-nav { float: left; - padding-top: 0; - padding-bottom: 0; margin: 0; } .navbar-nav > li { -- cgit v1.2.3 From e6f185acad5741fcbe0b3305e0660e5e6ea4f41c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Aug 2013 14:01:32 -0700 Subject: Justified nav now responsive; example updated accordingly (fixes #9708) --- dist/css/bootstrap.css | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index b161caada..515c9cd22 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3032,15 +3032,20 @@ button.close { } .nav-tabs.nav-justified > li { - display: table-cell; float: none; - width: 1%; } .nav-tabs.nav-justified > li > a { text-align: center; } +@media (min-width: 768px) { + .nav-tabs.nav-justified > li { + display: table-cell; + width: 1%; + } +} + .nav-tabs.nav-justified > li > a { margin-right: 0; border-bottom: 1px solid #dddddd; @@ -3083,15 +3088,20 @@ button.close { } .nav-justified > li { - display: table-cell; float: none; - width: 1%; } .nav-justified > li > a { text-align: center; } +@media (min-width: 768px) { + .nav-justified > li { + display: table-cell; + width: 1%; + } +} + .nav-tabs-justified { border-bottom: 0; } -- cgit v1.2.3 From f459d76e388b1d73b8b0065f8fbaf573f7eaed32 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Aug 2013 15:07:45 -0700 Subject: fixes #9475 --- dist/css/bootstrap.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 515c9cd22..b44253ee2 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3231,7 +3231,6 @@ button.close { padding-right: 15px; padding-left: 15px; overflow-x: visible; - overflow-y: auto; border-top: 1px solid #e6e6e6; box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); -webkit-overflow-scrolling: touch; @@ -3257,6 +3256,10 @@ button.close { clear: both; } +.navbar-collapse.in { + overflow-y: auto; +} + @media (min-width: 768px) { .navbar-collapse { width: auto; -- cgit v1.2.3 From e4bb388bc91790d2b0a0ff0be1f329945adcc3ff Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Aug 2013 15:16:03 -0700 Subject: Make negative margins on rows the default, not just in containers, and add padding to body to compensate --- dist/css/bootstrap.css | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index b44253ee2..c153c62f7 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -300,6 +300,8 @@ html { } body { + padding-right: 15px; + padding-left: 15px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.428571429; @@ -757,6 +759,11 @@ pre code { clear: both; } +.row { + margin-right: -15px; + margin-left: -15px; +} + .row:before, .row:after { display: table; @@ -777,18 +784,6 @@ pre code { clear: both; } -@media (min-width: 768px) { - .container .row { - margin-right: -15px; - margin-left: -15px; - } -} - -.row .row { - margin-right: -15px; - margin-left: -15px; -} - .col-xs-1, .col-xs-2, .col-xs-3, @@ -1888,6 +1883,11 @@ textarea.input-lg { padding-top: 6px; } +.form-horizontal .form-group { + margin-right: -15px; + margin-left: -15px; +} + .form-horizontal .form-group:before, .form-horizontal .form-group:after { display: table; @@ -1908,18 +1908,6 @@ textarea.input-lg { clear: both; } -@media (min-width: 768px) { - .container .form-horizontal .form-group { - margin-right: -15px; - margin-left: -15px; - } -} - -.form-horizontal .form-group .row { - margin-right: -15px; - margin-left: -15px; -} - @media (min-width: 768px) { .form-horizontal .control-label { text-align: right; -- cgit v1.2.3 From cd0df1d21aaed8751b8c29aab3b30ff027aac89d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Aug 2013 22:37:02 -0700 Subject: fixes #9436 more: put padding on containers, not the body because full width elements --- dist/css/bootstrap.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index c153c62f7..2b3c8fb9e 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -300,8 +300,6 @@ html { } body { - padding-right: 15px; - padding-left: 15px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.428571429; @@ -735,6 +733,8 @@ pre code { } .container { + padding-right: 15px; + padding-left: 15px; margin-right: auto; margin-left: auto; } @@ -902,7 +902,7 @@ pre code { @media (min-width: 768px) { .container { - max-width: 720px; + max-width: 750px; } .col-sm-1, .col-sm-2, @@ -1056,7 +1056,7 @@ pre code { @media (min-width: 992px) { .container { - max-width: 940px; + max-width: 970px; } .col-md-1, .col-md-2, @@ -1219,7 +1219,7 @@ pre code { @media (min-width: 1200px) { .container { - max-width: 1140px; + max-width: 1170px; } .col-lg-1, .col-lg-2, -- cgit v1.2.3 From ab700d753c5dd77d278c7ee284b5d4c8250543c2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Aug 2013 13:07:21 -0700 Subject: fix #9743: pager hover background should be light gray --- 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 2b3c8fb9e..2639bb9a9 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4132,7 +4132,7 @@ button.close { .pager li > a:hover, .pager li > a:focus { text-decoration: none; - background-color: #428bca; + background-color: #eeeeee; } .pager .next > a, -- cgit v1.2.3 From 82f6f08f89ab8b86aa2d5b175493e24d1f4329cb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Aug 2013 13:18:10 -0700 Subject: Fixes #9552: Downsize and use whole numbers for panel title to prevent odd 1px bug --- 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 2639bb9a9..7f7fae1aa 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2726,7 +2726,7 @@ a.list-group-item:focus { .panel-title { margin-top: 0; margin-bottom: 0; - font-size: 17.5px; + font-size: 16px; } .panel-title > a { -- cgit v1.2.3 From 0c70744ea22126b6224bde75b4ccb6068941e38f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Aug 2013 13:33:53 -0700 Subject: fixes #9538: prevent Firefox rendering bug via some border-fu --- dist/css/bootstrap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 7f7fae1aa..ae1ac035a 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2473,6 +2473,7 @@ textarea.input-group-sm > .input-group-btn > .btn { vertical-align: middle; border-top: 4px solid #000000; border-right: 4px solid transparent; + border-bottom: 0 dotted; border-left: 4px solid transparent; content: ""; } @@ -2591,7 +2592,7 @@ textarea.input-group-sm > .input-group-btn > .btn { .dropup .caret, .navbar-fixed-bottom .dropdown .caret { - border-top: 0; + border-top: 0 dotted; border-bottom: 4px solid #000000; content: ""; } -- cgit v1.2.3 From 6ca32589b59434574a9e9ed6cb12718b0234754e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Aug 2013 14:15:33 -0700 Subject: 2px border on thead th elements for just a tad more separation --- dist/css/bootstrap.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index ae1ac035a..c290d1221 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1408,6 +1408,7 @@ th { .table thead > tr > th { vertical-align: bottom; + border-bottom: 2px solid #dddddd; } .table caption + thead tr:first-child th, @@ -1449,6 +1450,11 @@ th { border: 1px solid #dddddd; } +.table-bordered > thead > tr > th, +.table-bordered > thead > tr > td { + border-bottom-width: 2px; +} + .table-striped > tbody > tr:nth-child(odd) > td, .table-striped > tbody > tr:nth-child(odd) > th { background-color: #f9f9f9; -- cgit v1.2.3