From 43d130762be1b3124baafc5953e552934cb1dfd7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Dec 2012 14:40:39 -0800 Subject: Fixes #6352: marketing-alternate broken nav in FF17 --- docs/examples/marketing-alternate.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs') diff --git a/docs/examples/marketing-alternate.html b/docs/examples/marketing-alternate.html index 8cbeb02a2..18135c9aa 100644 --- a/docs/examples/marketing-alternate.html +++ b/docs/examples/marketing-alternate.html @@ -57,6 +57,8 @@ } .navbar .nav { margin: 0; + display: table; + width: 100%; } .navbar .nav li { display: table-cell; -- cgit v1.2.3 From a24e47b5b81a216bcb1bb786b359c7000759c5dc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Dec 2012 15:08:05 -0800 Subject: Update the examples index: * Retina ready screenshots * Added screenshot and link to justified nav example (previously unlinked marketing-alternate.html) --- docs/assets/css/docs.css | 3 +++ .../img/examples/bootstrap-example-carousel.png | Bin 53908 -> 339980 bytes .../img/examples/bootstrap-example-fluid.jpg | Bin 23408 -> 0 bytes .../img/examples/bootstrap-example-fluid.png | Bin 0 -> 209039 bytes .../assets/img/examples/bootstrap-example-hero.jpg | Bin 19805 -> 0 bytes .../examples/bootstrap-example-justified-nav.png | Bin 0 -> 136021 bytes .../bootstrap-example-marketing-narrow.png | Bin 21869 -> 117303 bytes .../img/examples/bootstrap-example-marketing.png | Bin 0 -> 134269 bytes .../img/examples/bootstrap-example-signin.png | Bin 4202 -> 22037 bytes .../img/examples/bootstrap-example-starter.jpg | Bin 5584 -> 0 bytes .../img/examples/bootstrap-example-starter.png | Bin 0 -> 36099 bytes .../examples/bootstrap-example-sticky-footer.png | Bin 9749 -> 30820 bytes docs/getting-started.html | 15 ++++++++++++--- docs/templates/pages/getting-started.mustache | 15 ++++++++++++--- 14 files changed, 27 insertions(+), 6 deletions(-) delete mode 100644 docs/assets/img/examples/bootstrap-example-fluid.jpg create mode 100644 docs/assets/img/examples/bootstrap-example-fluid.png delete mode 100644 docs/assets/img/examples/bootstrap-example-hero.jpg create mode 100644 docs/assets/img/examples/bootstrap-example-justified-nav.png create mode 100644 docs/assets/img/examples/bootstrap-example-marketing.png delete mode 100644 docs/assets/img/examples/bootstrap-example-starter.jpg create mode 100644 docs/assets/img/examples/bootstrap-example-starter.png (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index c7bddd45a..114241404 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -552,6 +552,9 @@ h2 + .row { /* Example page ------------------------- */ +.bootstrap-examples h4 { + margin: 10px 0 5px; +} .bootstrap-examples p { font-size: 13px; line-height: 18px; diff --git a/docs/assets/img/examples/bootstrap-example-carousel.png b/docs/assets/img/examples/bootstrap-example-carousel.png index a2f668abe..725fe07b9 100644 Binary files a/docs/assets/img/examples/bootstrap-example-carousel.png and b/docs/assets/img/examples/bootstrap-example-carousel.png differ diff --git a/docs/assets/img/examples/bootstrap-example-fluid.jpg b/docs/assets/img/examples/bootstrap-example-fluid.jpg deleted file mode 100644 index d616ba001..000000000 Binary files a/docs/assets/img/examples/bootstrap-example-fluid.jpg and /dev/null differ diff --git a/docs/assets/img/examples/bootstrap-example-fluid.png b/docs/assets/img/examples/bootstrap-example-fluid.png new file mode 100644 index 000000000..5f49a332f Binary files /dev/null and b/docs/assets/img/examples/bootstrap-example-fluid.png differ diff --git a/docs/assets/img/examples/bootstrap-example-hero.jpg b/docs/assets/img/examples/bootstrap-example-hero.jpg deleted file mode 100644 index a9662d2b4..000000000 Binary files a/docs/assets/img/examples/bootstrap-example-hero.jpg and /dev/null differ diff --git a/docs/assets/img/examples/bootstrap-example-justified-nav.png b/docs/assets/img/examples/bootstrap-example-justified-nav.png new file mode 100644 index 000000000..3d1e23389 Binary files /dev/null and b/docs/assets/img/examples/bootstrap-example-justified-nav.png differ diff --git a/docs/assets/img/examples/bootstrap-example-marketing-narrow.png b/docs/assets/img/examples/bootstrap-example-marketing-narrow.png index a7ac9ef98..4bca8cdaf 100644 Binary files a/docs/assets/img/examples/bootstrap-example-marketing-narrow.png and b/docs/assets/img/examples/bootstrap-example-marketing-narrow.png differ diff --git a/docs/assets/img/examples/bootstrap-example-marketing.png b/docs/assets/img/examples/bootstrap-example-marketing.png new file mode 100644 index 000000000..206e26e34 Binary files /dev/null and b/docs/assets/img/examples/bootstrap-example-marketing.png differ diff --git a/docs/assets/img/examples/bootstrap-example-signin.png b/docs/assets/img/examples/bootstrap-example-signin.png index 39210096b..b649a985d 100644 Binary files a/docs/assets/img/examples/bootstrap-example-signin.png and b/docs/assets/img/examples/bootstrap-example-signin.png differ diff --git a/docs/assets/img/examples/bootstrap-example-starter.jpg b/docs/assets/img/examples/bootstrap-example-starter.jpg deleted file mode 100644 index 3b1cbf9e7..000000000 Binary files a/docs/assets/img/examples/bootstrap-example-starter.jpg and /dev/null differ diff --git a/docs/assets/img/examples/bootstrap-example-starter.png b/docs/assets/img/examples/bootstrap-example-starter.png new file mode 100644 index 000000000..1bf4b85ec Binary files /dev/null and b/docs/assets/img/examples/bootstrap-example-starter.png differ diff --git a/docs/assets/img/examples/bootstrap-example-sticky-footer.png b/docs/assets/img/examples/bootstrap-example-sticky-footer.png index c2255044d..fb80e7b92 100644 Binary files a/docs/assets/img/examples/bootstrap-example-sticky-footer.png and b/docs/assets/img/examples/bootstrap-example-sticky-footer.png differ diff --git a/docs/getting-started.html b/docs/getting-started.html index cc6e0b71c..116d020e5 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -243,21 +243,21 @@ - -- cgit v1.2.3 From 53f9e25150c0dcd8f2285691b0e74a7bde553fbe Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 11 Jan 2013 20:30:56 -0800 Subject: Comment fix --- docs/examples/carousel.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index 30053e4be..328fe5a1e 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -68,7 +68,7 @@ - /* CUSTOMIZE THE NAVBAR + /* CUSTOMIZE THE CAROUSEL -------------------------------------------------- */ /* Carousel base class */ -- cgit v1.2.3 From d7c93fc647f38fb4baab9a2f95225600050dc1fe Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 11 Jan 2013 20:38:14 -0800 Subject: Fixes #6478: scope table backgrounds to immediate td/th elements --- docs/assets/css/bootstrap.css | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 2e2f06160..4ff2a3539 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2115,8 +2115,8 @@ table { background-color: #f9f9f9; } -.table-hover tbody tr:hover td, -.table-hover tbody tr:hover th { +.table-hover tbody tr:hover > td, +.table-hover tbody tr:hover > th { background-color: #f5f5f5; } @@ -2213,35 +2213,35 @@ table th[class*="span"], margin-left: 0; } -.table tbody tr.success td { +.table tbody tr.success > td { background-color: #dff0d8; } -.table tbody tr.error td { +.table tbody tr.error > td { background-color: #f2dede; } -.table tbody tr.warning td { +.table tbody tr.warning > td { background-color: #fcf8e3; } -.table tbody tr.info td { +.table tbody tr.info > td { background-color: #d9edf7; } -.table-hover tbody tr.success:hover td { +.table-hover tbody tr.success:hover > td { background-color: #d0e9c6; } -.table-hover tbody tr.error:hover td { +.table-hover tbody tr.error:hover > td { background-color: #ebcccc; } -.table-hover tbody tr.warning:hover td { +.table-hover tbody tr.warning:hover > td { background-color: #faf2cc; } -.table-hover tbody tr.info:hover td { +.table-hover tbody tr.info:hover > td { background-color: #c4e3f3; } -- cgit v1.2.3 From d3b3b4c48f86be988148948eb97f0b2ef6ca41c1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 11 Jan 2013 20:40:17 -0800 Subject: Fixes #6474: remove duplicate .btn border colors to make @btn-border work --- docs/assets/css/bootstrap.css | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 4ff2a3539..478586a14 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3169,11 +3169,11 @@ button.close { background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); background-repeat: repeat-x; - border: 1px solid #bbbbbb; + border: 1px solid #cccccc; *border: 0; border-color: #e6e6e6 #e6e6e6 #bfbfbf; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - border-bottom-color: #a2a2a2; + border-bottom-color: #b3b3b3; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -3308,11 +3308,6 @@ input[type="button"].btn-block { color: rgba(255, 255, 255, 0.75); } -.btn { - border-color: #c5c5c5; - border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); -} - .btn-primary { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -- cgit v1.2.3 From 56a24027c374fd9c75c150d99332fe12b0299b35 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 11 Jan 2013 20:42:44 -0800 Subject: Fixes #6473: Make .input-prepend and .input-append inline-block to match other form states --- docs/assets/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 478586a14..aca0e7a18 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1646,6 +1646,7 @@ select:focus:invalid:focus { .input-append, .input-prepend { + display: inline-block; margin-bottom: 5px; font-size: 0; white-space: nowrap; -- cgit v1.2.3 From 767a293b4d7a1221a6c859fa24a38b724d564ba6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 11 Jan 2013 20:46:21 -0800 Subject: Increase input group margin on bottom and vertically center to match inputs --- docs/assets/css/bootstrap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index aca0e7a18..8abdfd205 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1647,9 +1647,10 @@ select:focus:invalid:focus { .input-append, .input-prepend { display: inline-block; - margin-bottom: 5px; + margin-bottom: 10px; font-size: 0; white-space: nowrap; + vertical-align: middle; } .input-append input, -- cgit v1.2.3 From b242ff7851e12dbca9b7e22ae1c9a74686ec606d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 11 Jan 2013 20:51:11 -0800 Subject: Fixes #6553: example fix for validation states --- docs/base-css.html | 10 ++++++++++ docs/templates/pages/base-css.mustache | 10 ++++++++++ 2 files changed, 20 insertions(+) (limited to 'docs') diff --git a/docs/base-css.html b/docs/base-css.html index d0fdbeb72..5b6877595 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1630,6 +1630,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped <span class="help-inline">Something may have gone wrong</span> </div> </div> + <div class="control-group error"> <label class="control-label" for="inputError">Input with error</label> <div class="controls"> @@ -1637,6 +1638,15 @@ For example, <code>&lt;section&gt;</code> should be wrapped <span class="help-inline">Please correct the error</span> </div> </div> + +<div class="control-group info"> + <label class="control-label" for="inputInfo">Input with info</label> + <div class="controls"> + <input type="text" id="inputInfo"> + <span class="help-inline">Username is already taken</span> + </div> +</div> + <div class="control-group success"> <label class="control-label" for="inputSuccess">Input with success</label> <div class="controls"> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index efb69bdae..99724ebfd 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1567,6 +1567,7 @@ <span class="help-inline">{{_i}}Something may have gone wrong{{/i}}</span> </div> </div> + <div class="control-group error"> <label class="control-label" for="inputError">{{_i}}Input with error{{/i}}</label> <div class="controls"> @@ -1574,6 +1575,15 @@ <span class="help-inline">{{_i}}Please correct the error{{/i}}</span> </div> </div> + +<div class="control-group info"> + <label class="control-label" for="inputInfo">{{_i}}Input with info{{/i}}</label> + <div class="controls"> + <input type="text" id="inputInfo"> + <span class="help-inline">{{_i}}Username is already taken{{/i}}</span> + </div> +</div> + <div class="control-group success"> <label class="control-label" for="inputSuccess">{{_i}}Input with success{{/i}}</label> <div class="controls"> -- cgit v1.2.3 From 88e816956a731c9e3284c55a7be0c81b447c2601 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 11 Jan 2013 20:52:39 -0800 Subject: Fixes #6552: example fix for button group --- docs/components.html | 6 +++--- docs/templates/pages/components.mustache | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'docs') diff --git a/docs/components.html b/docs/components.html index 10ffd2e0c..751418816 100644 --- a/docs/components.html +++ b/docs/components.html @@ -272,9 +272,9 @@ 
 <div class="btn-group">
