mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-16 02:24:19 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Otto
2012-01-14 16:18:39 -08:00
parent f587e81b7d 59673bf9f7
commit 7455dd6b45
8 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docs/base-css.html
View File

@@ -40,7 +40,7 @@
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <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#layouts">Layouts</a></li>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li> <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
</ul> </ul>
@@ -51,7 +51,7 @@
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <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#tables">Tables</a></li>
<li><a href="./base-css.html#forms">Forms</a></li> <li><a href="./base-css.html#forms">Forms</a></li>
<li><a href="./base-css.html#buttons">Buttons</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#pagination">Pagination</a></li>
<li><a href="./components.html#thumbnails">Thumbnails</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#alerts">Alert messages</a></li>
<li><a href="./components.html#progress">Progress bars</a></li>
</ul> </ul>
</li> </li>
<li class="dropdown"> <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> <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>
</div> </div>
<h2>Four types of forms</h2> <h2>Four types of forms</h2>
<p>Bootstrap provides simple markup and styles for four styles of common web forms.</p> <p>Bootstrap provides simple markup and styles for four styles of common web forms.</p>
<table class="bordered-table striped-table"> <table class="bordered-table striped-table">

13
docs/components.html
View File

@@ -40,7 +40,7 @@
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <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#layouts">Layouts</a></li>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li> <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
</ul> </ul>
@@ -51,7 +51,7 @@
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <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#tables">Tables</a></li>
<li><a href="./base-css.html#forms">Forms</a></li> <li><a href="./base-css.html#forms">Forms</a></li>
<li><a href="./base-css.html#buttons">Buttons</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#pagination">Pagination</a></li>
<li><a href="./components.html#thumbnails">Thumbnails</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#alerts">Alert messages</a></li>
<li><a href="./components.html#progress">Progress bars</a></li>
</ul> </ul>
</li> </li>
<li class="dropdown"> <li class="dropdown">
@@ -844,7 +845,7 @@
<!-- Pagination <!-- Pagination
================================================== --> ================================================== -->
<section id="carousel"> <section id="pagination">
<div class="page-header"> <div class="page-header">
<h1>Pagination <small></small></h1> <h1>Pagination <small></small></h1>
</div> </div>
@@ -907,9 +908,9 @@
<!-- Media <!-- Thumbnails
================================================== --> ================================================== -->
<section id="media"> <section id="thumbnails">
<div class="page-header"> <div class="page-header">
<h1>Thumbnails <small>Grids of images, videos, text, and more</small></h1> <h1>Thumbnails <small>Grids of images, videos, text, and more</small></h1>
</div> </div>
@@ -1148,7 +1149,7 @@
<!-- Progress bars <!-- Progress bars
================================================== --> ================================================== -->
<section id="progresss"> <section id="progress">
<div class="page-header"> <div class="page-header">
<h1>Progress bars <small>For loading, redirecting, or action status</small></h1> <h1>Progress bars <small>For loading, redirecting, or action status</small></h1>
</div> </div>

5
docs/index.html
View File

@@ -41,7 +41,7 @@
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <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#layouts">Layouts</a></li>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li> <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
</ul> </ul>
@@ -52,7 +52,7 @@
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <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#tables">Tables</a></li>
<li><a href="./base-css.html#forms">Forms</a></li> <li><a href="./base-css.html#forms">Forms</a></li>
<li><a href="./base-css.html#buttons">Buttons</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#pagination">Pagination</a></li>
<li><a href="./components.html#thumbnails">Thumbnails</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#alerts">Alert messages</a></li>
<li><a href="./components.html#progress">Progress bars</a></li>
</ul> </ul>
</li> </li>
<li class="dropdown"> <li class="dropdown">

5
docs/javascript.html
View File

@@ -41,7 +41,7 @@
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <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#layouts">Layouts</a></li>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li> <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
</ul> </ul>
@@ -52,7 +52,7 @@
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <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#tables">Tables</a></li>
<li><a href="./base-css.html#forms">Forms</a></li> <li><a href="./base-css.html#forms">Forms</a></li>
<li><a href="./base-css.html#buttons">Buttons</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#pagination">Pagination</a></li>
<li><a href="./components.html#thumbnails">Thumbnails</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#alerts">Alert messages</a></li>
<li><a href="./components.html#progress">Progress bars</a></li>
</ul> </ul>
</li> </li>
<li class="dropdown active"> <li class="dropdown active">

5
docs/less.html
View File

@@ -40,7 +40,7 @@
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <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#layouts">Layouts</a></li>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li> <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
</ul> </ul>
@@ -51,7 +51,7 @@
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <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#tables">Tables</a></li>
<li><a href="./base-css.html#forms">Forms</a></li> <li><a href="./base-css.html#forms">Forms</a></li>
<li><a href="./base-css.html#buttons">Buttons</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#pagination">Pagination</a></li>
<li><a href="./components.html#thumbnails">Thumbnails</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#alerts">Alert messages</a></li>
<li><a href="./components.html#progress">Progress bars</a></li>
</ul> </ul>
</li> </li>
<li class="dropdown"> <li class="dropdown">

5
docs/scaffolding.html
View File

@@ -40,7 +40,7 @@
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <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#layouts">Layouts</a></li>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li> <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
</ul> </ul>
@@ -51,7 +51,7 @@
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <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#tables">Tables</a></li>
<li><a href="./base-css.html#forms">Forms</a></li> <li><a href="./base-css.html#forms">Forms</a></li>
<li><a href="./base-css.html#buttons">Buttons</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#pagination">Pagination</a></li>
<li><a href="./components.html#thumbnails">Thumbnails</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#alerts">Alert messages</a></li>
<li><a href="./components.html#progress">Progress bars</a></li>
</ul> </ul>
</li> </li>
<li class="dropdown"> <li class="dropdown">

5
docs/upgrading.html
View File

@@ -40,7 +40,7 @@
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <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#layouts">Layouts</a></li>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li> <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
</ul> </ul>
@@ -51,7 +51,7 @@
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <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#tables">Tables</a></li>
<li><a href="./base-css.html#forms">Forms</a></li> <li><a href="./base-css.html#forms">Forms</a></li>
<li><a href="./base-css.html#buttons">Buttons</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#pagination">Pagination</a></li>
<li><a href="./components.html#thumbnails">Thumbnails</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#alerts">Alert messages</a></li>
<li><a href="./components.html#progress">Progress bars</a></li>
</ul> </ul>
</li> </li>
<li class="dropdown"> <li class="dropdown">

4
js/bootstrap-tooltip.js vendored
View File

@@ -115,7 +115,7 @@
} }
placement = typeof this.options.placement == 'function' ? 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 this.options.placement
inside = /in/.test(placement) inside = /in/.test(placement)
@@ -267,4 +267,4 @@
, template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>' , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
} }
}( window.jQuery ) }( window.jQuery )