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(-) (limited to 'docs') 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 --- docs/base-css.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'docs') 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 @@ - + + + + + + + -- 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(-) (limited to 'docs') 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 --- docs/assets/css/docs.css | 88 ------------------------------------------------ docs/components.html | 22 ++++++++++++ 2 files changed, 22 insertions(+), 88 deletions(-) (limited to 'docs') 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!

+
+
+
+ +
+
+
+
+
-- 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 --- docs/scaffolding.html | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'docs') 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.

+ +
+ +
+
-- cgit v1.2.3
English
2 Joe2JoeSixpackEnglish
Joe Sixpack English