mirror of
https://github.com/twbs/bootstrap.git
synced 2022-11-09 12:25:43 -05:00
Merge branch 'master' of github.com:twbs/bootstrap
This commit is contained in:
commit
26727bfefd
2 changed files with 13 additions and 5 deletions
|
@ -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 (<768px)</td>
|
||||
<td>Extra small grid (<768px)</td>
|
||||
<td><code>.col-xs-*</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
|
@ -76,7 +76,7 @@
|
|||
// Grid classes for extra small devices like smartphones. No offset, push, or
|
||||
// pull classes are present here due to the size of the target.
|
||||
//
|
||||
// Note that `.col-xs-12` doesn't get floated on purpose—there's no need since
|
||||
// Note that `.col-xs-12` doesn't get floated on purpose--there's no need since
|
||||
// it's full-width.
|
||||
|
||||
.col-xs-1,
|
||||
|
@ -111,7 +111,7 @@
|
|||
// Columns, offsets, pushes, and pulls for the small device range, from phones
|
||||
// to tablets.
|
||||
//
|
||||
// Note that `.col-sm-12` doesn't get floated on purpose—there's no need since
|
||||
// Note that `.col-sm-12` doesn't get floated on purpose--there's no need since
|
||||
// it's full-width.
|
||||
|
||||
@media (min-width: @screen-sm) {
|
||||
|
@ -189,7 +189,7 @@
|
|||
//
|
||||
// Columns, offsets, pushes, and pulls for the desktop device range.
|
||||
//
|
||||
// Note that `.col-md-12` doesn't get floated on purpose—there's no need since
|
||||
// Note that `.col-md-12` doesn't get floated on purpose--there's no need since
|
||||
// it's full-width.
|
||||
|
||||
@media (min-width: @screen-md) {
|
||||
|
@ -269,7 +269,7 @@
|
|||
//
|
||||
// Columns, offsets, pushes, and pulls for the large desktop device range.
|
||||
//
|
||||
// Note that `.col-lg-12` doesn't get floated on purpose—there's no need since
|
||||
// Note that `.col-lg-12` doesn't get floated on purpose--there's no need since
|
||||
// it's full-width.
|
||||
|
||||
@media (min-width: @screen-lg-min) {
|
||||
|
|
Loading…
Add table
Reference in a new issue