1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-30 15:29:06 +02:00

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

Conflicts:
	bootstrap.css
This commit is contained in:
Jacob Thornton
2011-12-21 14:03:18 -08:00
9 changed files with 375 additions and 140 deletions

View File

@@ -829,7 +829,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<pre class="prettyprint linenums">&lt;button class="btn" data-complete-text="finished!" &gt;...&lt;/button&gt;
&lt;script&gt;
$('.btn').button('complete')
&lt;/scrip&gt;</pre>
&lt;/script&gt;</pre>
<h3>Demo</h3>
<table class="bordered-table striped-table">
<tbody>