aboutsummaryrefslogtreecommitdiff
path: root/docs/css.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-01-18 14:11:36 -0800
committerMark Otto <[email protected]>2014-01-18 14:11:36 -0800
commit689e75e4b1b8055e657b30eb692b34ebf9d549da (patch)
tree711f3f78d34a69f34ee40fa24a7e8fc4f961ae00 /docs/css.html
parentb886fd2f012f3ebe68292aaedf55d5c3709f972b (diff)
parentb1721f42cc8298fb691530614ee6d52389872e25 (diff)
downloadbootstrap-689e75e4b1b8055e657b30eb692b34ebf9d549da.tar.xz
bootstrap-689e75e4b1b8055e657b30eb692b34ebf9d549da.zip
Merge branch 'master' into text-emphasis-variant
Diffstat (limited to 'docs/css.html')
-rw-r--r--docs/css.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/css.html b/docs/css.html
index 09d7df311..b1beac26e 100644
--- a/docs/css.html
+++ b/docs/css.html
@@ -48,8 +48,8 @@ lead: "Global CSS settings, fundamental HTML elements styled and enhanced with e
</ul>
<p>These styles can be found within <code>scaffolding.less</code>.</p>
- <h3 id="overview-normalize">Normalize</h3>
- <p>For improved cross-browser rendering, we use <a href="http://necolas.github.io/normalize.css/" target="_blank">Normalize</a>, a project by <a href="http://twitter.com/necolas" target="_blank">Nicolas Gallagher</a> and <a href="http://twitter.com/jon_neal" target="_blank">Jonathan Neal</a>.</p>
+ <h3 id="overview-normalize">Normalize.css</h3>
+ <p>For improved cross-browser rendering, we use <a href="http://necolas.github.io/normalize.css/" target="_blank">Normalize.css</a>, a project by <a href="http://twitter.com/necolas" target="_blank">Nicolas Gallagher</a> and <a href="http://twitter.com/jon_neal" target="_blank">Jonathan Neal</a>.</p>
<h3 id="overview-container">Containers</h3>
<p>Easily center a page's contents by wrapping its contents in a <code>.container</code>. Containers set <code>width</code> at various media query breakpoints to match our grid system.</p>