From: Mark Otto <markotto@twitter.com>
Date: Wed, 18 Jul 2012 03:57:20 +0000 (-0700)
Subject: Merge branch '2.1.0-wip' of https://github.com/benjaminoakes/bootstrap into benjamino... 
X-Git-Tag: v2.1.0~2^2~167
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a1ad6d124a2ad22b9afcd16d90fc572b10fa9ffc;p=thirdparty%2Fbootstrap.git

Merge branch '2.1.0-wip' of https://github.com/benjaminoakes/bootstrap into benjaminoakes-2.1.0-wip

Conflicts:
	docs/extend.html
	docs/templates/pages/extend.mustache
---

a1ad6d124a2ad22b9afcd16d90fc572b10fa9ffc
diff --cc docs/extend.html
index df30b679ab,4b200f31a1..ee7de7a8cf
--- a/docs/extend.html
+++ b/docs/extend.html
@@@ -154,97 -150,26 +154,98 @@@
  &lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt;
  &lt;script src="/path/to/less.js"&gt;&lt;/script&gt;
  </pre>
 -  <p>To recompile the .less files, just save them and reload your page. Less.js compiles them and stores them in local storage.</p>
 +        <p>To recompile the .less files, just save them and reload your page. Less.js compiles them and stores them in local storage.</p>
  
 -  <h3>Unofficial Mac app</h3>
 -  <p><a href="http://incident57.com/less/">The unofficial Mac app</a> watches directories of .less files and compiles the code to local files after every save of a watched .less file.</p>
 -  <p>If you like, you can toggle preferences in the app for automatic minifying and which directory the compiled files end up in.</p>
 +        <h3>Unofficial Mac app</h3>
 +        <p><a href="http://incident57.com/less/">The unofficial Mac app</a> watches directories of .less files and compiles the code to local files after every save of a watched .less file. If you like, you can toggle preferences in the app for automatic minifying and which directory the compiled files end up in.</p>
  
-         <h3>More Mac apps</h3>
 -  <h3>More apps</h3>
 -  <h4><a href="http://crunchapp.net/" target="_blank">Crunch</a></h4>
 -  <p>Crunch is a great looking LESS editor and compiler built on Adobe Air.</p>
 -  <h4><a href="http://incident57.com/codekit/" target="_blank">CodeKit</a></h4>
 -  <p>Created by the same guy as the unofficial Mac app, CodeKit is a Mac app that compiles LESS, SASS, Stylus, and CoffeeScript.</p>
 -  <h4><a href="http://wearekiss.com/simpless" target="_blank">Simpless</a></h4>
 -  <p>Mac, Linux, and Windows app for drag and drop compiling of LESS files. Plus, the <a href="https://github.com/Paratron/SimpLESS" target="_blank">source code is on GitHub</a>.</p>
