diff options
| author | Mark Otto <[email protected]> | 2012-11-14 15:20:38 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-14 15:20:38 -0800 |
| commit | 1700e48e7f5393aec9c51c70ed4f0ca922e568ae (patch) | |
| tree | 836f6944e0a4596d49030dd91ed0563f86fcab5f /docs | |
| parent | 0df0b5f1f518eb119e4747084f0ad3caaaf82668 (diff) | |
| download | bootstrap-1700e48e7f5393aec9c51c70ed4f0ca922e568ae.tar.xz bootstrap-1700e48e7f5393aec9c51c70ed4f0ca922e568ae.zip | |
Fixes #5879: Manual update of Normalize credit
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/scaffolding.html | 2 | ||||
| -rw-r--r-- | docs/templates/pages/scaffolding.mustache | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 5261ea616..f63aa9003 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -123,7 +123,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> diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 99bdb46f5..a6f2f9dac 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -52,7 +52,7 @@ <p>{{_i}}These styles can be found within <strong>scaffolding.less</strong>.{{/i}}</p> <h3>{{_i}}Reset via Normalize{{/i}}</h3> - <p>{{_i}}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.{{/i}}</p> + <p>{{_i}}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.{{/i}}</p> </section> |