]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
update docs regarding normalize and clearfix
authorMark Otto <otto@github.com>
Fri, 21 Dec 2012 05:44:45 +0000 (21:44 -0800)
committerMark Otto <otto@github.com>
Fri, 21 Dec 2012 05:44:45 +0000 (21:44 -0800)
docs/components.html
docs/css.html
docs/templates/pages/components.mustache
docs/templates/pages/css.mustache

index 0f375ebfa13a1c48dfc1785ac8799215cca14e11..ac9dc91ce2ab9d7306fd7c2e26a8f8ba58808455 100644 (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;
index 25a8134fa5031fa9ac18de4926df89c2d7ffb387..a3133026d78fe6402bdb8943523d6f5d3d15956b 100644 (file)
           </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>
 
index a85f5390030484474dc1ef429c7bb24730514249..4db9d84dce8418f5c74d04836413f838b4f6a8fe 100644 (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;
index 2481646a1a71c10ae6024407409e62137a735fb6..30b0e68e60c70a8f4db42c58ebb1e1ee40bdeb86 100644 (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>