aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-01-04 10:03:11 -0800
committerJacob Thornton <[email protected]>2012-01-04 10:03:11 -0800
commit3237047ac30fe4905dc515258bac050cdf811426 (patch)
tree57e5a82a570f80bf1f9a58dd5ab181b0293e2aee /docs
parenteb123f6b83b95d413056657aa80ad24a72fecae8 (diff)
parent1c7c5f750fc221ee94e435e4e49bc2ba1a6be5e6 (diff)
downloadbootstrap-3237047ac30fe4905dc515258bac050cdf811426.tar.xz
bootstrap-3237047ac30fe4905dc515258bac050cdf811426.zip
Merge branch 'master' of https://github.com/twitter/bootstrap
Diffstat (limited to 'docs')
-rw-r--r--docs/index.html7
-rw-r--r--docs/javascript.html2
2 files changed, 6 insertions, 3 deletions
diff --git a/docs/index.html b/docs/index.html
index 732ad9596..93dbcb491 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -897,7 +897,10 @@
</tr>
</tbody>
</table>
-
+<pre class="prettyprint linenums">
+&lt;table class="condensed-table"&gt;
+ ...
+&lt;/table&gt;</pre>
<h3>Example: Bordered table</h3>
<p>Make your tables look just a wee bit sleeker by rounding their corners and adding borders on all sides.</p>
<table class="bordered-table">
@@ -1971,7 +1974,7 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
<td>Node with makefile</td>
<td>
<p>Install the less command line compiler with npm by running the following command:</p>
- <pre>$ npm install lessc</pre>
+ <pre>$ npm install less</pre>
<p>Once installed just run <code>make</code> from the root of your bootstrap directory and you're all set.</p>
<p>Additionally, if you have <a href="https://github.com/mynyml/watchr">watchr</a> installed, you may run <code>make watch</code> to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).</p>
</td>
diff --git a/docs/javascript.html b/docs/javascript.html
index 055be36c8..10d81a0c3 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -385,7 +385,7 @@ $('#my-modal').bind('hidden', function () {
<h3>Methods</h3>
<h4>$().tabs or $().pills</h4>
<p>
- Activates tab and pill functionality for a given container. Tab links should reference id's in the document.
+ Activates tab and pill functionality for a given container. Tab links should reference IDs in the document.
</p>
<pre class="prettyprint linenums">
&lt;ul class="tabs"&gt;