]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
update LESS docs to note @baseFontSize and @baseLineHeight must be pixels
authorMark Otto <markotto@twitter.com>
Mon, 26 Mar 2012 16:30:42 +0000 (09:30 -0700)
committerMark Otto <markotto@twitter.com>
Mon, 26 Mar 2012 16:30:42 +0000 (09:30 -0700)
docs/assets/bootstrap.zip
docs/less.html
docs/templates/pages/less.mustache

index 557ca63a126accae8999193cae519a773c068c8b..93f495965d448721786e5075f640b38ea5a13a10 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
index 89e06cf9131e037eca6dff6b61d7e65402ed2ead..a641c9ee3d9529c19c7dd931de851023d2007b33 100644 (file)
         <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>
index 263ec7fce62e97b567ed4ddfdc2dbe47cd80f64f..0b58cfc9eada48511f114d6bc0f5c781cefac298 100644 (file)
         <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>