0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00

update docs regarding normalize and clearfix

This commit is contained in:
Mark Otto 2012-12-20 21:44:45 -08:00
parent 5d4e718446
commit 7c04d573d0
4 changed files with 8 additions and 10 deletions

View File

@ -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;

View File

@ -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>

View File

@ -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;

View File

@ -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>