mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-05 21:27:31 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Otto
2013-09-01 21:55:59 +02:00
parent b45c3ea647 9369489883
commit 26727bfefd
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
getting-started.html
View File

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

8
less/grid.less
View File

@@ -76,7 +76,7 @@
// Grid classes for extra small devices like smartphones. No offset, push, or // Grid classes for extra small devices like smartphones. No offset, push, or
// pull classes are present here due to the size of the target. // 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. // it's full-width.
.col-xs-1, .col-xs-1,
@@ -111,7 +111,7 @@
// Columns, offsets, pushes, and pulls for the small device range, from phones // Columns, offsets, pushes, and pulls for the small device range, from phones
// to tablets. // 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. // it's full-width.
@media (min-width: @screen-sm) { @media (min-width: @screen-sm) {
@@ -189,7 +189,7 @@
// //
// Columns, offsets, pushes, and pulls for the desktop device range. // 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. // it's full-width.
@media (min-width: @screen-md) { @media (min-width: @screen-md) {
@@ -269,7 +269,7 @@
// //
// Columns, offsets, pushes, and pulls for the large desktop device range. // 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. // it's full-width.
@media (min-width: @screen-lg-min) { @media (min-width: @screen-lg-min) {