aboutsummaryrefslogtreecommitdiff
path: root/css.html
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2013-08-12 11:31:45 -0700
committerChris Rebert <[email protected]>2013-08-12 11:31:45 -0700
commitf5b14997766de3a7481936e669fba03e2a10241d (patch)
tree182cc06f6dfa1060bed75925640a787cf673bb3e /css.html
parenta74d6cfe735bb7749ad5843d5faa2f5f9745a426 (diff)
downloadbootstrap-f5b14997766de3a7481936e669fba03e2a10241d.tar.xz
bootstrap-f5b14997766de3a7481936e669fba03e2a10241d.zip
copyedit media queries docs added in aefed0ada9791338be11dd5318b24f17f517d51a
Diffstat (limited to 'css.html')
-rw-r--r--css.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/css.html b/css.html
index 190f8f237..cf3e423b4 100644
--- a/css.html
+++ b/css.html
@@ -84,7 +84,7 @@ base_url: "../"
<p class="lead">Bootstrap includes a responsive, mobile-first fluid grid system that appropriately scales up to 12 columns as the device or viewport size increases. It includes <a href="#grid-example-basic">predefined classes</a> for easy layout options, as well as powerful <a href="#grid-less">mixins for generating more semantic layouts</a>.</p>
<h3 id="grid-media-queries">Media queries</h3>
- <p>We use the following media queries to create our the key breakpoints in our grid system.</p>
+ <p>We use the following media queries to create the key breakpoints in our grid system.</p>
{% highlight css %}
/* Extra small devices (phones, up to 480px) */
/* No media query since this is the default in Bootstrap */
@@ -98,7 +98,7 @@ base_url: "../"
/* Large devices (large desktops, 1200px and up) */
@media (min-width: @screen-large-desktop) { ... }
{% endhighlight %}
- <p>We ocassionally 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 %}
@media (max-width: @screen-phone-max) { ... }
@media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) { ... }