Merge branch 'master' of github.com:twbs/bootstrap

This commit is contained in:
Mark Otto 2013-09-01 21:55:59 +02:00
commit 26727bfefd
2 changed files with 13 additions and 5 deletions

View file

@ -434,6 +434,14 @@ bootstrap/
<td><code>.text-error</code></td>
<td><code>.text-danger</code></td>
</tr>
<tr>
<td><code>.bar</code></td>
<td><code>.progress-bar</code></td>
</tr>
<tr>
<td><code>.bar-*</code></td>
<td><code>.progress-bar-*</code></td>
</tr>
</tbody>
</table>
</div><!-- /.table-responsive -->
@ -467,7 +475,7 @@ bootstrap/
<td><code>.jumbotron</code></td>
</tr>
<tr>
<td>Tiny grid (&lt;768px)</td>
<td>Extra small grid (&lt;768px)</td>
<td><code>.col-xs-*</code></td>
</tr>
<tr>