aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-03-26 09:30:42 -0700
committerMark Otto <[email protected]>2012-03-26 09:30:42 -0700
commit917f11e6799ddd43b439ce1f7a10c1a7360bcf3b (patch)
tree11c2627640af058c2d9cc33624fa5457ca08bdd6 /docs
parentd4914f47c34053fded5aea39fcb9b7747f7bbecc (diff)
downloadbootstrap-917f11e6799ddd43b439ce1f7a10c1a7360bcf3b.tar.xz
bootstrap-917f11e6799ddd43b439ce1f7a10c1a7360bcf3b.zip
update LESS docs to note @baseFontSize and @baseLineHeight must be pixels
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/bootstrap.zipbin56904 -> 56904 bytes
-rw-r--r--docs/less.html18
-rw-r--r--docs/templates/pages/less.mustache18
3 files changed, 20 insertions, 16 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 557ca63a1..93f495965 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/less.html b/docs/less.html
index 89e06cf91..a641c9ee3 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 263ec7fce..0b58cfc9e 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>