From: Mark Otto <markotto@twitter.com>
Date: Mon, 26 Mar 2012 16:30:42 +0000 (-0700)
Subject: update LESS docs to note @baseFontSize and @baseLineHeight must be pixels
X-Git-Tag: v2.0.3~5^2~77
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=917f11e6799ddd43b439ce1f7a10c1a7360bcf3b;p=thirdparty%2Fbootstrap.git

update LESS docs to note @baseFontSize and @baseLineHeight must be pixels
---

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 557ca63a12..93f495965d 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/less.html b/docs/less.html
index 89e06cf913..a641c9ee3d 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -199,45 +199,47 @@
         <tbody>
           <tr>
             <td class="span2"><code>@sansFontFamily</code></td>
-            <td>"Helvetica Neue", Helvetica, Arial, sans-serif</td>
+            <td colspan="2">"Helvetica Neue", Helvetica, Arial, sans-serif</td>
           </tr>
           <tr>
             <td><code>@serifFontFamily</code></td>
-            <td><code>Georgia, "Times New Roman", Times, serif</code></td>
+            <td colspan="2"><code>Georgia, "Times New Roman", Times, serif</code></td>
           </tr>
           <tr>
             <td><code>@monoFontFamily</code></td>
-            <td>Menlo, Monaco, "Courier New", monospace</td>
+            <td colspan="2">Menlo, Monaco, "Courier New", monospace</td>
           </tr>
 
           <tr>
             <td class="span2"><code>@baseFontSize</code></td>
             <td>13px</td>
+            <td><em class="muted">Must be pixels</em></td>
           </tr>
           <tr>
             <td><code>@baseFontFamily</code></td>
-            <td><code>@sansFontFamily</code></td>
+            <td colspan="2"><code>@sansFontFamily</code></td>
           </tr>
           <tr>
             <td><code>@baseLineHeight</code></td>
             <td>18px</td>
+            <td><em class="muted">Must be pixels</em></td>
           </tr>
           <tr>
             <td><code>@altFontFamily</code></td>
-            <td><code>@serifFontFamily</code></td>
+            <td colspan="2"><code>@serifFontFamily</code></td>
           </tr>
 
           <tr>
             <td class="span2"><code>@headingsFontFamily</code></td>
-            <td><code>inherit</code></td>
+            <td colspan="2"><code>inherit</code></td>
           </tr>
           <tr>
             <td><code>@headingsFontWeight</code></td>
-            <td><code>bold</code></td>
+            <td colspan="2"><code>bold</code></td>
           </tr>
           <tr>
             <td><code>@headingsColor</code></td>
-            <td><code>inherit</code></td>
+            <td colspan="2"><code>inherit</code></td>
           </tr>
         </tbody>
       </table>
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index 263ec7fce6..0b58cfc9ea 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -122,45 +122,47 @@
         <tbody>
           <tr>
             <td class="span2"><code>@sansFontFamily</code></td>
-            <td>"Helvetica Neue", Helvetica, Arial, sans-serif</td>
+            <td colspan="2">"Helvetica Neue", Helvetica, Arial, sans-serif</td>
           </tr>
           <tr>
             <td><code>@serifFontFamily</code></td>
-            <td><code>Georgia, "Times New Roman", Times, serif</code></td>
+            <td colspan="2"><code>Georgia, "Times New Roman", Times, serif</code></td>
           </tr>
           <tr>
             <td><code>@monoFontFamily</code></td>
-            <td>Menlo, Monaco, "Courier New", monospace</td>
+            <td colspan="2">Menlo, Monaco, "Courier New", monospace</td>
           </tr>
 
           <tr>
             <td class="span2"><code>@baseFontSize</code></td>
             <td>13px</td>
+            <td><em class="muted">Must be pixels</em></td>
           </tr>
           <tr>
             <td><code>@baseFontFamily</code></td>
-            <td><code>@sansFontFamily</code></td>
+            <td colspan="2"><code>@sansFontFamily</code></td>
           </tr>
           <tr>
             <td><code>@baseLineHeight</code></td>
             <td>18px</td>
+            <td><em class="muted">Must be pixels</em></td>
           </tr>
           <tr>
             <td><code>@altFontFamily</code></td>
-            <td><code>@serifFontFamily</code></td>
+            <td colspan="2"><code>@serifFontFamily</code></td>
           </tr>
 
           <tr>
             <td class="span2"><code>@headingsFontFamily</code></td>
-            <td><code>inherit</code></td>
+            <td colspan="2"><code>inherit</code></td>
           </tr>
           <tr>
             <td><code>@headingsFontWeight</code></td>
-            <td><code>bold</code></td>
+            <td colspan="2"><code>bold</code></td>
           </tr>
           <tr>
             <td><code>@headingsColor</code></td>
-            <td><code>inherit</code></td>
+            <td colspan="2"><code>inherit</code></td>
           </tr>
         </tbody>
       </table>