-  <button class="btn">1</button>
-  <button class="btn">2</button>
-  <button class="btn">3</button>
+  <button class="btn">Left</button>
+  <button class="btn">Middle</button>
+  <button class="btn">Right</button>
 </div>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 632ceda2f..130f16a7a 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -201,9 +201,9 @@ 
 <div class="btn-group">
-  <button class="btn">1</button>
-  <button class="btn">2</button>
-  <button class="btn">3</button>
+  <button class="btn">Left</button>
+  <button class="btn">Middle</button>
+  <button class="btn">Right</button>
 </div>
-- cgit v1.2.3 From 4de3a77a64b8f8f130d6d5134fb916c91d271e82 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 11 Jan 2013 20:55:09 -0800 Subject: Fixes #6547: Make blockquotes use multiple of @baseFontSize --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 8abdfd205..0114d4e2f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -899,9 +899,9 @@ blockquote { blockquote p { margin-bottom: 0; - font-size: 16px; + font-size: 17.5px; font-weight: 300; - line-height: 25px; + line-height: 1.25; } blockquote small { -- cgit v1.2.3 From 42efd9f7308568bd4773dbc854f8608a677833ae Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 11 Jan 2013 20:58:24 -0800 Subject: Address #6545: clarify initialization of tooltips in docs --- docs/javascript.html | 2 +- docs/templates/pages/javascript.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/javascript.html b/docs/javascript.html index 3e9892843..80500b18e 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -767,6 +767,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

