From 496f1933bb5a3572f50bbb972124770e71c56e48 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Tue, 16 Apr 2013 13:07:05 -0700 Subject: [PATCH 01/16] watchr should be lower-case --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 45b151e15f..c4a008d39e 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ Runs the recess compiler to rebuild the `/less` files and compiles the docs. Req Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). Depends on having phantomjs installed. #### watch - `make watch` -This is a convenience method for watching just Less files and automatically building them whenever you save. Requires the Watchr gem. +This is a convenience method for watching just Less files and automatically building them whenever you save. Requires the watchr gem. Should you encounter problems with installing dependencies or running the makefile commands, be sure to first uninstall any previous versions (global and local) you may have installed, and then rerun `npm install`. From a8391da414fe1e2f7bd0abba1bae3290789d71da Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 18 Apr 2013 12:46:31 -0700 Subject: [PATCH 02/16] Update mixins to remove Opera prefixes on gradients; reorder rules for consistency --- less/mixins.less | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/less/mixins.less b/less/mixins.less index 49aaba8769..3099e9beff 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -248,20 +248,18 @@ #gradient { .horizontal(@startColor: #555, @endColor: #333) { background-color: @endColor; - background-image: -moz-linear-gradient(left, @startColor, @endColor); // FF 3.6+ background-image: -webkit-gradient(linear, 0 0, 100% 0, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+ - background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10 + background-image: -moz-linear-gradient(left, @startColor, @endColor); // FF 3.6+ background-image: linear-gradient(to right, @startColor, @endColor); // Standard, IE10 background-repeat: repeat-x; filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@startColor),argb(@endColor))); // IE9 and down } .vertical(@startColor: #555, @endColor: #333) { background-color: @endColor; - background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+ - background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10 + background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+ background-image: linear-gradient(to bottom, @startColor, @endColor); // Standard, IE10 background-repeat: repeat-x; filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down @@ -269,9 +267,8 @@ .directional(@startColor: #555, @endColor: #333, @deg: 45deg) { background-color: @endColor; background-repeat: repeat-x; - background-image: -moz-linear-gradient(@deg, @startColor, @endColor); // FF 3.6+ background-image: -webkit-linear-gradient(@deg, @startColor, @endColor); // Safari 5.1+, Chrome 10+ - background-image: -o-linear-gradient(@deg, @startColor, @endColor); // Opera 11.10 + background-image: -moz-linear-gradient(@deg, @startColor, @endColor); // FF 3.6+ background-image: linear-gradient(@deg, @startColor, @endColor); // Standard, IE10 } .horizontal-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) { @@ -279,7 +276,6 @@ background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor)); background-image: -webkit-linear-gradient(left, @startColor, @midColor @colorStop, @endColor); background-image: -moz-linear-gradient(left, @startColor, @midColor @colorStop, @endColor); - background-image: -o-linear-gradient(left, @startColor, @midColor @colorStop, @endColor); background-image: linear-gradient(to right, @startColor, @midColor @colorStop, @endColor); background-repeat: no-repeat; filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@startColor),argb(@endColor))); // IE9 and down, gets no color-stop at all for proper fallback @@ -290,7 +286,6 @@ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor)); background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor); background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor); - background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor); background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor); background-repeat: no-repeat; filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down, gets no color-stop at all for proper fallback @@ -300,7 +295,6 @@ background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@innerColor), to(@outerColor)); background-image: -webkit-radial-gradient(circle, @innerColor, @outerColor); background-image: -moz-radial-gradient(circle, @innerColor, @outerColor); - background-image: -o-radial-gradient(circle, @innerColor, @outerColor); background-image: radial-gradient(circle, @innerColor, @outerColor); background-repeat: no-repeat; } @@ -309,7 +303,6 @@ background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); background-image: linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); } } From ce719925af8d0d4f443f46b6a93bd4e2d59aca8e Mon Sep 17 00:00:00 2001 From: Robert Burns Date: Sat, 20 Apr 2013 13:25:22 -0400 Subject: [PATCH 03/16] Fix carousel examples within docs --- docs/docs.html | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/docs.html b/docs/docs.html index 976396eba7..8eaab75d4e 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.