++        <h3>More apps</h3>
 +        <h4><a href="http://crunchapp.net/" target="_blank">Crunch</a></h4>
 +        <p>Crunch is a great looking LESS editor and compiler built on Adobe Air.</p>
 +        <h4><a href="http://incident57.com/codekit/" target="_blank">CodeKit</a></h4>
 +        <p>Created by the same guy as the unofficial Mac app, CodeKit is a Mac app that compiles LESS, SASS, Stylus, and CoffeeScript.</p>
 +        <h4><a href="http://wearekiss.com/simpless" target="_blank">Simpless</a></h4>
 +        <p>Mac, Linux, and Windows app for drag and drop compiling of LESS files. Plus, the <a href="https://github.com/Paratron/SimpLESS" target="_blank">source code is on GitHub</a>.</p>
  
 -</section>
 +      </section>
  
  
 -     <!-- Footer
 +
 +      <!-- Static assets
        ================================================== -->
 -      <footer class="footer">
 +      <section id="static-assets">
 +        <div class="page-header">
 +          <h1>Use as static assets</h1>
 +        </div>
 +        <p class="lead"><a href="./getting-started.html">Quickly start</a> any web project by dropping in the compiled or minified CSS and JS. Layer on custom styles separately for easy upgrades and maintenance moving forward.</p>
 +
 +        <h3>Setup file structure</h3>
 +        <p>Download the latest compiled Bootstrap and place into your project. For example, you might have something like this:</p>
 +<pre class="prettyprint">
 +  app/
 +  ├── layouts/
 +  └── templates/
 +  public/
 +  ├── css/
 +  │   ├── bootstrap.min.css
 +  ├── js/
 +  │   ├── bootstrap.min.js
 +  └── img/
 +      ├── glyphicons-halflings.png
 +      └── glyphicons-halflings-white.png
 +</pre>
 +
 +        <h3>Utilize starter template</h3>
 +        <p>Copy the following base HTML to get started.</p>
 +<pre class="prettyprint linenums">
 +&lt;html&gt;
 +  &lt;head&gt;
 +    &lt;title&gt;Bootstrap 101 Template&lt;/title&gt;
 +    &lt;!-- Bootstrap --&gt;
 +    &lt;link href="public/css/bootstrap.min.css" rel="stylesheet"&gt;
 +    &lt;script src="public/js/bootstrap.min.js"&gt;&lt;/script&gt;
 +  &lt;/head&gt;
 +  &lt;body&gt;
 +    &lt;h1&gt;Hello, world!&lt;/h1&gt;
 +  &lt;/body&gt;
 +&lt;/html&gt;
 +</pre>
 +
 +        <h3>Layer on custom code</h3>
 +        <p>Work in your custom CSS, JS, and more as necessary to make Bootstrap your own with your own separate CSS and JS files.</p>
 +<pre class="prettyprint linenums">
 +&lt;html&gt;
 +  &lt;head&gt;
 +    &lt;title&gt;Bootstrap 101 Template&lt;/title&gt;
 +    &lt;!-- Bootstrap --&gt;
 +    &lt;link href="public/css/bootstrap.min.css" rel="stylesheet"&gt;
 +    &lt;script src="public/js/bootstrap.min.js"&gt;&lt;/script&gt;
 +    &lt;!-- Project --&gt;
 +    &lt;link href="public/css/application.css" rel="stylesheet"&gt;
 +    &lt;script src="public/js/application.js"&gt;&lt;/script&gt;
 +  &lt;/head&gt;
 +  &lt;body&gt;
 +    &lt;h1&gt;Hello, world!&lt;/h1&gt;
 +  &lt;/body&gt;
 +&lt;/html&gt;
 +</pre>
 +
 +      </section>
 +
 +
 +
 +    </div>
 +  </div>
 +
++
 +</div>
 +
 +
 +
 +   <!-- Footer
 +    ================================================== -->
 +    <footer class="footer">
 +      <div class="container">
          <p class="pull-right"><a href="#">Back to top</a></p>
          <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
          <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
diff --cc docs/templates/pages/extend.mustache
index d7384d58ad,bbebe8e759..508bd7e152
--- a/docs/templates/pages/extend.mustache
+++ b/docs/templates/pages/extend.mustache
@@@ -83,87 -73,18 +83,88 @@@
  &lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt;
  &lt;script src="/path/to/less.js"&gt;&lt;/script&gt;
  </pre>
 -  <p>{{_i}}To recompile the .less files, just save them and reload your page. Less.js compiles them and stores them in local storage.{{/i}}</p>
 +        <p>{{_i}}To recompile the .less files, just save them and reload your page. Less.js compiles them and stores them in local storage.{{/i}}</p>
 +
 +        <h3>{{_i}}Unofficial Mac app{{/i}}</h3>
 +        <p>{{_i}}<a href="http://incident57.com/less/">The unofficial Mac app</a> watches directories of .less files and compiles the code to local files after every save of a watched .less file. If you like, you can toggle preferences in the app for automatic minifying and which directory the compiled files end up in.{{/i}}</p>
 +
-         <h3>{{_i}}More Mac apps{{/i}}</h3>
++        <h3>{{_i}}More apps{{/i}}</h3>
 +        <h4><a href="http://crunchapp.net/" target="_blank">Crunch</a></h4>
 +        <p>{{_i}}Crunch is a great looking LESS editor and compiler built on Adobe Air.{{/i}}</p>
 +        <h4><a href="http://incident57.com/codekit/" target="_blank">CodeKit</a></h4>
 +        <p>{{_i}}Created by the same guy as the unofficial Mac app, CodeKit is a Mac app that compiles LESS, SASS, Stylus, and CoffeeScript.{{/i}}</p>
 +        <h4><a href="http://wearekiss.com/simpless" target="_blank">Simpless</a></h4>
 +        <p>{{_i}}Mac, Linux, and Windows app for drag and drop compiling of LESS files. Plus, the <a href="https://github.com/Paratron/SimpLESS" target="_blank">source code is on GitHub</a>.{{/i}}</p>
 +
 +      </section>
 +
 +
 +
 +      <!-- Static assets
 +      ================================================== -->
 +      <section id="static-assets">
 +        <div class="page-header">
 +          <h1>{{_i}}Use as static assets{{/i}}</h1>
 +        </div>
 +        <p class="lead">{{_i}}<a href="./getting-started.html">Quickly start</a> any web project by dropping in the compiled or minified CSS and JS. Layer on custom styles separately for easy upgrades and maintenance moving forward.{{/i}}</p>
 +
 +        <h3>{{_i}}Setup file structure{{/i}}</h3>
 +        <p>{{_i}}Download the latest compiled Bootstrap and place into your project. For example, you might have something like this:{{/i}}</p>
 +<pre class="prettyprint">
 +  app/
 +  ├── layouts/
 +  └── templates/
 +  public/
 +  ├── css/
 +  │   ├── bootstrap.min.css
 +  ├── js/
 +  │   ├── bootstrap.min.js
 +  └── img/
 +      ├── glyphicons-halflings.png
 +      └── glyphicons-halflings-white.png
 +</pre>
 +
 +        <h3>{{_i}}Utilize starter template{{/i}}</h3>
 +        <p>{{_i}}Copy the following base HTML to get started.{{/i}}</p>
 +<pre class="prettyprint linenums">
 +&lt;html&gt;
 +  &lt;head&gt;
 +    &lt;title&gt;Bootstrap 101 Template&lt;/title&gt;
 +    &lt;!-- Bootstrap --&gt;
 +    &lt;link href="public/css/bootstrap.min.css" rel="stylesheet"&gt;
 +    &lt;script src="public/js/bootstrap.min.js"&gt;&lt;/script&gt;
 +  &lt;/head&gt;
 +  &lt;body&gt;
 +    &lt;h1&gt;Hello, world!&lt;/h1&gt;
 +  &lt;/body&gt;
 +&lt;/html&gt;
 +</pre>
 +
 +        <h3>{{_i}}Layer on custom code{{/i}}</h3>
 +        <p>{{_i}}Work in your custom CSS, JS, and more as necessary to make Bootstrap your own with your own separate CSS and JS files.{{/i}}</p>
 +<pre class="prettyprint linenums">
 +&lt;html&gt;
 +  &lt;head&gt;
 +    &lt;title&gt;Bootstrap 101 Template&lt;/title&gt;
 +    &lt;!-- Bootstrap --&gt;
 +    &lt;link href="public/css/bootstrap.min.css" rel="stylesheet"&gt;
 +    &lt;script src="public/js/bootstrap.min.js"&gt;&lt;/script&gt;
 +    &lt;!-- Project --&gt;
 +    &lt;link href="public/css/application.css" rel="stylesheet"&gt;
 +    &lt;script src="public/js/application.js"&gt;&lt;/script&gt;
 +  &lt;/head&gt;
 +  &lt;body&gt;
 +    &lt;h1&gt;Hello, world!&lt;/h1&gt;
 +  &lt;/body&gt;
 +&lt;/html&gt;
 +</pre>
 +
 +      </section>
 +
 +
  
 -  <h3>{{_i}}Unofficial Mac app{{/i}}</h3>
 -  <p>{{_i}}<a href="http://incident57.com/less/">The unofficial Mac app</a> watches directories of .less files and compiles the code to local files after every save of a watched .less file.{{/i}}</p>
 -  <p>{{_i}}If you like, you can toggle preferences in the app for automatic minifying and which directory the compiled files end up in.{{/i}}</p>
 +    </div>{{! /span9 }}
 +  </div>{{! row}}
  
 -  <h3>{{_i}}More apps{{/i}}</h3>
 -  <h4><a href="http://crunchapp.net/" target="_blank">Crunch</a></h4>
 -  <p>{{_i}}Crunch is a great looking LESS editor and compiler built on Adobe Air.{{/i}}</p>
 -  <h4><a href="http://incident57.com/codekit/" target="_blank">CodeKit</a></h4>
 -  <p>{{_i}}Created by the same guy as the unofficial Mac app, CodeKit is a Mac app that compiles LESS, SASS, Stylus, and CoffeeScript.{{/i}}</p>
 -  <h4><a href="http://wearekiss.com/simpless" target="_blank">Simpless</a></h4>
 -  <p>{{_i}}Mac, Linux, and Windows app for drag and drop compiling of LESS files. Plus, the <a href="https://github.com/Paratron/SimpLESS" target="_blank">source code is on GitHub</a>.{{/i}}</p>
+ 
 -</section>
 +</div>{{! /container }}