Skip to content

B
bootstrap
Commit 7455dd6b authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

parents f587e81b 59673bf9
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 21 deletions
docs/base-css.html
View file @ 7455dd6b
......@@ -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">
......
docs/components.html
View file @ 7455dd6b
......@@ -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>
......
docs/index.html
View file @ 7455dd6b
......@@ -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">
......
docs/javascript.html
View file @ 7455dd6b
......@@ -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">
......
docs/less.html
View file @ 7455dd6b
......@@ -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">
......
docs/scaffolding.html
View file @ 7455dd6b
......@@ -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">
......
docs/upgrading.html
View file @ 7455dd6b
......@@ -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">
......
js/bootstrap-tooltip.js
View file @ 7455dd6b
......@@ -115,7 +115,7 @@
}
placement = typeof this.options.placement == 'function' ?
thing.call(this, $tip[0], this.$element[0]) :
this.options.placement.call(this, $tip[0], this.$element[0]) :
this.options.placement
inside = /in/.test(placement)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment