diff options
| author | Mark Otto <[email protected]> | 2012-01-14 16:18:39 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-14 16:18:39 -0800 |
| commit | 7455dd6b4564680ff7f80d8014ef7b973cd5755d (patch) | |
| tree | 901b90f10b4f5321d633f9170a14704cd7c0c99d /docs | |
| parent | f587e81b7d72e47b16bf808c721c3dfe45ae1062 (diff) | |
| parent | 59673bf9f7ea2749a6422b0805914e973b92f9ec (diff) | |
| download | bootstrap-7455dd6b4564680ff7f80d8014ef7b973cd5755d.tar.xz bootstrap-7455dd6b4564680ff7f80d8014ef7b973cd5755d.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/base-css.html | 7 | ||||
| -rw-r--r-- | docs/components.html | 13 | ||||
| -rw-r--r-- | docs/index.html | 5 | ||||
| -rw-r--r-- | docs/javascript.html | 5 | ||||
| -rw-r--r-- | docs/less.html | 5 | ||||
| -rw-r--r-- | docs/scaffolding.html | 5 | ||||
| -rw-r--r-- | docs/upgrading.html | 5 |
7 files changed, 26 insertions, 19 deletions
diff --git a/docs/base-css.html b/docs/base-css.html index 9491f40aa..79bbaa758 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -40,7 +40,7 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <li><a href="./scaffolding.html#grid">Grid system</a></li> + <li><a href="./scaffolding.html#grid-system">Grid system</a></li> <li><a href="./scaffolding.html#layouts">Layouts</a></li> <li><a href="./scaffolding.html#responsive">Responsive design</a></li> </ul> @@ -51,7 +51,7 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <li><a href="./base-css.html#type">Type</a></li> + <li><a href="./base-css.html#typography">Typography</a></li> <li><a href="./base-css.html#tables">Tables</a></li> <li><a href="./base-css.html#forms">Forms</a></li> <li><a href="./base-css.html#buttons">Buttons</a></li> @@ -72,6 +72,7 @@ <li><a href="./components.html#pagination">Pagination</a></li> <li><a href="./components.html#thumbnails">Thumbnails</a></li> <li><a href="./components.html#alerts">Alert messages</a></li> + <li><a href="./components.html#progress">Progress bars</a></li> </ul> </li> <li class="dropdown"> @@ -928,7 +929,7 @@ <p>States like error, warning, and success are included for each type of form control. Also included are styles for disabled controls.</p> </div> </div> - + <h2>Four types of forms</h2> <p>Bootstrap provides simple markup and styles for four styles of common web forms.</p> <table class="bordered-table striped-table"> diff --git a/docs/components.html b/docs/components.html index 9fc987508..f934ac68e 100644 --- a/docs/components.html +++ b/docs/components.html @@ -40,7 +40,7 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <li><a href="./scaffolding.html#grid">Grid system</a></li> + <li><a href="./scaffolding.html#grid-system">Grid system</a></li> <li><a href="./scaffolding.html#layouts">Layouts</a></li> <li><a href="./scaffolding.html#responsive">Responsive design</a></li> </ul> @@ -51,7 +51,7 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <li><a href="./base-css.html#type">Type</a></li> + <li><a href="./base-css.html#typography">Typography</a></li> <li><a href="./base-css.html#tables">Tables</a></li> <li><a href="./base-css.html#forms">Forms</a></li> <li><a href="./base-css.html#buttons">Buttons</a></li> @@ -72,6 +72,7 @@ <li><a href="./components.html#pagination">Pagination</a></li> <li><a href="./components.html#thumbnails">Thumbnails</a></li> <li><a href="./components.html#alerts">Alert messages</a></li> + <li><a href="./components.html#progress">Progress bars</a></li> </ul> </li> <li class="dropdown"> @@ -844,7 +845,7 @@ <!-- Pagination ================================================== --> -<section id="carousel"> +<section id="pagination"> <div class="page-header"> <h1>Pagination <small></small></h1> </div> @@ -907,9 +908,9 @@ -<!-- Media +<!-- Thumbnails ================================================== --> -<section id="media"> +<section id="thumbnails"> <div class="page-header"> <h1>Thumbnails <small>Grids of images, videos, text, and more</small></h1> </div> @@ -1148,7 +1149,7 @@ <!-- Progress bars ================================================== --> - <section id="progresss"> + <section id="progress"> <div class="page-header"> <h1>Progress bars <small>For loading, redirecting, or action status</small></h1> </div> diff --git a/docs/index.html b/docs/index.html index 5d8e61ded..ffdac0b3f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -41,7 +41,7 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <li><a href="./scaffolding.html#grid">Grid system</a></li> + <li><a href="./scaffolding.html#grid-system">Grid system</a></li> <li><a href="./scaffolding.html#layouts">Layouts</a></li> <li><a href="./scaffolding.html#responsive">Responsive design</a></li> </ul> @@ -52,7 +52,7 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <li><a href="./base-css.html#type">Type</a></li> + <li><a href="./base-css.html#typography">Typography</a></li> <li><a href="./base-css.html#tables">Tables</a></li> <li><a href="./base-css.html#forms">Forms</a></li> <li><a href="./base-css.html#buttons">Buttons</a></li> @@ -73,6 +73,7 @@ <li><a href="./components.html#pagination">Pagination</a></li> <li><a href="./components.html#thumbnails">Thumbnails</a></li> <li><a href="./components.html#alerts">Alert messages</a></li> + <li><a href="./components.html#progress">Progress bars</a></li> </ul> </li> <li class="dropdown"> diff --git a/docs/javascript.html b/docs/javascript.html index 58cc13e8c..afe9c329e 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -41,7 +41,7 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <li><a href="./scaffolding.html#grid">Grid system</a></li> + <li><a href="./scaffolding.html#grid-system">Grid system</a></li> <li><a href="./scaffolding.html#layouts">Layouts</a></li> <li><a href="./scaffolding.html#responsive">Responsive design</a></li> </ul> @@ -52,7 +52,7 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <li><a href="./base-css.html#type">Type</a></li> + <li><a href="./base-css.html#typography">Typography</a></li> <li><a href="./base-css.html#tables">Tables</a></li> <li><a href="./base-css.html#forms">Forms</a></li> <li><a href="./base-css.html#buttons">Buttons</a></li> @@ -73,6 +73,7 @@ <li><a href="./components.html#pagination">Pagination</a></li> <li><a href="./components.html#thumbnails">Thumbnails</a></li> <li><a href="./components.html#alerts">Alert messages</a></li> + <li><a href="./components.html#progress">Progress bars</a></li> </ul> </li> <li class="dropdown active"> diff --git a/docs/less.html b/docs/less.html index 8831ce094..f3bfa3059 100644 --- a/docs/less.html +++ b/docs/less.html @@ -40,7 +40,7 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <li><a href="./scaffolding.html#grid">Grid system</a></li> + <li><a href="./scaffolding.html#grid-system">Grid system</a></li> <li><a href="./scaffolding.html#layouts">Layouts</a></li> <li><a href="./scaffolding.html#responsive">Responsive design</a></li> </ul> @@ -51,7 +51,7 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <li><a href="./base-css.html#type">Type</a></li> + <li><a href="./base-css.html#typography">Typography</a></li> <li><a href="./base-css.html#tables">Tables</a></li> <li><a href="./base-css.html#forms">Forms</a></li> <li><a href="./base-css.html#buttons">Buttons</a></li> @@ -72,6 +72,7 @@ <li><a href="./components.html#pagination">Pagination</a></li> <li><a href="./components.html#thumbnails">Thumbnails</a></li> <li><a href="./components.html#alerts">Alert messages</a></li> + <li><a href="./components.html#progress">Progress bars</a></li> </ul> </li> <li class="dropdown"> diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 57b90d096..b2b4b5647 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -40,7 +40,7 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <li><a href="./scaffolding.html#grid">Grid system</a></li> + <li><a href="./scaffolding.html#grid-system">Grid system</a></li> <li><a href="./scaffolding.html#layouts">Layouts</a></li> <li><a href="./scaffolding.html#responsive">Responsive design</a></li> </ul> @@ -51,7 +51,7 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <li><a href="./base-css.html#type">Type</a></li> + <li><a href="./base-css.html#typography">Typography</a></li> <li><a href="./base-css.html#tables">Tables</a></li> <li><a href="./base-css.html#forms">Forms</a></li> <li><a href="./base-css.html#buttons">Buttons</a></li> @@ -72,6 +72,7 @@ <li><a href="./components.html#pagination">Pagination</a></li> <li><a href="./components.html#thumbnails">Thumbnails</a></li> <li><a href="./components.html#alerts">Alert messages</a></li> + <li><a href="./components.html#progress">Progress bars</a></li> </ul> </li> <li class="dropdown"> diff --git a/docs/upgrading.html b/docs/upgrading.html index 376aae856..e1b9f204e 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -40,7 +40,7 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <li><a href="./scaffolding.html#grid">Grid system</a></li> + <li><a href="./scaffolding.html#grid-system">Grid system</a></li> <li><a href="./scaffolding.html#layouts">Layouts</a></li> <li><a href="./scaffolding.html#responsive">Responsive design</a></li> </ul> @@ -51,7 +51,7 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <li><a href="./base-css.html#type">Type</a></li> + <li><a href="./base-css.html#typography">Typography</a></li> <li><a href="./base-css.html#tables">Tables</a></li> <li><a href="./base-css.html#forms">Forms</a></li> <li><a href="./base-css.html#buttons">Buttons</a></li> @@ -72,6 +72,7 @@ <li><a href="./components.html#pagination">Pagination</a></li> <li><a href="./components.html#thumbnails">Thumbnails</a></li> <li><a href="./components.html#alerts">Alert messages</a></li> + <li><a href="./components.html#progress">Progress bars</a></li> </ul> </li> <li class="dropdown"> |