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

Merge branch 'master' into gh-pages

Browse Source
This commit is contained in:
Mark Otto 2013-08-19 15:12:27 -07:00
commit b0086cb3de
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
css.html
View File

@ -80,20 +80,20 @@ base_url: "../"
/* No media query since this is the default in Bootstrap */ /* No media query since this is the default in Bootstrap */
/* Small devices (tablets, 768px and up) */ /* Small devices (tablets, 768px and up) */
@media (min-width: @screen-tablet) { ... } @media (min-width: @screen-sm) { ... }
/* Medium devices (desktops, 992px and up) */ /* Medium devices (desktops, 992px and up) */
@media (min-width: @screen-desktop) { ... } @media (min-width: @screen-md) { ... }
/* Large devices (large desktops, 1200px and up) */ /* Large devices (large desktops, 1200px and up) */
@media (min-width: @screen-large-desktop) { ... } @media (min-width: @screen-lg) { ... }
{% endhighlight %} {% endhighlight %}
<p>We occasionally expand on these media queries to include a <code>max-width</code> to limit CSS to a narrower set of devices.</p> <p>We occasionally expand on these media queries to include a <code>max-width</code> to limit CSS to a narrower set of devices.</p>
{% highlight css %} {% highlight css %}
@media (max-width: @screen-phone-max) { ... } @media (max-width: @screen-phone-max) { ... }
@media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) { ... } @media (min-width: @screen-sm) and (max-width: @screen-sm-max) { ... }
@media (min-width: @screen-desktop) and (max-width: @screen-desktop-max) { ... } @media (min-width: @screen-md) and (max-width: @screen-md-max) { ... }
@media (min-width: @screen-large-desktop) { ... } @media (min-width: @screen-lg) { ... }
{% endhighlight %} {% endhighlight %}
<h3 id="grid-options">Grid options</h3> <h3 id="grid-options">Grid options</h3>