From 4c794aaaef1de961c764294f554b12ce861c8595 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 24 Aug 2013 13:59:03 -0700 Subject: grunt dist on glyphicons width change --- dist/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 79b6985a2..e365a9201 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2409,6 +2409,10 @@ input[type="button"].btn-block { line-height: 1; } +.glyphicon:empty { + width: 1em; +} + .glyphicon-asterisk:before { content: "\2a"; } -- cgit v1.2.3 From 4d23aa4ef50ac16fec9fbc12832ad99f362ac703 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 26 Aug 2013 17:37:52 -0700 Subject: Address #9873 and fix #9774 * Update styling of justified nav links to be more mobile friendly (with all four rounded corners and some margin between items) * Add note to docs to callout bogus WebKit rendering on component and example --- dist/css/bootstrap.css | 48 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index e365a9201..0921d2a1c 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3899,6 +3899,7 @@ textarea.input-group-sm > .input-group-btn > .btn { } .nav-tabs.nav-justified > li > a { + margin-bottom: 5px; text-align: center; } @@ -3907,15 +3908,32 @@ textarea.input-group-sm > .input-group-btn > .btn { display: table-cell; width: 1%; } + .nav-tabs.nav-justified > li > a { + margin-bottom: 0; + } } .nav-tabs.nav-justified > li > a { margin-right: 0; - border-bottom: 1px solid #dddddd; + border-radius: 4px; } -.nav-tabs.nav-justified > .active > a { - border-bottom-color: #ffffff; +.nav-tabs.nav-justified > .active > a, +.nav-tabs.nav-justified > .active > a:hover, +.nav-tabs.nav-justified > .active > a:focus { + border: 1px solid #dddddd; +} + +@media (min-width: 768px) { + .nav-tabs.nav-justified > li > a { + border-bottom: 1px solid #dddddd; + border-radius: 4px 4px 0 0; + } + .nav-tabs.nav-justified > .active > a, + .nav-tabs.nav-justified > .active > a:hover, + .nav-tabs.nav-justified > .active > a:focus { + border-bottom-color: #ffffff; + } } .nav-pills > li { @@ -3955,6 +3973,7 @@ textarea.input-group-sm > .input-group-btn > .btn { } .nav-justified > li > a { + margin-bottom: 5px; text-align: center; } @@ -3963,6 +3982,9 @@ textarea.input-group-sm > .input-group-btn > .btn { display: table-cell; width: 1%; } + .nav-justified > li > a { + margin-bottom: 0; + } } .nav-tabs-justified { @@ -3971,11 +3993,25 @@ textarea.input-group-sm > .input-group-btn > .btn { .nav-tabs-justified > li > a { margin-right: 0; - border-bottom: 1px solid #dddddd; + border-radius: 4px; } -.nav-tabs-justified > .active > a { - border-bottom-color: #ffffff; +.nav-tabs-justified > .active > a, +.nav-tabs-justified > .active > a:hover, +.nav-tabs-justified > .active > a:focus { + border: 1px solid #dddddd; +} + +@media (min-width: 768px) { + .nav-tabs-justified > li > a { + border-bottom: 1px solid #dddddd; + border-radius: 4px 4px 0 0; + } + .nav-tabs-justified > .active > a, + .nav-tabs-justified > .active > a:hover, + .nav-tabs-justified > .active > a:focus { + border-bottom-color: #ffffff; + } } .tabbable:before, -- cgit v1.2.3 From 7796e645c98fe527261d85ad2fec01720e3fe455 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 26 Aug 2013 17:48:32 -0700 Subject: Add margin to thumbnails for proper spacing Hadn't thought about this until fixes #10137, but it makes sense I think to have margin on the bottom of thumbnails for spacing when stacking (or using different grid tiers). --- 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 0921d2a1c..319ca9e3a 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5010,6 +5010,7 @@ a.list-group-item.active > .badge, height: auto; max-width: 100%; padding: 4px; + margin-bottom: 20px; line-height: 1.428571429; background-color: #ffffff; border: 1px solid #dddddd; -- cgit v1.2.3 From 2ef147b16b8d48941aa725f8a44f0612e5771c33 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 28 Aug 2013 15:37:34 -0700 Subject: fix #10252 by restricting Android Firefox reset to only .form-control & .btn --- dist/css/bootstrap.css | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 319ca9e3a..856e378cb 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -316,13 +316,6 @@ textarea { line-height: inherit; } -button, -input, -select[multiple], -textarea { - background-image: none; -} - a { color: #428bca; text-decoration: none; @@ -1724,6 +1717,7 @@ output { color: #555555; vertical-align: middle; background-color: #ffffff; + background-image: none; border: 1px solid #cccccc; border-radius: 4px; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); @@ -2006,6 +2000,7 @@ textarea.input-lg { white-space: nowrap; vertical-align: middle; cursor: pointer; + background-image: none; border: 1px solid transparent; border-radius: 4px; -webkit-user-select: none; -- cgit v1.2.3