-
+ - + - +
From afdab35aca4ccfbe9214c4cdf6f6b1d2da595cad Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 20 Apr 2013 12:09:08 -0700 Subject: [PATCH 04/16] Fixes #7640: only reset margin on last-child p within blockquotes --- docs/assets/css/bootstrap.css | 24 +++++++++--------------- less/type.less | 6 ++++-- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b9809980c3..1e86761f47 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); diff --git a/less/type.less b/less/type.less index 5305a0df69..1235b39318 100644 --- a/less/type.less +++ b/less/type.less @@ -196,15 +196,17 @@ abbr.initialism { // Blockquotes blockquote { - padding: 0 0 0 15px; + padding: (@line-height-base/2) @line-height-base; margin: 0 0 @line-height-base; border-left: 5px solid @grayLighter; p { - margin-bottom: 0; font-size: (@font-size-base * 1.25); font-weight: 300; line-height: 1.25; } + p:last-child { + margin-bottom: 0; + } small { display: block; line-height: @line-height-base; From a956a3258b48e697666058889b3c0add591647a2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 20 Apr 2013 12:23:27 -0700 Subject: [PATCH 05/16] Alternate docs mention of breadcrumbs separator, as called out in #7601 --- docs/docs.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs.html b/docs/docs.html index 8eaab75d4e..7fc72bf9c5 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`.

  • Home
    • From 70f8d77012bea29b9544a14458450adb8fbd0a2c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 20 Apr 2013 12:28:36 -0700 Subject: [PATCH 06/16] correct grid class mention in docs --- docs/docs.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs.html b/docs/docs.html index 7fc72bf9c5..bb2aa68f3a 100644 --- a/docs/docs.html +++ b/docs/docs.html @@ -1896,7 +1896,7 @@ For example, <section> should be wrapped as inline. {% endhighlight %}

    Control sizing

    -

    Use relative sizing classes like .input-large or match your inputs to the grid column sizes using .span* classes.

    +

    Use relative sizing classes like .input-large or match your inputs to the grid column sizes using .col-span-* classes.

    Relative sizing

    Create larger or smaller form controls that match button sizes.

    From 04d782efabb8648bdd67c2d0d164518c01d2603e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 20 Apr 2013 12:29:12 -0700 Subject: [PATCH 07/16] correct grid class in example code --- docs/docs.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/docs.html b/docs/docs.html index bb2aa68f3a..dcb379bf04 100644 --- a/docs/docs.html +++ b/docs/docs.html @@ -2679,7 +2679,7 @@ For example, <section> should be wrapped as inline.
    - +
@@ -2690,7 +2690,7 @@ For example, <section> should be wrapped as inline.
- +
From 510c9a6ad87a1148fe59a7b8531d9b9e11b0ae17 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 20 Apr 2013 12:33:09 -0700 Subject: [PATCH 08/16] First pass at updated responsive utilities to be mobile-first. Pulled from #7490 by @apotropaic --- docs/assets/css/bootstrap.css | 42 +++++++++++++++++++++++--------- less/responsive-utilities.less | 44 ++++++++++++++++++---------------- 2 files changed, 54 insertions(+), 32 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1e86761f47..d24999c4a9 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; } } diff --git a/less/responsive-utilities.less b/less/responsive-utilities.less index bf43e8ef73..60c51c5b9a 100644 --- a/less/responsive-utilities.less +++ b/less/responsive-utilities.less @@ -19,34 +19,36 @@ // Visibility utilities -// For desktops -.visible-phone { display: none !important; } +// For Phones +.visible-phone { display: inherit !important; } .visible-tablet { display: none !important; } -.hidden-phone { } -.hidden-tablet { } -.hidden-desktop { display: none !important; } -.visible-desktop { display: inherit !important; } +.visible-desktop { display: none !important; } + +.hidden-phone { display: none !important; } +.hidden-tablet { display: inherit !important; } +.hidden-desktop { display: inherit !important; } + // Tablets & small desktops only @media (min-width: 768px) and (max-width: 979px) { - // Hide everything else - .hidden-desktop { display: inherit !important; } - .visible-desktop { display: none !important ; } - // Show + .visible-phone { display: none !important; } .visible-tablet { display: inherit !important; } - // Hide + .visible-desktop { display: none !important; } + + .hidden-phone { display: inherit !important; } .hidden-tablet { display: none !important; } + .hidden-desktop { display: inherit !important; } } -// Phones only -@media (max-width: 767px) { - // Hide everything else - .hidden-desktop { display: inherit !important; } - .visible-desktop { display: none !important; } - // Show - .visible-phone { display: inherit !important; } // Use inherit to restore previous behavior - // Hide - .hidden-phone { display: none !important; } +// For desktops +@media (min-width: 980px) { + .visible-phone { display: none !important; } + .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; } } // Print utilities @@ -56,4 +58,4 @@ @media print { .visible-print { display: inherit !important; } .hidden-print { display: none !important; } -} +} \ No newline at end of file From 0c9b161bb889a5f47f7ef0752d90c41c9f957695 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 20 Apr 2013 15:32:16 -0700 Subject: [PATCH 09/16] Fixes #7093: more consistent scrollspy docs --- docs/docs.html | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/docs/docs.html b/docs/docs.html index dcb379bf04..55e3dfb72b 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.

-