rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity

Merge branch '2.0.3-wip' of https://github.com/andriijas/bootstrap into andriijas-2.0.3-wip

Browse Source 
Conflicts:
	docs/assets/bootstrap.zip
This commit is contained in:
Mark Otto 2012-03-23 09:53:04 -07:00
commit a57554222f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

6
docs/components.html
View File

@ -1422,13 +1422,13 @@
</tr>
<tr>
<td>
Error
Important
</td>
<td>
<span class="badge badge-error">6</span>
<span class="badge badge-important">6</span>
</td>
<td>
<code>&lt;span class="badge badge-error"&gt;6&lt;/span&gt;</code>
<code>&lt;span class="badge badge-important"&gt;6&lt;/span&gt;</code>
</td>
</tr>
<tr>

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

@ -1346,13 +1346,13 @@
</tr>
<tr>
<td>
{{_i}}Error{{/i}}
{{_i}}Important{{/i}}
</td>
<td>
<span class="badge badge-error">6</span>
<span class="badge badge-important">6</span>
</td>
<td>
<code>&lt;span class="badge badge-error"&gt;6&lt;/span&gt;</code>
<code>&lt;span class="badge badge-important"&gt;6&lt;/span&gt;</code>
</td>
</tr>
<tr>