Examples

Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, use CSS3 for animations, and data-attributes for local title storage.

+

For performance reasons, the tooltip and popover data-apis are opt in, meaning you must initialize them yourself.

Hover over the links below to see tooltips:

Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral. @@ -865,7 +866,6 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

Markup

-

For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.

<a href="#" data-toggle="tooltip" title="first tooltip">hover over me</a>

Methods

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index aa57c1eab..6e361fa60 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -697,6 +697,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

{{_i}}Examples{{/i}}

{{_i}}Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, use CSS3 for animations, and data-attributes for local title storage.{{/i}}

+

{{_i}}For performance reasons, the tooltip and popover data-apis are opt in, meaning you must initialize them yourself.{{/i}}

{{_i}}Hover over the links below to see tooltips:{{/i}}

{{_i}}Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.{{/i}} @@ -795,7 +796,6 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

{{_i}}Markup{{/i}}

-

{{_i}}For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.{{/i}}

<a href="#" data-toggle="tooltip" title="{{_i}}first tooltip{{/i}}">{{_i}}hover over me{{/i}}</a>

{{_i}}Methods{{/i}}

-- cgit v1.2.3 From 6f894c62a57fd93e9ba41230d794cd8ad48c03d1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 11 Jan 2013 23:35:22 -0800 Subject: Fixes #6528: Make .navbar a:hover .caret use @navbarlinkcolorhover and not -active --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0114d4e2f..c632f371e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4659,8 +4659,8 @@ input[type="submit"].btn.btn-mini { } .navbar .nav li.dropdown > a:hover .caret { - border-top-color: #555555; - border-bottom-color: #555555; + border-top-color: #333333; + border-bottom-color: #333333; } .navbar .nav li.dropdown.open > .dropdown-toggle, -- cgit v1.2.3 From 19e2ad0eb64c0e6bd40557c2ce3585702b54f6f9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 11 Jan 2013 23:38:53 -0800 Subject: Fixes #6538: Add th support to all the .table-rounded selectors --- docs/assets/css/bootstrap.css | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c632f371e..57325606f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2053,14 +2053,16 @@ table { } .table-bordered thead:first-child tr:first-child > th:first-child, -.table-bordered tbody:first-child tr:first-child > td:first-child { +.table-bordered tbody:first-child tr:first-child > td:first-child, +.table-bordered tbody:first-child tr:first-child > th:first-child { -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-topleft: 4px; } .table-bordered thead:first-child tr:first-child > th:last-child, -.table-bordered tbody:first-child tr:first-child > td:last-child { +.table-bordered tbody:first-child tr:first-child > td:last-child, +.table-bordered tbody:first-child tr:first-child > th:last-child { -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; -moz-border-radius-topright: 4px; @@ -2068,7 +2070,9 @@ table { .table-bordered thead:last-child tr:last-child > th:first-child, .table-bordered tbody:last-child tr:last-child > td:first-child, -.table-bordered tfoot:last-child tr:last-child > td:first-child { +.table-bordered tbody:last-child tr:last-child > th:first-child, +.table-bordered tfoot:last-child tr:last-child > td:first-child, +.table-bordered tfoot:last-child tr:last-child > th:first-child { -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; -moz-border-radius-bottomleft: 4px; @@ -2076,7 +2080,9 @@ table { .table-bordered thead:last-child tr:last-child > th:last-child, .table-bordered tbody:last-child tr:last-child > td:last-child, -.table-bordered tfoot:last-child tr:last-child > td:last-child { +.table-bordered tbody:last-child tr:last-child > th:last-child, +.table-bordered tfoot:last-child tr:last-child > td:last-child, +.table-bordered tfoot:last-child tr:last-child > th:last-child { -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; -moz-border-radius-bottomright: 4px; -- cgit v1.2.3 From aaf80d410a24b280c141bdc267056b1dde089089 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 12 Jan 2013 00:20:13 -0800 Subject: fix username navbar text in fluid example for responsive variations --- docs/examples/fluid.html | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'docs') diff --git a/docs/examples/fluid.html b/docs/examples/fluid.html index f08661aec..242050ab8 100644 --- a/docs/examples/fluid.html +++ b/docs/examples/fluid.html @@ -17,6 +17,15 @@ .sidebar-nav { padding: 9px 0; } + + @media (max-width: 980px) { + /* Enable use of floated navbar text */ + .navbar-text.pull-right { + float: none; + padding-left: 5px; + padding-right: 5px; + } + } -- cgit v1.2.3 From a7231854c91399aafb371ccdf2b930037a7ac5ed Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 12 Jan 2013 00:33:12 -0800 Subject: Address #6459 and add mention of disabled links in dropdowns to le docs --- docs/components.html | 19 +++++++++++++++++++ docs/templates/pages/components.mustache | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) (limited to 'docs') diff --git a/docs/components.html b/docs/components.html index 751418816..bbb0dc39d 100644 --- a/docs/components.html +++ b/docs/components.html @@ -161,6 +161,25 @@ <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dLabel"> ... </ul> + + +

Disabled menu options

+

Add .disabled to a <li> in the dropdown to disable the link.

+
+
+ +
+
+
+<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu">
+  <li><a tabindex="-1" href="#">Regular link</a></li>
+  <li><a tabindex="-1" href="#">Disabled link</a></li>
+  <li><a tabindex="-1" href="#">Another link</a></li>
+</ul>

Sub menus on dropdowns

diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 130f16a7a..bdd918da9 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -90,6 +90,25 @@ <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dLabel"> ... </ul> + + +

{{_i}}Disabled menu options{{/i}}

+

{{_i}}Add .disabled to a <li> in the dropdown to disable the link.{{/i}}

+
+
+ +
+
{{! /example }} +
+<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu">
+  <li><a tabindex="-1" href="#">{{_i}}Regular link{{/i}}</a></li>
+  <li><a tabindex="-1" href="#">{{_i}}Disabled link{{/i}}</a></li>
+  <li><a tabindex="-1" href="#">{{_i}}Another link{{/i}}</a></li>
+</ul>

{{_i}}Sub menus on dropdowns{{/i}}

-- cgit v1.2.3 From 6f275c61486b6ed923d433dd1b24b762ea5d111f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 12 Jan 2013 12:41:01 -0800 Subject: Update extend page to point to readme for compiling. Note that we'll be dropping this page entirely as it's out of date and other compiling options are not recommended for contributing back to the project. --- docs/extend.html | 10 +--------- docs/templates/pages/extend.mustache | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) (limited to 'docs') diff --git a/docs/extend.html b/docs/extend.html index dfbe436fa..e8d34f9a8 100644 --- a/docs/extend.html +++ b/docs/extend.html @@ -136,16 +136,8 @@

