Commit e75bc5eb authored by Jacob Thornton's avatar Jacob Thornton

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

Conflicts:
	docs/assets/bootstrap.zip
parents 390a9af9 aec0cb33
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<h1>Using LESS with Bootstrap</h1> <h1>Using LESS with Bootstrap</h1>
<p class="lead">Customize and extend Bootstrap with <a href="http://lesscss.org" target="_blank">LESS</a>, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.</p> <p class="lead">Customize and extend Bootstrap with <a href="http://lesscss.org" target="_blank">LESS</a>, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.</p>
<div class="subnav"> <div class="subnav">
<ul class="nav pills"> <ul class="nav nav-pills">
<li><a href="#builtWith">Built with Less</a></li> <li><a href="#builtWith">Built with Less</a></li>
<li><a href="#variables">Variables</a></li> <li><a href="#variables">Variables</a></li>
<li><a href="#mixins">Mixins</a></li> <li><a href="#mixins">Mixins</a></li>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<h1>{{_i}}Using LESS with Bootstrap{{/i}}</h1> <h1>{{_i}}Using LESS with Bootstrap{{/i}}</h1>
<p class="lead">{{_i}}Customize and extend Bootstrap with <a href="http://lesscss.org" target="_blank">LESS</a>, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.{{/i}}</p> <p class="lead">{{_i}}Customize and extend Bootstrap with <a href="http://lesscss.org" target="_blank">LESS</a>, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.{{/i}}</p>
<div class="subnav"> <div class="subnav">
<ul class="nav pills"> <ul class="nav nav-pills">
<li><a href="#builtWith">{{_i}}Built with Less{{/i}}</a></li> <li><a href="#builtWith">{{_i}}Built with Less{{/i}}</a></li>
<li><a href="#variables">{{_i}}Variables{{/i}}</a></li> <li><a href="#variables">{{_i}}Variables{{/i}}</a></li>
<li><a href="#mixins">{{_i}}Mixins{{/i}}</a></li> <li><a href="#mixins">{{_i}}Mixins{{/i}}</a></li>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment