1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 21:49:09 +01:00

Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

This commit is contained in:
Mark Otto 2011-09-10 22:55:59 -07:00
commit 62edafa1a4
3 changed files with 18 additions and 13 deletions

View File

@ -312,7 +312,6 @@ img.large-bird {
opacity: .1;
}
/* Pretty Print
-------------------------------------------------- */
pre.prettyprint {

View File

@ -48,15 +48,16 @@ $(document).ready(function(){
// POSITION STATIC TWIPSIES
// ========================
$(".twipsies a").each(function () {
$(this)
.twipsy({
live: false
, placement: $(this).attr('title')
, trigger: 'manual'
, offset: 2
$(window).load(function () {
$(".twipsies a").each(function () {
$(this)
.twipsy({
live: false
, placement: $(this).attr('title')
, trigger: 'manual'
, offset: 2
})
.trigger('twipsy:show')
})
.trigger('twipsy:show')
})
})
});

View File

@ -1776,7 +1776,10 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
<tr>
<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>
<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>
</tr>
<td>Javascript</td>
@ -1792,7 +1795,9 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
<tr>
<td>Command line</td>
<td>
<p>If you already have the less command line tool installed you can simply run the following command:</p>
<pre>$ lessc ./lib/bootstrap.less > bootstrap-1.3.0.css</pre>
<p>Be sure to include the <code>--compress</code> flag in that command if you're trying to save some bytes!
</td>
</tr>
<tr>