Tools for compiling

-

Node with makefile

-

Install the LESS command line compiler, JSHint, Recess, and uglify-js globally with npm by running the following command:

- 
$ npm install -g less jshint recess uglify-js
-

Once installed just run make from the root of your bootstrap directory and you're all set.

-

Additionally, if you have watchr installed, you may run make watch to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).

-

Command line

-

Install the LESS command line tool via Node and run the following command:

- 
$ lessc ./less/bootstrap.less > bootstrap.css
-

Be sure to include --compress in that command if you're trying to save some bytes!

+

Follow the instructions in the project readme on GitHub for compiling via command line.

JavaScript

Download the latest Less.js and include the path to it (and Bootstrap) in the <head>.

diff --git a/docs/templates/pages/extend.mustache b/docs/templates/pages/extend.mustache index c1976427c..b5c8d5747 100644 --- a/docs/templates/pages/extend.mustache +++ b/docs/templates/pages/extend.mustache @@ -65,16 +65,8 @@

{{_i}}Tools for compiling{{/i}}

-

{{_i}}Node with makefile{{/i}}

-

{{_i}}Install the LESS command line compiler, JSHint, Recess, and uglify-js globally with npm by running the following command:{{/i}}

- 
$ npm install -g less jshint recess uglify-js
-

{{_i}}Once installed just run make from the root of your bootstrap directory and you're all set.{{/i}}

