diff options
| author | Mark Otto <[email protected]> | 2012-11-15 09:15:37 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-15 09:15:37 -0800 |
| commit | a43bf14ea5fa7118cfdbed0469d227976fb92a79 (patch) | |
| tree | 95041ab233cf7a9543347539e4e3e8c9dad35e72 /docs/scaffolding.html | |
| parent | 1a4ce9ba1872c06fe3107fd1330070d08706ec1c (diff) | |
| parent | 05655ff4ff3b44f5c773dcc6079d03af498733d5 (diff) | |
| download | bootstrap-a43bf14ea5fa7118cfdbed0469d227976fb92a79.tar.xz bootstrap-a43bf14ea5fa7118cfdbed0469d227976fb92a79.zip | |
Merge branch '2.2.2-wip' into exploratory
Diffstat (limited to 'docs/scaffolding.html')
| -rw-r--r-- | docs/scaffolding.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 7e5f23997..6a0e4ba0b 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -119,7 +119,7 @@ <p>These styles can be found within <strong>scaffolding.less</strong>.</p> <h3>Reset via Normalize</h3> - <p>With Bootstrap 2, the old reset block has been dropped in favor of <a href="http://necolas.github.com/normalize.css/" target="_blank">Normalize.css</a>, a project by <a href="http://twitter.com/necolas" target="_blank">Nicolas Gallagher</a> that also powers the <a href="http://html5boilerplate.com" target="_blank">HTML5 Boilerplate</a>. While we use much of Normalize within our <strong>reset.less</strong>, we have removed some elements specifically for Bootstrap.</p> + <p>With Bootstrap 2, the old reset block has been dropped in favor of <a href="http://necolas.github.com/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> that also powers the <a href="http://html5boilerplate.com" target="_blank">HTML5 Boilerplate</a>. While we use much of Normalize within our <strong>reset.less</strong>, we have removed some elements specifically for Bootstrap.</p> </section> |