From ce719925af8d0d4f443f46b6a93bd4e2d59aca8e Mon Sep 17 00:00:00 2001 From: Robert Burns Date: Sat, 20 Apr 2013 13:25:22 -0400 Subject: Fix carousel examples within docs --- docs/docs.html | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'docs') diff --git a/docs/docs.html b/docs/docs.html index 976396eba..8eaab75d4 100644 --- a/docs/docs.html +++ b/docs/docs.html @@ -6332,11 +6332,11 @@ $('#myCollapsible').on('hidden', function () {

Examples

The slideshow below shows a generic plugin and component for cycling through elements like a carousel.

-
+
{% highlight html linenos %} -
+ - + - +
@@ -6394,11 +6394,11 @@ $('#myCollapsible').on('hidden', function () {

Captions are hidden by default and will show up only with viewports greater than 768px wide.

-
+ - + - +
-- cgit v1.2.3 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') 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 a956a3258b48e697666058889b3c0add591647a2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 20 Apr 2013 12:23:27 -0700 Subject: Alternate docs mention of breadcrumbs separator, as called out in #7601 --- docs/docs.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/docs.html b/docs/docs.html index 8eaab75d4..7fc72bf9c 100644 --- a/docs/docs.html +++ b/docs/docs.html @@ -3761,7 +3761,7 @@ body {

Breadcrumbs

Indicate the current page's location within a navigational hierarchy.

- +

Separators are automatically added in CSS through `:after` and `content`.

@@ -2690,7 +2690,7 @@ For example, <section> should be wrapped as inline.
- +
-- 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') 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 0c9b161bb889a5f47f7ef0752d90c41c9f957695 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 20 Apr 2013 15:32:16 -0700 Subject: Fixes #7093: more consistent scrollspy docs --- docs/docs.html | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'docs') diff --git a/docs/docs.html b/docs/docs.html index dcb379bf0..55e3dfb72 100644 --- a/docs/docs.html +++ b/docs/docs.html @@ -5327,7 +5327,7 @@ $('.dropdown-toggle').dropdown()

Example in navbar

The ScrollSpy plugin is for automatically updating nav targets based on scroll position. Scroll the area below the navbar and watch the active class change. The dropdown sub items will be highlighted as well.

-