-

{{_i}}Additionally, if you have watchr installed, you may run make watch to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).{{/i}}

-

{{_i}}Command line{{/i}}

-

{{_i}}Install the LESS command line tool via Node and run the following command:{{/i}}

- 
$ lessc ./less/bootstrap.less > bootstrap.css
-

{{_i}}Be sure to include --compress in that command if you're trying to save some bytes!{{/i}}

+

{{_i}}Follow the instructions in the project readme on GitHub for compiling via command line.{{/i}}

{{_i}}JavaScript{{/i}}

{{_i}}Download the latest Less.js and include the path to it (and Bootstrap) in the <head>.{{/i}}

-- cgit v1.2.3 From 4b34f4947aedc0e8539eee779e3921f44e0bca8b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 12 Jan 2013 19:49:15 -0800 Subject: Update Holder.js 1.6 to 1.9 --- docs/assets/js/holder/holder.js | 167 +++++++++++++++++++++++++++------------- 1 file changed, 113 insertions(+), 54 deletions(-) (limited to 'docs') diff --git a/docs/assets/js/holder/holder.js b/docs/assets/js/holder/holder.js index 2377badf0..9c36d4281 100755 --- a/docs/assets/js/holder/holder.js +++ b/docs/assets/js/holder/holder.js @@ -1,7 +1,7 @@ /* -Holder - 1.6 - client side image placeholders -(c) 2012 Ivan Malopinsky / http://imsky.co +Holder - 1.9 - client side image placeholders +(c) 2012-2013 Ivan Malopinsky / http://imsky.co Provided under the Apache 2.0 License: http://www.apache.org/licenses/LICENSE-2.0 Commercial use requires attribution. @@ -33,6 +33,13 @@ function selector(a){ //shallow object property extend function extend(a,b){var c={};for(var d in a)c[d]=a[d];for(var e in b)c[e]=b[e];return c} +//hasOwnProperty polyfill +if (!Object.prototype.hasOwnProperty) + Object.prototype.hasOwnProperty = function(prop) { + var proto = this.__proto__ || this.constructor.prototype; + return (prop in this) && (!(prop in proto) || proto[prop] !== this[prop]); + } + function text_size(width, height, template) { var dimension_arr = [height, width].sort(); var maxFactor = Math.round(dimension_arr[1] / 16), @@ -47,6 +54,7 @@ function draw(ctx, dimensions, template, ratio) { var ts = text_size(dimensions.width, dimensions.height, template); var text_height = ts.height; var width = dimensions.width * ratio, height = dimensions.height * ratio; + var font = template.font ? template.font : "sans-serif"; canvas.width = width; canvas.height = height; ctx.textAlign = "center"; @@ -54,39 +62,42 @@ function draw(ctx, dimensions, template, ratio) { ctx.fillStyle = template.background; ctx.fillRect(0, 0, width, height); ctx.fillStyle = template.foreground; - ctx.font = "bold " + text_height + "px sans-serif"; + ctx.font = "bold " + text_height + "px "+font; var text = template.text ? template.text : (dimensions.width + "x" + dimensions.height); if (ctx.measureText(text).width / width > 1) { text_height = template.size / (ctx.measureText(text).width / width); } - ctx.font = "bold " + (text_height * ratio) + "px sans-serif"; + //Resetting font size if necessary + ctx.font = "bold " + (text_height * ratio) + "px "+font; ctx.fillText(text, (width / 2), (height / 2), width); return canvas.toDataURL("image/png"); } function render(mode, el, holder, src) { - var dimensions = holder.dimensions, theme = holder.theme, - text = holder.text; + text = holder.text ? decodeURIComponent(holder.text) : holder.text; var dimensions_caption = dimensions.width + "x" + dimensions.height; - theme = (text ? extend(theme, { - text: text - }) : theme); + theme = (text ? extend(theme, { text: text }) : theme); + theme = (holder.font ? extend(theme, {font: holder.font}) : theme); var ratio = 1; if(window.devicePixelRatio && window.devicePixelRatio > 1){ ratio = window.devicePixelRatio; } - + if (mode == "image") { el.setAttribute("data-src", src); el.setAttribute("alt", text ? text : theme.text ? theme.text + " [" + dimensions_caption + "]" : dimensions_caption); - el.style.width = dimensions.width + "px"; - el.style.height = dimensions.height + "px"; + + if(fallback || !holder.auto){ + el.style.width = dimensions.width + "px"; + el.style.height = dimensions.height + "px"; + } if (fallback) { el.style.backgroundColor = theme.background; + } else{ el.setAttribute("src", draw(ctx, dimensions, theme, ratio)); @@ -108,14 +119,7 @@ function fluid(el, holder, src) { text: text }) : theme); - var fluid = document.createElement("table"); - fluid.setAttribute("cellspacing",0) - fluid.setAttribute("cellpadding",0) - fluid.setAttribute("border",0) - - var row = document.createElement("tr") - .appendChild(document.createElement("td") - .appendChild(document.createTextNode(theme.text))); + var fluid = document.createElement("div"); fluid.style.backgroundColor = theme.background; fluid.style.color = theme.foreground; @@ -124,31 +128,38 @@ function fluid(el, holder, src) { fluid.style.height = holder.dimensions.height + (holder.dimensions.height.indexOf("%")>0?"":"px"); fluid.id = el.id; - var frag = document.createDocumentFragment(), - tbody = document.createElement("tbody"), - tr = document.createElement("tr"), - td = document.createElement("td"); - tr.appendChild(td); - tbody.appendChild(tr); - frag.appendChild(tbody); - + el.style.width=0; + el.style.height=0; + if (theme.text) { - td.appendChild(document.createTextNode(theme.text)) - fluid.appendChild(frag); + fluid.appendChild(document.createTextNode(theme.text)) } else { - td.appendChild(document.createTextNode(dimensions_caption)) - fluid.appendChild(frag); + fluid.appendChild(document.createTextNode(dimensions_caption)) fluid_images.push(fluid); setTimeout(fluid_update, 0); } - - el.parentNode.replaceChild(fluid, el); + + el.parentNode.insertBefore(fluid, el.nextSibling) + + if(window.jQuery){ + jQuery(function($){ + $(el).on("load", function(){ + el.style.width = fluid.style.width; + el.style.height = fluid.style.height; + $(el).show(); + $(fluid).remove(); + }); + }) + } } function fluid_update() { for (i in fluid_images) { - var el = fluid_images[i]; - var label = el.getElementsByTagName("td")[0].firstChild; + if(!fluid_images.hasOwnProperty(i)) continue; + var el = fluid_images[i], + label = el.firstChild; + + el.style.lineHeight = el.offsetHeight+"px"; label.data = el.offsetWidth + "x" + el.offsetHeight; } } @@ -175,6 +186,11 @@ function parse_flags(flags, options) { ret.theme = options.themes[flag]; } else if (app.flags.text.match(flag)) { ret.text = app.flags.text.output(flag); + } else if(app.flags.font.match(flag)){ + ret.font = app.flags.font.output(flag); + } + else if(app.flags.auto.match(flag)){ + ret.auto = true; } } @@ -199,7 +215,7 @@ var fluid_images = []; var settings = { domain: "holder.js", images: "img", - elements: ".holderjs", + bgnodes: ".holderjs", themes: { "gray": { background: "#eee", @@ -217,13 +233,13 @@ var settings = { size: 12 } }, - stylesheet: ".holderjs-fluid {font-size:16px;font-weight:bold;text-align:center;font-family:sans-serif;border-collapse:collapse;border:0;vertical-align:middle;margin:0}" + stylesheet: ".holderjs-fluid {font-size:16px;font-weight:bold;text-align:center;font-family:sans-serif;margin:0}" }; app.flags = { dimensions: { - regex: /(\d+)x(\d+)/, + regex: /^(\d+)x(\d+)$/, output: function (val) { var exec = this.regex.exec(val); return { @@ -233,7 +249,7 @@ app.flags = { } }, fluid: { - regex: /([0-9%]+)x([0-9%]+)/, + regex: /^([0-9%]+)x([0-9%]+)$/, output: function (val) { var exec = this.regex.exec(val); return { @@ -258,10 +274,20 @@ app.flags = { output: function (val) { return this.regex.exec(val)[1]; } + }, + font: { + regex: /font\:(.*)/, + output: function(val){ + return this.regex.exec(val)[1]; + } + }, + auto: { + regex: /^auto$/ } } for (var flag in app.flags) { + if(!app.flags.hasOwnProperty(flag)) continue; app.flags[flag].match = function (val) { return val.match(this.regex) } @@ -285,29 +311,58 @@ app.add_image = function (src, el) { }; app.run = function (o) { - var options = extend(settings, o), - images_nodes = selector(options.images), - elements = selector(options.elements), - preempted = true, - images = []; + var options = extend(settings, o), images = []; + + if(options.images instanceof window.NodeList){ + imageNodes = options.images; + } + else if(options.images instanceof window.Node){ + imageNodes = [options.images]; + } + else{ + imageNodes = selector(options.images); + } + + if(options.elements instanceof window.NodeList){ + bgnodes = options.bgnodes; + } + else if(options.bgnodes instanceof window.Node){ + bgnodes = [options.bgnodes]; + } + else{ + bgnodes = selector(options.bgnodes); + } - for (i = 0, l = images_nodes.length; i < l; i++) images.push(images_nodes[i]); + preempted = true; - var holdercss = document.createElement("style"); - holdercss.type = "text/css"; - holdercss.styleSheet ? holdercss.styleSheet.cssText = options.stylesheet : holdercss.textContent = options.stylesheet; - document.getElementsByTagName("head")[0].appendChild(holdercss); + for (i = 0, l = imageNodes.length; i < l; i++) images.push(imageNodes[i]); + + var holdercss = document.getElementById("holderjs-style"); + + if(!holdercss){ + holdercss = document.createElement("style"); + holdercss.setAttribute("id", "holderjs-style"); + holdercss.type = "text/css"; + document.getElementsByTagName("head")[0].appendChild(holdercss); + } + + if(holdercss.styleSheet){ + holdercss.styleSheet += options.stylesheet; + } + else{ + holdercss.textContent+= options.stylesheet; + } var cssregex = new RegExp(options.domain + "\/(.*?)\"?\\)"); - for (var l = elements.length, i = 0; i < l; i++) { - var src = window.getComputedStyle(elements[i], null) + for (var l = bgnodes.length, i = 0; i < l; i++) { + var src = window.getComputedStyle(bgnodes[i], null) .getPropertyValue("background-image"); var flags = src.match(cssregex); if (flags) { var holder = parse_flags(flags[1].split("/"), options); if (holder) { - render("background", elements[i], holder, src); + render("background", bgnodes[i], holder, src); } } } @@ -339,4 +394,8 @@ contentLoaded(win, function () { preempted || app.run(); }); -})(Holder, window); +if ( typeof define === "function" && define.amd ) { + define( "Holder", [], function () { return app; } ); +} + +})(Holder, window); \ No newline at end of file -- cgit v1.2.3