From 0c8d2e37e76db3d3b47ca9eb5340def031b9196b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 29 Nov 2011 23:16:38 -0800 Subject: adding bordered table to docs and showing it works with colspan --- docs/base-css.html | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/docs/base-css.html b/docs/base-css.html index bab55f0e4..7626d1668 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -630,7 +630,42 @@ <table class="striped-table"> ... </table> -

3. Condensed table

+

3. Bordered table

+

Add borders around the entire table and between each row, plus a bit of rounded corners for aesthetic purposes.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
#First NameLast NameLanguage
1Some OneEnglish
2 JoeSixpackEnglish
3StuDentCode
+

Note: Zebra-striping is a progressive enhancement not available for older browsers like IE8 and below.

+
+<table class="striped-table">
+  ...
+</table>
+

4. Condensed table

Make your tables more compact by adding the .condensed-table class to cut table cell padding in half (from 10px to 5px).

@@ -666,7 +701,7 @@ <table class="condensed-table"> ... </table> -

4. Striped table w/ TableSorter.js

+

5. Striped table w/ TableSorter.js

Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via jQuery and the Tablesorter plugin. Click any column’s header to change the sort.

-- cgit v1.2.3 From 90c190d4efedd4080c574b34bffdf54cd5b9ed88 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 29 Nov 2011 23:48:27 -0800 Subject: updates to add warning for bordered tables to docs, fix to spacing on prettyprint pre blocks --- bootstrap.css | 5 ++++- bootstrap.min.css | 3 ++- docs/base-css.html | 9 ++++++++- lib/type.less | 5 +++++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 6c5e58b71..aa852460e 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Tue Nov 29 22:53:00 PST 2011 + * Date: Tue Nov 29 23:48:09 PST 2011 */ html, body { margin: 0; @@ -514,6 +514,9 @@ pre { white-space: pre-wrap; word-break: break-all; } +pre.prettyprint { + margin-bottom: 18px; +} pre code { padding: 0; background-color: transparent; diff --git a/bootstrap.min.css b/bootstrap.min.css index 7e9e633ae..e7505341e 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -89,7 +89,8 @@ blockquote.pull-right{float:right;}blockquote.pull-right p,blockquote.pull-right address{display:block;margin-bottom:18px;line-height:18px;} code,pre{padding:0 3px 2px;font-family:"Menlo",Monaco,Courier New,monospace;font-size:12px;color:#404040;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} code{padding:1px 3px;background-color:#fee9cc;} -pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre code{padding:0;background-color:transparent;} +pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;} +pre code{padding:0;background-color:transparent;} form{margin-bottom:18px;} legend{display:block;width:100%;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#404040;border-bottom:1px solid #eee;} label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:18px;} diff --git a/docs/base-css.html b/docs/base-css.html index 7626d1668..cc1b4903c 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -632,6 +632,7 @@ </table>

3. Bordered table

Add borders around the entire table and between each row, plus a bit of rounded corners for aesthetic purposes.

+

Note Bordered tables do not work well with rowspan due to somewhat hacky CSS applied to the tables. Sorry about that!

@@ -648,7 +649,13 @@ - + + + + + + + diff --git a/lib/type.less b/lib/type.less index 407a20ec2..bdc99acdf 100644 --- a/lib/type.less +++ b/lib/type.less @@ -205,6 +205,11 @@ pre { white-space: pre-wrap; word-break: break-all; + // Make prettyprint styles more spaced out for readability + &.prettyprint { + margin-bottom: @baseLineHeight; + } + // Account for some code outputs that place code tags in pre tags code { padding: 0; -- cgit v1.2.3 From 447c9322e96ebd1102115aea01d925536016351a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 29 Nov 2011 23:56:01 -0800 Subject: update all leads on docs pages --- docs/base-css.html | 2 +- docs/components.html | 2 +- docs/index.html | 4 ++-- docs/javascript.html | 2 +- docs/less.html | 2 +- docs/scaffolding.html | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/base-css.html b/docs/base-css.html index cc1b4903c..2b7d17b4a 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -50,7 +50,7 @@ ================================================== -->

Base CSS

-

The core typography, form, and table styles of Bootstrap

+

On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.

diff --git a/docs/components.html b/docs/components.html index bb2f326b4..c311d20e6 100644 --- a/docs/components.html +++ b/docs/components.html @@ -50,7 +50,7 @@ ================================================== -->

Components

-

Reusable patterns for navigation, alerts, popovers, and much more

+

Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.

diff --git a/docs/index.html b/docs/index.html index 977ba5c9d..ff7d56976 100644 --- a/docs/index.html +++ b/docs/index.html @@ -55,8 +55,8 @@

Bootstrap,
from Twitter

Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, complete with core HTML, CSS, and JS for grids, type, forms, navigation, and many more components.

- Download on GitHub - Get started + Download on GitHub + Get started Currently v2.0.0

diff --git a/docs/javascript.html b/docs/javascript.html index 2db37a9fe..09cdc714c 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -83,7 +83,7 @@ ================================================== -->

Javascript for Bootstrap

-

Bring Bootstrap's components to life with custom plugins for jQuery and Ender

+

Bring Bootstrap's components to life with flexible, custom javascript plugins for many of our custom components that work with jQuery and Ender.

diff --git a/docs/less.html b/docs/less.html index 2d35eea26..97d95a3ab 100644 --- a/docs/less.html +++ b/docs/less.html @@ -50,7 +50,7 @@ ================================================== -->

Using LESS with Bootstrap

-

Be a boss and use Bootstrap's built-in variables, mixins, and more via LESS

+

Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.

diff --git a/docs/scaffolding.html b/docs/scaffolding.html index f330d750d..d4d1c6526 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -50,7 +50,7 @@ ================================================== -->

Scaffolding

-

Responsive 12-column grid and fixed- and fluid-width layouts

+

Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.

-- cgit v1.2.3 From f2c40ee24d0caa26e79ed206370858918c603419 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 30 Nov 2011 00:39:38 -0800 Subject: adding step nav to components --- bootstrap.css | 44 +++++++++++++++++++++++- bootstrap.min.css | 6 ++++ docs/assets/css/docs.css | 88 ------------------------------------------------ docs/components.html | 22 ++++++++++++ lib/tabs-pills.less | 43 +++++++++++++++++++++++ 5 files changed, 114 insertions(+), 89 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index aa852460e..6e10706f7 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Tue Nov 29 23:48:09 PST 2011 + * Date: Wed Nov 30 00:39:32 PST 2011 */ html, body { margin: 0; @@ -2088,6 +2088,48 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .tab-content > .active, .pill-content > .active { display: block; } +.step-nav { + position: relative; + margin: 0 0 18px; + list-style: none; + line-height: 30px; + text-align: center; + background-color: #f5f5f5; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; +} +.step-nav li { + display: inline; + color: #bfbfbf; +} +.step-nav .prev, .step-nav .next { + position: absolute; + top: 6px; +} +.step-nav .prev { + left: 15px; +} +.step-nav .next { + right: 15px; +} +.step-nav .dot { + display: inline-block; + width: 10px; + height: 10px; + margin: 0 3px; + text-indent: -999em; + background-color: #bfbfbf; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25); +} +.step-nav .dot:hover, .step-nav .active .dot { + background-color: #404040; +} .breadcrumb { padding: 7px 14px; margin: 0 0 18px; diff --git a/bootstrap.min.css b/bootstrap.min.css index e7505341e..7042c7a10 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -279,6 +279,12 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .pills-vertical>li{float:none;} .tab-content>.tab-pane,.pill-content>.pill-pane{display:none;} .tab-content>.active,.pill-content>.active{display:block;} +.step-nav{position:relative;margin:0 0 18px;list-style:none;line-height:30px;text-align:center;background-color:#f5f5f5;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.step-nav li{display:inline;color:#bfbfbf;} +.step-nav .prev,.step-nav .next{position:absolute;top:6px;} +.step-nav .prev{left:15px;} +.step-nav .next{right:15px;} +.step-nav .dot{display:inline-block;width:10px;height:10px;margin:0 3px;text-indent:-999em;background-color:#bfbfbf;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.25);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.25);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.25);} +.step-nav .dot:hover,.step-nav .active .dot{background-color:#404040;} .breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#f5f5f5;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;} .breadcrumb .divider{padding:0 5px;color:#bfbfbf;} .breadcrumb .active a{color:#404040;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index ec3cd83cb..a7b52821e 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -39,71 +39,6 @@ body > .navbar-fixed .brand:hover { } -/* Github buttons --------------------------------------------------- */ -.github-btn { - display: inline-block; - height: 20px; - overflow: hidden; -} -.github-btn .gh-btn, -.github-btn .gh-count, -.github-btn .gh-ico { - float: left; -} -.github-btn .gh-btn, -.github-btn .gh-count { - padding: 1px 5px 1px 4px; - font-size: 11px; - font-weight: bold; - line-height: 16px; - color: #666; - text-shadow: 0 1px 0 #fff; - cursor: pointer; -} -.github-btn .gh-btn { - background-color: #e6e6e6; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); - background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-repeat: no-repeat; - border: 1px solid #ccc; - border-bottom-color: #bbb; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2); - -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2); - box-shadow: inset 0 1px 0 rgba(255,255,255,.2); -} -.github-btn .gh-btn:hover { - color: #333; - text-decoration: none; - background-position: 0 -10px; -} -.github-btn .gh-btn:active { - -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15); - -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15); - box-shadow: inset 0 2px 4px rgba(0,0,0,.15); -} -.github-btn .gh-ico { - margin-right: 4px; - opacity: .65; -} -.github-btn .gh-btn:hover .gh-ico { - opacity: .75; -} -.github-btn .gh-count { - display: inline-block; - margin-left: 2px; - background-color: #fff; - border: 1px solid #ddd; -} - - /* Jumbotrons -------------------------------------------------- */ .jumbotron { @@ -330,13 +265,6 @@ body > .navbar-fixed .brand:hover { margin-left: 10px; } -/* scrollspy docs */ - -.scrollspy-example { - overflow: auto; - height: 200px; - position: relative; -} /* Popover docs -------------------------------------------------- */ @@ -499,19 +427,3 @@ h2 + table { } } -#accordion dt a{ - display:block; - padding: 9px 15px; - line-height: 1; - background-color: whiteSmoke; - border: 1px solid #EEE; - border-top-color: #fff; -} - -#accordion dt:first-child a { - border-top-color:#eee; -} - -#accordion dd p { - padding: 10px; -} diff --git a/docs/components.html b/docs/components.html index c311d20e6..833f532d9 100644 --- a/docs/components.html +++ b/docs/components.html @@ -412,6 +412,28 @@ + +
+
+

Step nav

+

Placeholder for now!

+
+
+
+ +
+
+
+
+
diff --git a/lib/tabs-pills.less b/lib/tabs-pills.less index 3ff08a676..7fc73f69c 100644 --- a/lib/tabs-pills.less +++ b/lib/tabs-pills.less @@ -216,3 +216,46 @@ .pill-content > .active { display: block; } + + +// Step nav +.step-nav { + position: relative; // for prev/next links + margin: 0 0 @baseLineHeight; + list-style: none; + line-height: 30px; + text-align: center; + background-color: #f5f5f5; + .border-radius(15px); + li { + display: inline; + color: @grayLight; + } + // prev/next links + .prev, + .next { + position: absolute; + top: 6px; + } + .prev { + left: 15px; + } + .next { + right: 15px; + } + // indicators for each step/page/item/etc + .dot { + display: inline-block; + width: 10px; + height: 10px; + margin: 0 3px; + text-indent: -999em; + background-color: @grayLight; + .border-radius(5px); + .box-shadow(inset 0 1px 1px rgba(0,0,0,.25)); + } + .dot:hover, + .active .dot { + background-color: @grayDark; + } +} -- cgit v1.2.3 From bc51c15709469fd0c2e78886a15e849626a8f191 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 30 Nov 2011 01:00:55 -0800 Subject: adding temp idea for subnav to docs --- bootstrap.css | 45 ++++++++++++++++++++++++++++++++++++++++++++- bootstrap.min.css | 4 ++++ docs/scaffolding.html | 9 +++++++++ lib/tabs-pills.less | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+), 1 deletion(-) diff --git a/bootstrap.css b/bootstrap.css index 6e10706f7..2bef99e1a 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Wed Nov 30 00:39:32 PST 2011 + * Date: Wed Nov 30 00:54:47 PST 2011 */ html, body { margin: 0; @@ -2130,6 +2130,49 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .step-nav .dot:hover, .step-nav .active .dot { background-color: #404040; } +.subnav { + position: relative; + background-color: #eeeeee; + background-image: -khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#eeeeee)); + background-image: -moz-linear-gradient(top, #f5f5f5, #eeeeee); + background-image: -ms-linear-gradient(top, #f5f5f5, #eeeeee); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #eeeeee)); + background-image: -webkit-linear-gradient(top, #f5f5f5, #eeeeee); + background-image: -o-linear-gradient(top, #f5f5f5, #eeeeee); + background-image: linear-gradient(top, #f5f5f5, #eeeeee); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#eeeeee', GradientType=0); + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.subnav a { + padding: 10px 15px; + color: #0069d6; + text-shadow: 0 1px 0 #fff; + border-left: 1px solid #f9f9f9; + border-right: 1px solid #e5e5e5; +} +.subnav a:hover { + color: #00438a; + background-color: #eee; +} +.subnav li:first-child a { + border-left: 0; + -webkit-border-radius: 6px 0 0 6px; + -moz-border-radius: 6px 0 0 6px; + border-radius: 6px 0 0 6px; +} +.subnav li:last-child a { + border-right: 0; + -webkit-border-radius: 0 6px 6px 0; + -moz-border-radius: 0 6px 6px 0; + border-radius: 0 6px 6px 0; +} +.subnav ul .active > a { + color: #404040; + background-color: #eee; +} .breadcrumb { padding: 7px 14px; margin: 0 0 18px; diff --git a/bootstrap.min.css b/bootstrap.min.css index 7042c7a10..d8ee06c15 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -285,6 +285,10 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .step-nav .next{right:15px;} .step-nav .dot{display:inline-block;width:10px;height:10px;margin:0 3px;text-indent:-999em;background-color:#bfbfbf;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.25);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.25);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.25);} .step-nav .dot:hover,.step-nav .active .dot{background-color:#404040;} +.subnav{position:relative;background-color:#eeeeee;background-image:-khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#eeeeee));background-image:-moz-linear-gradient(top, #f5f5f5, #eeeeee);background-image:-ms-linear-gradient(top, #f5f5f5, #eeeeee);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #eeeeee));background-image:-webkit-linear-gradient(top, #f5f5f5, #eeeeee);background-image:-o-linear-gradient(top, #f5f5f5, #eeeeee);background-image:linear-gradient(top, #f5f5f5, #eeeeee);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#eeeeee', GradientType=0);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.subnav a{padding:10px 15px;color:#0069d6;text-shadow:0 1px 0 #fff;border-left:1px solid #f9f9f9;border-right:1px solid #e5e5e5;}.subnav a:hover{color:#00438a;background-color:#eee;} +.subnav li:first-child a{border-left:0;-webkit-border-radius:6px 0 0 6px;-moz-border-radius:6px 0 0 6px;border-radius:6px 0 0 6px;} +.subnav li:last-child a{border-right:0;-webkit-border-radius:0 6px 6px 0;-moz-border-radius:0 6px 6px 0;border-radius:0 6px 6px 0;} +.subnav ul .active>a{color:#404040;background-color:#eee;} .breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#f5f5f5;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;} .breadcrumb .divider{padding:0 5px;color:#bfbfbf;} .breadcrumb .active a{color:#404040;} diff --git a/docs/scaffolding.html b/docs/scaffolding.html index d4d1c6526..dd7f05bc6 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -53,6 +53,15 @@

Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.

+ +
+ +
+
diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js index 210512a8b..069130080 100644 --- a/js/bootstrap-alert.js +++ b/js/bootstrap-alert.js @@ -32,7 +32,9 @@ Alert.prototype = { - close: function ( e ) { + constructor: Alert + + , close: function ( e ) { var $element = $(this) $element = $element.hasClass('alert-message') ? $element : $element.parent() diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js index 1cafe4d68..4ed24d98b 100644 --- a/js/bootstrap-button.js +++ b/js/bootstrap-button.js @@ -31,7 +31,9 @@ Button.prototype = { - setState: function (state) { + constructor: Button + + , setState: function (state) { var d = 'disabled' , $el = this.$element , data = $el.data() diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 93f91513e..f56f6c705 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -34,7 +34,9 @@ Collapse.prototype = { - dimension: function () { + constructor: Collapse + + , dimension: function () { var hasWidth = this.$element.hasClass('width') return hasWidth ? 'width' : 'height' } diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index 7259284bf..238a52e08 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -32,7 +32,9 @@ Dropdown.prototype = { - toggle: function ( e ) { + constructor: Dropdown + + , toggle: function ( e ) { var li = $(this).parent('li') , isActive = li.hasClass('open') diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index 5f543c553..189bcf2ac 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -34,7 +34,9 @@ Modal.prototype = { - toggle: function () { + constructor: Modal + + , toggle: function () { return this[!this.isShown ? 'show' : 'hide']() } diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index 3c67b18fc..890f6efc0 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -34,7 +34,9 @@ Popover.prototype = $.extend({}, $.fn.twipsy.Twipsy.prototype, { - setContent: function () { + constructor: Popover + + , setContent: function () { var $tip = this.tip() , title = this.getTitle() , content = this.getContent() diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index fe34019ff..8248b6cbd 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -39,7 +39,9 @@ ScrollSpy.prototype = { - refresh: function () { + constructor: ScrollSpy + + , refresh: function () { this.targets = this.$body .find(this.selector) .map(function () { diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js index ba956cbe8..6aa8ae32c 100644 --- a/js/bootstrap-tab.js +++ b/js/bootstrap-tab.js @@ -31,7 +31,9 @@ Tab.prototype = { - show: function () { + constructor: Tab + + , show: function () { var $this = this.element , $ul = $this.closest('ul:not(.dropdown-menu)') , href = $this.attr('data-target') || $this.attr('href') diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js index fe4469a23..ca8ac8800 100644 --- a/js/bootstrap-twipsy.js +++ b/js/bootstrap-twipsy.js @@ -34,7 +34,9 @@ Twipsy.prototype = { - show: function() { + constructor: Twipsy + + , show: function() { var pos , actualWidth , actualHeight @@ -183,7 +185,7 @@ return this } - $.fn.twipsy.initWith = function (options, Constructor, name) { + $.fn.twipsy.initWith = function (options, Base, name) { var twipsy , binder , eventIn @@ -209,7 +211,7 @@ var twipsy = $.data(ele, name) if (!twipsy) { - twipsy = new Constructor(ele, $.fn.twipsy.elementOptions(ele, options)) + twipsy = new Base(ele, $.fn.twipsy.elementOptions(ele, options)) $.data(ele, name, twipsy) } -- cgit v1.2.3
English
2 Joe2JoeSixpackEnglish
Joe Sixpack English