github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.3.0-wip' into 3.0.0-wip

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/css.html
	docs/customize.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	less/navbar.less
This commit is contained in:
Mark Otto
2013-01-17 20:23:33 -08:00
parent f068cdeb63 01b465928e
commit d9b35c2602
27 changed files with 5491 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/templates/layout.mustache vendored
View File

@@ -14,7 +14,7 @@
<!-- Le HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<script src="assets/js/html5shiv.js"></script>
<script src="assets/js/respond/respond.min.js"></script>
<![endif]-->

2102
docs/templates/pages/base-css.mustache vendored Normal file
View File

File diff suppressed because it is too large Load Diff

6
docs/templates/pages/components.mustache vendored
View File

@@ -105,9 +105,9 @@
</div>{{! /example }}
<pre class="prettyprint linenums">
&lt;ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu"&gt;
&lt;li&gt;&lt;a tabindex="-1" href="#"&gt;Regular link&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a tabindex="-1" href="#"&gt;Disabled link&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a tabindex="-1" href="#"&gt;Another link&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a tabindex="-1" href="#"&gt;{{_i}}Regular link{{/i}}&lt;/a&gt;&lt;/li&gt;
&lt;li class="disabled"&gt;&lt;a tabindex="-1" href="#"&gt;{{_i}}Disabled link{{/i}}&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a tabindex="-1" href="#"&gt;{{_i}}Another link{{/i}}&lt;/a&gt;&lt;/li&gt;
&lt;/ul&gt;
</pre>
</section>

8
docs/templates/pages/javascript.mustache vendored
View File

@@ -953,6 +953,14 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p>
</td>
</tr>
<tr>
<td>{{_i}}container{{/i}}</td>
<td>{{_i}}string | false{{/i}}</td>
<td>{{_i}}false{{/i}}</td>
<td>
<p>{{_i}}Appends the popover to a specific element <code>container: 'body'</code>{{/i}}</p>
</td>
</tr>
</tbody>
</table>
<div class="alert alert-info">