diff options
| author | Mark Otto <[email protected]> | 2013-07-21 08:52:25 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-21 08:52:25 -0700 |
| commit | 12468c61037469985e0cc1669966d63208becc75 (patch) | |
| tree | b286e5447c8195e91eee96caa007295c088f4988 /css.html | |
| parent | a63db4d2f91c056310fc9a24891dbd161672451b (diff) | |
| parent | 582e9986a865dbf7e0bf1aca2dbec19cb3218506 (diff) | |
| download | bootstrap-12468c61037469985e0cc1669966d63208becc75.tar.xz bootstrap-12468c61037469985e0cc1669966d63208becc75.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'css.html')
| -rw-r--r-- | css.html | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -41,7 +41,7 @@ lead: "Global CSS settings, fundamental HTML elements styled and enhanced with e <p>These styles can be found within <strong>scaffolding.less</strong>.</p> <h3 id="overview-normalize">Normalize reset</h3> - <p>For improved cross-browser rendering, we use <a href="http://necolas.github.com/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> + <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-container">Centering with container</h3> <p>Easily center a page's contents by wrapping its contents in a container. Containers set <code>max-width</code> at various media query breakpoints to match our grid system.</p> |