diff options
| author | Mark Otto <[email protected]> | 2012-12-20 21:44:45 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-12-20 21:44:45 -0800 |
| commit | 7c04d573d0a08a365f3350c9d52d7cc870f702be (patch) | |
| tree | 945426f8ffede814dbfbca2d525e1c2101298221 /docs | |
| parent | 5d4e7184466a46d7844c8156edda5a7ccef54aad (diff) | |
| download | bootstrap-7c04d573d0a08a365f3350c9d52d7cc870f702be.tar.xz bootstrap-7c04d573d0a08a365f3350c9d52d7cc870f702be.zip | |
update docs regarding normalize and clearfix
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/components.html | 5 | ||||
| -rw-r--r-- | docs/css.html | 4 | ||||
| -rw-r--r-- | docs/templates/pages/components.mustache | 5 | ||||
| -rw-r--r-- | docs/templates/pages/css.mustache | 4 |
4 files changed, 8 insertions, 10 deletions
diff --git a/docs/components.html b/docs/components.html index 0f375ebfa..ac9dc91ce 100644 --- a/docs/components.html +++ b/docs/components.html @@ -2138,17 +2138,16 @@ class="muted" </pre> <h4>.clearfix</h4> - <p>Clear the <code>float</code> on any element</p> + <p>Clear the <code>float</code> on any element.</p> <pre class="prettyprint linenums"> class="clearfix" </pre> <pre class="prettyprint linenums"> .clearfix { - *zoom: 1; &:before, &:after { + content: " "; display: table; - content: ""; } &:after { clear: both; diff --git a/docs/css.html b/docs/css.html index 25a8134fa..a3133026d 100644 --- a/docs/css.html +++ b/docs/css.html @@ -125,8 +125,8 @@ </ul> <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> 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> + <h3>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> </section> diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index a85f53900..4db9d84dc 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -2070,17 +2070,16 @@ class="muted" </pre> <h4>.clearfix</h4> - <p>Clear the <code>float</code> on any element</p> + <p>Clear the <code>float</code> on any element.</p> <pre class="prettyprint linenums"> class="clearfix" </pre> <pre class="prettyprint linenums"> .clearfix { - *zoom: 1; &:before, &:after { + content: " "; display: table; - content: ""; } &:after { clear: both; diff --git a/docs/templates/pages/css.mustache b/docs/templates/pages/css.mustache index 2481646a1..30b0e68e6 100644 --- a/docs/templates/pages/css.mustache +++ b/docs/templates/pages/css.mustache @@ -57,8 +57,8 @@ </ul> <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> 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> + <h3>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> </section> |