From afdab35aca4ccfbe9214c4cdf6f6b1d2da595cad Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 20 Apr 2013 12:09:08 -0700 Subject: Fixes #7640: only reset margin on last-child p within blockquotes --- docs/assets/css/bootstrap.css | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b9809980c..1e86761f4 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -623,18 +623,21 @@ abbr.initialism { } blockquote { - padding: 0 0 0 15px; + padding: 10px 20px; margin: 0 0 20px; border-left: 5px solid #eeeeee; } blockquote p { - margin-bottom: 0; font-size: 17.5px; font-weight: 300; line-height: 1.25; } +blockquote p:last-child { + margin-bottom: 0; +} + blockquote small { display: block; line-height: 20px; @@ -2874,10 +2877,9 @@ fieldset[disabled] .btn-link:focus { color: #ffffff; text-decoration: none; background-color: #357ebd; - background-image: -moz-linear-gradient(top, #428bca, #357ebd); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#428bca), to(#357ebd)); background-image: -webkit-linear-gradient(top, #428bca, #357ebd); - background-image: -o-linear-gradient(top, #428bca, #357ebd); + background-image: -moz-linear-gradient(top, #428bca, #357ebd); background-image: linear-gradient(to bottom, #428bca, #357ebd); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0); @@ -2889,10 +2891,9 @@ fieldset[disabled] .btn-link:focus { color: #ffffff; text-decoration: none; background-color: #357ebd; - background-image: -moz-linear-gradient(top, #428bca, #357ebd); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#428bca), to(#357ebd)); background-image: -webkit-linear-gradient(top, #428bca, #357ebd); - background-image: -o-linear-gradient(top, #428bca, #357ebd); + background-image: -moz-linear-gradient(top, #428bca, #357ebd); background-image: linear-gradient(to bottom, #428bca, #357ebd); background-repeat: repeat-x; outline: 0; @@ -4957,7 +4958,6 @@ a.list-group-item.active > .badge, background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -webkit-background-size: 40px 40px; -moz-background-size: 40px 40px; @@ -4982,7 +4982,6 @@ a.list-group-item.active > .badge, background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } @@ -4995,7 +4994,6 @@ a.list-group-item.active > .badge, background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } @@ -5008,7 +5006,6 @@ a.list-group-item.active > .badge, background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } @@ -5021,7 +5018,6 @@ a.list-group-item.active > .badge, background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } @@ -5133,10 +5129,9 @@ a.list-group-item.active > .badge, .carousel-control.left { background-color: rgba(0, 0, 0, 0.0001); background-color: transparent; - background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.0001)); background-image: -webkit-gradient(linear, 0 0, 100% 0, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0.0001))); background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.0001)); - background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.0001)); + background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.0001)); background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.0001)); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1); @@ -5147,10 +5142,9 @@ a.list-group-item.active > .badge, left: auto; background-color: rgba(0, 0, 0, 0.5); background-color: transparent; - background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.0001), rgba(0, 0, 0, 0.5)); background-image: -webkit-gradient(linear, 0 0, 100% 0, from(rgba(0, 0, 0, 0.0001)), to(rgba(0, 0, 0, 0.5))); background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.0001), rgba(0, 0, 0, 0.5)); - background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.0001), rgba(0, 0, 0, 0.5)); + background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.0001), rgba(0, 0, 0, 0.5)); background-image: linear-gradient(to right, rgba(0, 0, 0, 0.0001), rgba(0, 0, 0, 0.5)); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1); -- cgit v1.2.3 From 510c9a6ad87a1148fe59a7b8531d9b9e11b0ae17 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 20 Apr 2013 12:33:09 -0700 Subject: First pass at updated responsive utilities to be mobile-first. Pulled from #7490 by @apotropaic --- docs/assets/css/bootstrap.css | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1e86761f4..d24999c4a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5310,47 +5310,67 @@ a.list-group-item.active > .badge, } .visible-phone { - display: none !important; + display: inherit !important; } .visible-tablet { display: none !important; } -.hidden-desktop { +.visible-desktop { display: none !important; } -.visible-desktop { +.hidden-phone { + display: none !important; +} + +.hidden-tablet { + display: inherit !important; +} + +.hidden-desktop { display: inherit !important; } @media (min-width: 768px) and (max-width: 979px) { - .hidden-desktop { + .visible-phone { + display: none !important; + } + .visible-tablet { display: inherit !important; } .visible-desktop { - display: none !important ; + display: none !important; } - .visible-tablet { + .hidden-phone { display: inherit !important; } .hidden-tablet { display: none !important; } -} - -@media (max-width: 767px) { .hidden-desktop { display: inherit !important; } - .visible-desktop { +} + +@media (min-width: 980px) { + .visible-phone { display: none !important; } - .visible-phone { + .visible-tablet { + display: none !important; + } + .visible-desktop { display: inherit !important; } .hidden-phone { + display: inherit !important; + } + .hidden-tablet { + display: inherit !important; + } + .hidden-desktop { display: none !important; } } -- cgit v1.2.3 From dc4436dbc9f328f4ad6ee391b6836b6c8d0324c2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 20 Apr 2013 15:36:11 -0700 Subject: Only use .danger for alerts, no more .error --- docs/assets/css/bootstrap.css | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d24999c4a..4553a1592 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4663,22 +4663,18 @@ button.close { color: #356635; } -.alert-danger, -.alert-error { +.alert-danger { color: #b94a48; background-color: #f2dede; border-color: #eed3d7; } -.alert-danger hr, -.alert-error hr { +.alert-danger hr { border-top-color: #e6c1c7; } .alert-danger > a, -.alert-error > a, -.alert-danger > p > a, -.alert-error > p > a { +.alert-danger > p > a { color: #953b39; } -- cgit v1.2.3 From 30d6e0530effef6379fb555491bc5064668f3359 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 21 Apr 2013 14:50:44 -0700 Subject: Fixes #7577: Attempt to fix, at least, issues with Windows Phone 8 and responsive not kicking in correctly --- docs/assets/css/bootstrap.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 4553a1592..53f9a9693 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5300,6 +5300,12 @@ a.list-group-item.active > .badge, width: device-width; } +@media screen and (max-width: 400px) { + @-ms-viewport { + width: 320px; + } +} + .hidden { display: none; visibility: hidden; -- cgit v1.2.3 From 364f8330a159f9448833d88740e259219883d404 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 21 Apr 2013 18:29:06 -0700 Subject: Fixes #7648: Thumbnail caption should use @text-color variable. Also adds other thumbnail vars --- docs/assets/css/bootstrap.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 53f9a9693..f40720bf4 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4711,7 +4711,8 @@ button.close { .img-thumbnail { padding: 4px; line-height: 20px; - border: 1px solid #ddd; + background-color: #ffffff; + border: 1px solid #dddddd; border-radius: 4px; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; @@ -4741,7 +4742,7 @@ a.thumbnail:focus { .thumbnail .caption { padding: 9px; - color: #555555; + color: #333333; } .media, -- cgit v1.2.3 From e0d60b1325591a347d9e49e44be6d77401b07749 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 21 Apr 2013 19:35:36 -0700 Subject: Fixes #7617: lowercase and dash gray color vars --- docs/assets/css/bootstrap.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f40720bf4..624daf46c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3471,8 +3471,8 @@ button.close { .nav-pills .open .dropdown-toggle, .nav > li.dropdown.open.active > a:hover { color: #fff; - background-color: @grayLight; - border-color: @grayLight; + background-color: @gray-light; + border-color: @gray-light; } .nav li.dropdown.open .caret, .nav li.dropdown.open.active .caret, @@ -3484,7 +3484,7 @@ button.close { // Dropdowns in stacked tabs .tabs-stacked .open > a:hover { - border-color: @grayLight; + border-color: @gray-light; } */ -- cgit v1.2.3