1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-18 03:11:19 +02:00

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

Conflicts:
	docs/templates/pages/index.mustache
This commit is contained in:
Mark Otto
2012-01-24 14:28:14 -08:00
17 changed files with 583 additions and 583 deletions

View File

@@ -358,7 +358,7 @@
<td>
<pre>&lt;div&gt;
&lt;h1&gt;Heading&lt;/h1&gt;
&lt;p&gt;Something right here...&lt;/p&gt;
&lt;p&gt;Something right here&lt;/p&gt;
&lt;/div&gt;</pre>
<p><strong>Note:</strong> Be sure to keep code within <code>&lt;pre&gt;</code> tags as close to the left as possible; it will render all tabs.</p>
</td>
@@ -369,11 +369,11 @@
<p>Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.</p>
<pre class="prettyprint">&lt;div&gt;
&lt;h1&gt;Heading&lt;/h1&gt;
&lt;p&gt;Something right here...&lt;/p&gt;
&lt;p&gt;Something right here&lt;/p&gt;
&lt;/div&gt;</pre>
<pre class="prettyprint linenums">&lt;div&gt;
&lt;h1&gt;Heading&lt;/h1&gt;
&lt;p&gt;Something right here...&lt;/p&gt;
&lt;p&gt;Something right here&lt;/p&gt;
&lt;/div&gt;</pre>
<p><a href="http://code.google.com/p/google-code-prettify/">Download google-code-prettify</a> and view the readme for <a href="http://google-code-prettify.googlecode.com/svn/trunk/README.html">how to use</a>.</p>
</td>
@@ -521,14 +521,14 @@
&lt;table&gt;
&lt;thead&gt;
&lt;tr&gt;
&lt;th&gt;...&lt;/th&gt;
&lt;th&gt;...&lt;/th&gt;
&lt;th&gt;&lt;/th&gt;
&lt;th&gt;&lt;/th&gt;
&lt;/tr&gt;
&lt;/thead&gt;
&lt;tbody&gt;
&lt;tr&gt;
&lt;td&gt;...&lt;/td&gt;
&lt;td&gt;...&lt;/td&gt;
&lt;td&gt;&lt;/td&gt;
&lt;td&gt;&lt;/td&gt;
&lt;/tr&gt;
&lt;/tbody&gt;
&lt;/table&gt;
@@ -591,7 +591,7 @@
<p>Tables are automatically styled with only a few borders to ensure readability and maintain structure. With 2.0, the <code>.table</code> class is required.</p>
<pre class="prettyprint linenums">
&lt;table class="table"&gt;
...
&lt;/table&gt;</pre>
</div>
<div class="span8">
@@ -636,7 +636,7 @@
<p class="muted"><strong>Note:</strong> Sprited tables use the <code>:nth-child</code> CSS selector and is not available in IE7-IE8.</p>
<pre class="prettyprint linenums" style="margin-bottom: 18px;">
&lt;table class="table table-striped"&gt;
...
&lt;/table&gt;</pre>
</div>
<div class="span8">
@@ -680,7 +680,7 @@
<p>Add borders around the entire table and rounded corners for aesthetic purposes.</p>
<pre class="prettyprint linenums">
&lt;table class="table table-bordered"&gt;
...
&lt;/table&gt;</pre>
</div>
<div class="span8">
@@ -725,10 +725,10 @@
<h3>4. Condensed table</h3>
<div class="row">
<div class="span4">
<p>Make your tables more compact by adding the <code>.table-condensed</code> class to cut table cell padding in half (from 10px to 5px).</p>
<p>Make your tables more compact by adding the <code>.table-condensed</code> class to cut table cell padding in half (from 8px to 4px).</p>
<pre class="prettyprint linenums" style="margin-bottom: 18px;">
&lt;table class="table table-condensed"&gt;
...
&lt;/table&gt;</pre>
</div>
<div class="span8">
@@ -770,7 +770,7 @@
<h3>5. Striped table w/ TableSorter.js</h3>
<div class="row">
<div class="span4">
<p>Include the <a href="http://jquery.com">jQuery</a> <a href="http://tablesorter.com/docs/">Tablesorter</a> plugin and automaically get clear styles for sorted columns.</p>
<p>Include the <a href="http://jquery.com">jQuery</a> <a href="http://tablesorter.com/docs/">Tablesorter</a> plugin and automatically get clear styles for sorted columns.</p>
<pre class="prettyprint linenums">
&lt;script src="jquery.tablesorter.js"&gt;&lt;/script&gt;
&lt;script &gt;
@@ -782,7 +782,7 @@
});
&lt;/script&gt;
&lt;table class="table table-striped"&gt;
...
&lt;/table&gt;</pre>
</div>
<div class="span8">
@@ -937,7 +937,7 @@
<p>With v2.0, we have lighter and smarter defaults for form styles. No extra markup, just form controls.</p>
<form class="well">
<label>Label name</label>
<input type="text" class="span3" placeholder="Type something...">
<input type="text" class="span3" placeholder="Type something">
<label class="checkbox">
<input type="checkbox"> Check me out
</label>
@@ -1057,13 +1057,13 @@
<fieldset class="control-group">
<label class="control-label" for="focusedInput">Focused input</label>
<div class="controls">
<input class="input-xlarge focused" id="focusedInput" name="focusedInput" type="text" value="This is focused...">
<input class="input-xlarge focused" id="focusedInput" name="focusedInput" type="text" value="This is focused">
</div>
</fieldset>
<fieldset class="control-group">
<label class="control-label" for="disabledInput">Disabled input</label>
<div class="controls">
<input class="input-xlarge disabled" id="disabledInput" name="disabledInput" type="text" placeholder="Disabled input here..." disabled>
<input class="input-xlarge disabled" id="disabledInput" name="disabledInput" type="text" placeholder="Disabled input here" disabled>
</div>
</fieldset>
<fieldset class="control-group">
@@ -1112,7 +1112,7 @@
<pre class="prettyprint linenums">
&lt;fieldset
class="control-group error"&gt;
...
&lt;/fieldset&gt;
</pre>
</div>
@@ -1296,7 +1296,8 @@
<a href="#" class="btn large disabled">Action</a>
</p>
<p>
<button class="btn large primary disabled" disabled="disabled">Primary action</button>&nbsp;<button class="btn large" disabled>Action</button>
<button class="btn large primary disabled" disabled="disabled">Primary action</button>
<button class="btn large" disabled>Action</button>
</p>
</div>
</div>

View File

@@ -77,7 +77,7 @@
<li><span>&#10004;</span> Built on LESS</li>
<li><span>&#10004;</span> Complete style guide docs</li>
<li><span>&#10004;</span> Fully responsive design</li>
<li><span>&#10004;</span> Small CSS footprint (10kb gzipped)</li>
<li><span>&#10004;</span> Small footprint (10kb gzipped)</li>
<li><span>&#10004;</span> Support for IE7 and up</li>
<li><span>&#10004;</span> Custom jQuery plugins</li>
<li><span>&#10004;</span> Dozens of components</li>
@@ -136,7 +136,7 @@
</li>
</ul>
<h1>Designed for everyone, everywhere.</h1>
<h1Designed for everyone, everywhere.</h1>
<p class="marketing-byline">Need reasons to love Bootstrap? Look no further.</p>
<div class="row">
<div class="span4">
@@ -217,7 +217,6 @@
================================================== -->
<h1>Get started in no time.</h1>
<p class="marketing-byline">Quickly start using Bootstrap within your workflow and development process.</p>
<div class="getting-started">
<div class="row">
<div class="span4">
@@ -228,7 +227,7 @@
</form>
</div>
<div class="span4">
<h3>Use it with LESS.js</h3>
<h3>Use it with LESS</h3>
<p>A fan of using LESS? No problem, just download the repo and add these lines to your page:</p>
<form>
<textarea class="copy-code" rows="2">&lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt;

File diff suppressed because it is too large Load Diff

View File

@@ -4,34 +4,34 @@
================================================== -->
<header class="jumbotron masthead">
<div class="inner">
<h1>Bootstrap,<br> from Twitter</h1>
<p class="lead">Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, featuring HTML, CSS, and JS for dozens of base elements and common design components.</p>
<h1>{{_i}}Bootstrap,<br> from Twitter{{/i}}</h1>
<p class="lead">{{_i}}Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, featuring HTML, CSS, and JS for dozens of base elements and common design components.{{/i}}</p>
<p class="download-info">
<a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">Download on GitHub</a>
<a href="./scaffolding.html" class="btn btn-large">Get started &rarr;</a>
<a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">{{_i}}Download on GitHub{{/i}}</a>
<a href="./scaffolding.html" class="btn btn-large">{{_i}}Get started &rarr;{{/i}}</a>
</p>
<div class="benefits">
<h4>Feature highlights</h4>
<h4>{{_i}}Feature highlights{{/i}}</h4>
<ul>
<li><span>&#10004;</span> Built on LESS</li>
<li><span>&#10004;</span> Complete style guide docs</li>
<li><span>&#10004;</span> Fully responsive design</li>
<li><span>&#10004;</span> Small CSS footprint (10kb gzipped)</li>
<li><span>&#10004;</span> Support for IE7 and up</li>
<li><span>&#10004;</span> Custom jQuery plugins</li>
<li><span>&#10004;</span> Dozens of components</li>
<li>{{_i}}<span>&#10004;</span> Built on LESS{{/i}}</li>
<li>{{_i}}<span>&#10004;</span> Complete style guide docs{{/i}}</li>
<li>{{_i}}<span>&#10004;</span> Fully responsive design{{/i}}</li>
<li>{{_i}}<span>&#10004;</span> Small footprint (10kb gzipped){{/i}}</li>
<li>{{_i}}<span>&#10004;</span> Support for IE7 and up{{/i}}</li>
<li>{{_i}}<span>&#10004;</span> Custom jQuery plugins{{/i}}</li>
<li>{{_i}}<span>&#10004;</span> Dozens of components{{/i}}</li>
</ul>
</div>
</div>
</header>
<ul class="quick-links">
<li><strong>Quick links</strong></li>
<li><strong>{{_i}}Quick links{{/i}}</strong></li>
<li><a href="https://github.com/twitter/bootstrap/">GitHub</a></li>
<li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li>
<li><a href="https://github.com/twitter/bootstrap/wiki/Roadmap">Roadmap</a></li>
<li><a href="https://github.com/twitter/bootstrap/wiki/Changelog">Changelog</a></li>
<li><a href="https://github.com/twitter/bootstrap/issues?state=open">{{_i}}Issues{{/i}}</a></li>
<li><a href="https://github.com/twitter/bootstrap/wiki/Roadmap">{{_i}}Roadmap{{/i}}</a></li>
<li><a href="https://github.com/twitter/bootstrap/wiki/Changelog">{{_i}}Changelog{{/i}}</a></li>
<li class="divider">&middot;</li>
<li>
<iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="114px" height="20px"></iframe>
@@ -56,8 +56,8 @@
<div class="marketing">
<h1>Built with Bootstrap.</h1>
<p class="marketing-byline">For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a>.</p>
<h1>{{_i}}Built with Bootstrap.{{/i}}</h1>
<p class="marketing-byline">{{_i}}For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a>.{{/i}}</p>
<ul class="thumbnails example-sites">
<li class="span4">
<a class="thumbnail" href="http://kippt.com/" target="_blank">
@@ -76,110 +76,109 @@
</li>
</ul>
<h1>Designed for everyone, everywhere.</h1>
<p class="marketing-byline">Need reasons to love Bootstrap? Look no further.</p>
<h1{{_i}}Designed for everyone, everywhere.{{/i}}</h1>
<p class="marketing-byline">{{_i}}Need reasons to love Bootstrap? Look no further.{{/i}}</p>
<div class="row">
<div class="span4">
<img class="icon" src="assets/img/glyphicons/glyphicons_042_group.png">
<h2>Built for and by nerds</h2>
<p>Like you, we love building awesome products on the web. We love it so much, we decided to help people just like us do it easier, better, and faster. Bootstrap is built for you.</p>
<h2>{{_i}}Built for and by nerds{{/i}}</h2>
<p>{{_i}}Like you, we love building awesome products on the web. We love it so much, we decided to help people just like us do it easier, better, and faster. Bootstrap is built for you.{{/i}}</p>
</div>
<div class="span4">
<img class="icon" src="assets/img/glyphicons/glyphicons_079_podium.png">
<h2>For all skill levels</h2>
<p>Bootstrap is designed to help people of all skill level&mdash;designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.</p>
<h2>{{_i}}For all skill levels{{/i}}</h2>
<p>{{_i}}Bootstrap is designed to help people of all skill level&mdash;designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.{{/i}}</p>
</div>
<div class="span4">
<img class="icon" src="assets/img/glyphicons/glyphicons_163_iphone.png">
<h2>Cross-everything</h2>
<p>Originally built with only modern browsers in mind, Bootstrap has evolved to include support for all major browsers (even IE7!) and, with Bootstrap 2, tablets and smartphones, too.</p>
<h2>{{_i}}Cross-everything{{/i}}</h2>
<p>{{_i}}Originally built with only modern browsers in mind, Bootstrap has evolved to include support for all major browsers (even IE7!) and, with Bootstrap 2, tablets and smartphones, too.{{/i}}</p>
</div>
</div><!--/row-->
<div class="row">
<div class="span4">
<img class="icon" src="assets/img/glyphicons/glyphicons_155_show_thumbnails.png">
<h2>12-column grid</h2>
<p>Grid systems aren't everything, but having a durable and flexible one at the core of your work can make development much simpler. Use our built-in grid classes or roll your own.</p>
<h2>{{_i}}12-column grid{{/i}}</h2>
<p>{{_i}}Grid systems aren't everything, but having a durable and flexible one at the core of your work can make development much simpler. Use our built-in grid classes or roll your own.{{/i}}</p>
</div>
<div class="span4">
<img class="icon" src="assets/img/glyphicons/glyphicons_214_resize_small.png">
<h2>Responsive design</h2>
<p>With Bootstrap 2, we've gone fully responsive. Our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.</p>
<h2>{{_i}}Responsive design{{/i}}</h2>
<p>{{_i}}With Bootstrap 2, we've gone fully responsive. Our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.{{/i}}</p>
</div>
<div class="span4">
<img class="icon" src="assets/img/glyphicons/glyphicons_266_book_open.png">
<h2>Styleguide docs</h2>
<p>Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.</p>
<h2>{{_i}}Styleguide docs{{/i}}</h2>
<p>{{_i}}Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.{{/i}}</p>
</div>
</div><!--/row-->
<div class="row">
<div class="span4">
<img class="icon" src="assets/img/glyphicons/glyphicons_082_roundabout.png">
<h2>Growing library</h2>
<p>Despite being only 7kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.</p>
<h2>{{_i}}Growing library{{/i}}</h2>
<p>{{_i}}Despite being only 7kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.{{/i}}</p>
</div>
<div class="span4">
<img class="icon" src="assets/img/glyphicons/glyphicons_009_magic.png">
<h2>Custom jQuery plugins</h2>
<p>What good is an awesome design component without easy-to-use, proper, and extensible interactions? With Bootstrap, you get custom-built jQuery plugins to bring your projects to life.</p>
<h2>{{_i}}Custom jQuery plugins{{/i}}</h2>
<p>{{_i}}What good is an awesome design component without easy-to-use, proper, and extensible interactions? With Bootstrap, you get custom-built jQuery plugins to bring your projects to life.{{/i}}</p>
</div>
<div class="span4">
<img class="icon" src="assets/img/less-small.png">
<h2>Built on LESS</h2>
<p>Where vanilla CSS falters, LESS excels. Variables, nesting, operations, and mixins in LESS makes coding CSS faster and more efficient with minimal overhead.</p>
<h2>{{_i}}Built on LESS{{/i}}</h2>
<p>{{_i}}Where vanilla CSS falters, LESS excels. Variables, nesting, operations, and mixins in LESS makes coding CSS faster and more efficient with minimal overhead.{{/i}}</p>
</div>
</div><!--/row-->
<div class="row">
<div class="span3">
<img class="small-icon" src="assets/img/icon-html5.png">
<h3>HTML5</h3>
<p>Built to support new HTML5 elements and syntax.</p>
<p>{{_i}}Built to support new HTML5 elements and syntax.{{/i}}</p>
</div>
<div class="span3">
<img class="small-icon" src="assets/img/icon-css3.png">
<h3>CSS3</h3>
<p>Progressively enhanced components for ultimate style.</p>
<p>{{_i}}Progressively enhanced components for ultimate style.{{/i}}</p>
</div>
<div class="span3">
<img class="small-icon" src="assets/img/icon-github.png">
<h3>Open-source</h3>
<p>Built for and maintained by the community via <a href="https://github.com">GitHub</a>.</p>
<h3>{{_i}}Open-source{{/i}}</h3>
<p>{{_i}}Built for and maintained by the community via <a href="https://github.com">GitHub</a>.{{/i}}</p>
</div>
<div class="span3">
<img class="small-icon" src="assets/img/icon-twitter.png">
<h3>Made at Twitter</h3>
<p>Brought to you by an experienced <a href="http://twitter.com/fat">engineer</a> and <a href="http://twitter.com/mdo">designer</a>.</p>
<h3>{{_i}}Made at Twitter{{/i}}</h3>
<p>{{_i}}Brought to you by an experienced <a href="http://twitter.com/fat">engineer</a> and <a href="http://twitter.com/mdo">designer</a>.{{/i}}</p>
</div>
</div><!--/row-->
<!-- Quickstart options
================================================== -->
<h1>Get started in no time.</h1>
<p class="marketing-byline">Quickly start using Bootstrap within your workflow and development process.</p>
<h1>{{_i}}Get started in no time.{{/i}}</h1>
<p class="marketing-byline">{{_i}}Quickly start using Bootstrap within your workflow and development process.{{/i}}</p>
<div class="getting-started">
<div class="row">
<div class="span4">
<h3>Hotlink the CSS</h3>
<p>For the quickest and easiest start, just copy this snippet into your webpage.</p>
<h3>{{_i}}Hotlink the CSS{{/i}}</h3>
<p>{{_i}}For the quickest and easiest start, just copy this snippet into your webpage.{{/i}}</p>
<form>
<textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.min.css"></textarea>
</form>
</div>
<div class="span4">
<h3>Use it with LESS.js</h3>
<p>A fan of using LESS? No problem, just download the repo and add these lines to your page:</p>
<h3>{{_i}}Use it with LESS{{/i}}</h3>
<p>{{_i}}A fan of using LESS? No problem, just download the repo and add these lines to your page:{{/i}}</p>
<form>
<textarea class="copy-code" rows="2">&lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt;
&lt;script src="/path/to/less.js"&gt;&lt;/script&gt;</textarea>
</form>
</div>
<div class="span4">
<h3>Fork on GitHub</h3>
<p>Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.</p>
<p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">Bootstrap on GitHub &raquo;</a></p>
<p class="current-version">Currently <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v2.0.0</a></p>
<h3>{{_i}}Fork on GitHub{{/i}}</h3>
<p>{{_i}}Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.{{/i}}</p>
<p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">{{_i}}Bootstrap on GitHub &raquo;{{/i}}</a></p>
<p class="current-version">{{_i}}Currently{{/i}} <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v2.0.0</a></p>
</div>
</div><!-- /row -->
</div><!-- /getting-started -->

View File

@@ -1,8 +1,8 @@
<!-- Masthead
================================================== -->
<header class="jumbotron subhead" id="overview">
<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>
<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>
</header>
@@ -10,35 +10,35 @@
<!-- BUILT WITH LESS
================================================== -->
<div class="page-header">
<h1>Built with LESS</h1>
<h1>{{_i}}Built with LESS{{/i}}</h1>
</div>
<div class="row">
<div class="span4">
<h3>Why LESS?</h3>
<p>Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by <a href="http://cloudhead.io">Alexis Sellier</a>. It makes developing systems-based CSS faster, easier, and more fun.</p>
<h3>{{_i}}Why LESS?{{/i}}</h3>
<p>{{_i}}Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by <a href="http://cloudhead.io">Alexis Sellier</a>. It makes developing systems-based CSS faster, easier, and more fun.{{/i}}</p>
</div>
<div class="span4">
<h3>What's included?</h3>
<p>As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.</p>
<h3>{{_i}}What's included?{{/i}}</h3>
<p>{{_i}}As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.{{/i}}</p>
</div>
<div class="span4">
<h3>Learn more</h3>
<h3>{{_i}}Learn more{{/i}}</h3>
<img style="float: right; height: 36px;" src="assets/img/less-logo-large.png" alt="LESS CSS">
<p>Visit the official website at <a href="http://lesscss.org">http://lesscss.org</a> to learn more.</p>
<p>{{_i}}Visit the official website at <a href="http://lesscss.org">http://lesscss.org</a> to learn more.{{/i}}</p>
</div>
</div>
<div class="row">
<div class="span4">
<h3>Variables</h3>
<p>Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though&mdash;assign colors or pixel values as variables and change them once.</p>
<h3>{{_i}}Variables{{/i}}</h3>
<p>{{_i}}Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though&mdash;assign colors or pixel values as variables and change them once.{{/i}}</p>
</div>
<div class="span4">
<h3>Mixins</h3>
<p>Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.</p>
<h3>{{_i}}Mixins{{/i}}</h3>
<p>{{_i}}Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.{{/i}}</p>
</div>
<div class="span4">
<h3>Operations</h3>
<p>Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.</p>
<h3>{{_i}}Operations{{/i}}</h3>
<p>{{_i}}Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.{{/i}}</p>
</div>
</div>
@@ -47,35 +47,35 @@
<!-- VARIABLES
================================================== -->
<div class="page-header" id="variables">
<h1>Variables <small>from variables.less</small></h1>
<h1>{{_i}}Variables <small>from variables.less</small>{{/i}}</h1>
</div>
<h3>Hyperlinks</h3>
<h3>{{_i}}Hyperlinks{{/i}}</h3>
<table class="table table-bordered table-striped">
<thead>
<tr>
<th>Variable</th>
<th>Value</th>
<th>Usage</th>
<th>{{_i}}Variable{{/i}}</th>
<th>{{_i}}Value{{/i}}</th>
<th>{{_i}}Usage{{/i}}</th>
</tr>
</thead>
<tbody>
<tr>
<td><code>@linkColor</code></td>
<td>#0069d6</td>
<td>Default link text color</td>
<td>{{_i}}Default link text color{{/i}}</td>
</tr>
<tr>
<td><code>@linkColorHover</code></td>
<td><code>darken(@linkColor, 15)</code></td>
<td>Default link text hover color</td>
<td>{{_i}}Default link text hover color{{/i}}</td>
</tr>
</tbody>
</table>
<div class="row">
<div class="span6">
<h3>Grayscale colors</h3>
<h3>{{_i}}Grayscale colors{{/i}}</h3>
<table class="table table-bordered table-striped">
<tbody>
<tr>
@@ -106,7 +106,7 @@
</table>
</div>
<div class="span6">
<h3>Accent colors</h3>
<h3>{{_i}}Accent colors{{/i}}</h3>
<table class="table table-bordered table-striped">
<tbody>
<tr>
@@ -144,7 +144,7 @@
<div class="row">
<div class="span6">
<h3>Grid system</h3>
<h3>{{_i}}Grid system{{/i}}</h3>
<table class="table table-bordered table-striped">
<tbody>
<tr>
@@ -167,7 +167,7 @@
</table>
</div>
<div class="span6">
<h3>Typography</h3>
<h3>{{_i}}Typography{{/i}}</h3>
<table class="table table-bordered table-striped">
<tbody>
<tr>
@@ -190,7 +190,7 @@
<div class="row">
<div class="span3">
<h3>Visuals</h3>
<h3>{{_i}}Visuals{{/i}}</h3>
</div>
<div class="span9">
<table class="table table-bordered table-striped">
@@ -209,7 +209,7 @@
<!-- MIXINS
================================================== -->
<div class="page-header" id="mixins">
<h1>Mixins <small>from mixins.less</small></h1>
<h1>{{_i}}Mixins <small>from mixins.less</small>{{/i}}</h1>
</div>
@@ -217,7 +217,7 @@
<!-- OPERATIONS
================================================== -->
<div class="page-header" id="operations">
<h1>Operations</h1>
<h1>{{_i}}Operations{{/i}}</h1>
</div>
@@ -225,7 +225,7 @@
<!-- COMPILING LESS AND BOOTSTRAP
================================================== -->
<div class="page-header" id="compiling">
<h1>Compiling LESS and Bootstrap</h1>
<h1>{{_i}}Compiling LESS and Bootstrap{{/i}}</h1>
</div>
@@ -235,25 +235,25 @@
================================================== -->
<section id="less">
<div class="page-header">
<h1>Using Bootstrap with Less <small>Supercharge your CSS with variables, mixins, and functions</small></h1>
<h1>{{_i}}Using Bootstrap with Less <small>Supercharge your CSS with variables, mixins, and functions</small>{{/i}}</h1>
</div>
<div class="row">
<div class="span3">
<p>Bootstrap was built with <a href="http://markdotto.com/bootstrap/">Preboot</a>, an open-source pack of mixins and variables to be used in conjunction with <a href="http://lesscss.org" target="_blank">Less</a>, a CSS preprocessor for faster and easier web development.</p>
<p>Check out how we used Preboot in Bootstrap and how you can make use of it should you choose to run Less on your next project.</p>
<p>{{_i}}Bootstrap was built with <a href="http://markdotto.com/bootstrap/">Preboot</a>, an open-source pack of mixins and variables to be used in conjunction with <a href="http://lesscss.org" target="_blank">Less</a>, a CSS preprocessor for faster and easier web development.{{/i}}</p>
<p>{{_i}}Check out how we used Preboot in Bootstrap and how you can make use of it should you choose to run Less on your next project.{{/i}}</p>
</div>
<div class="span9">
<h2>How to use it</h2>
<p>Use this option to make full use of Bootstraps Less variables, mixins, and nesting in CSS via javascript in your browser.</p>
<h2>{{_i}}How to use it{{/i}}</h2>
<p>{{_i}}Use this option to make full use of Bootstraps Less variables, mixins, and nesting in CSS via javascript in your browser.{{/i}}</p>
<pre class="prettyprint linenums">
&lt;link rel="stylesheet/less" href="less/bootstrap.less" media="all" /&gt;
&lt;script src="js/less-1.1.3.min.js"&gt;&lt;/script&gt;</pre>
<p>Not feeling the .js solution? <a href="http://incident57.com/less" target="_blank">Try the Less Mac app</a> or <a href="http://lesscss.org/#-client-side-usage" target="_blank">use Node.js</a> to compile when you deploy your code.</p>
<p>{{_i}}Not feeling the .js solution? <a href="http://incident57.com/less" target="_blank">Try the Less Mac app</a> or <a href="http://lesscss.org/#-client-side-usage" target="_blank">use Node.js</a> to compile when you deploy your code.{{/i}}</p>
<h2>Whats included</h2>
<p>Here are some of the highlights of whats included in Twitter Bootstrap as part of Bootstrap. Head over to the Bootstrap website or Github project page to download and learn more.</p>
<h3>Variables</h3>
<p>Variables in Less are perfect for maintaining and updating your CSS headache free. When you want to change a color value or a frequently used value, update it in one spot and youre set.</p>
<h2>{{_i}}Whats included{{/i}}</h2>
<p>{{_i}}Here are some of the highlights of whats included in Twitter Bootstrap as part of Bootstrap. Head over to the Bootstrap website or Github project page to download and learn more.{{/i}}</p>
<h3>{{_i}}Variables{{/i}}</h3>
<p>{{_i}}Variables in Less are perfect for maintaining and updating your CSS headache free. When you want to change a color value or a frequently used value, update it in one spot and youre set.{{/i}}</p>
<pre class="prettyprint linenums">
// Links
@linkColor: #8b59c2;
@@ -281,16 +281,16 @@
@baseline: 18px;
</pre>
<h3>Commenting</h3>
<p>Less also provides another style of commenting in addition to CSSs normal <code>/* ... */</code> syntax.</p>
<h3>{{_i}}Commenting{{/i}}</h3>
<p>{{_i}}Less also provides another style of commenting in addition to CSSs normal <code>/* ... */</code> syntax.{{/i}}</p>
<pre class="prettyprint linenums">
// This is a comment
/* This is also a comment */
</pre>
<h3>Mixins up the wazoo</h3>
<p>Mixins are basically includes or partials for CSS, allowing you to combine a block of code into one. Theyre great for vendor prefixed properties like <code>box-shadow</code>, cross-browser gradients, font stacks, and more. Below is a sample of the mixins that are included with Bootstrap.</p>
<h4>Font stacks</h4>
<h3>{{_i}}Mixins up the wazoo{{/i}}</h3>
<p>{{_i}}Mixins are basically includes or partials for CSS, allowing you to combine a block of code into one. Theyre great for vendor prefixed properties like <code>box-shadow</code>, cross-browser gradients, font stacks, and more. Below is a sample of the mixins that are included with Bootstrap.{{/i}}</p>
<h4>{{_i}}Font stacks{{/i}}</h4>
<pre class="prettyprint linenums">
#font {
.shorthand(@weight: normal, @size: 14px, @lineHeight: 20px) {
@@ -307,7 +307,7 @@
...
}
</pre>
<h4>Gradients</h4>
<h4>{{_i}}Gradients{{/i}}</h4>
<pre class="prettyprint linenums">
#gradient {
...
@@ -326,8 +326,8 @@
}
</pre>
<h3>Operations</h3>
<p>Get fancy and perform some math to generate flexible and powerful mixins like the one below.</p>
<h3>{{_i}}Operations{{/i}}</h3>
<p>{{_i}}Get fancy and perform some math to generate flexible and powerful mixins like the one below.{{/i}}</p>
<pre class="prettyprint linenums">
// Griditude
@gridColumns: 16;
@@ -341,62 +341,62 @@
}
</pre>
<h2 id="compiling">Compiling Less</h2>
<p>After modifying the <code>.less</code> files in /lib/, you'll need to recompile them in order to regenerate the bootstrap-*.*.*.css and bootstrap-*.*.*.min.css files. If you're submitting a pull request to GitHub, you must always recompile.</p>
<h3>Ways to compile</h3>
<h2 id="compiling">{{_i}}Compiling Less{{/i}}</h2>
<p>{{_i}}After modifying the <code>.less</code> files in /lib/, you'll need to recompile them in order to regenerate the bootstrap-*.*.*.css and bootstrap-*.*.*.min.css files. If you're submitting a pull request to GitHub, you must always recompile.{{/i}}</p>
<h3>{{_i}}Ways to compile{{/i}}</h3>
<table class="table table-bordered table-striped">
<thead>
<tr>
<th style="width: 120px;">Method</th>
<th>Steps</th>
<th style="width: 120px;">{{_i}}Method{{/i}}</th>
<th>{{_i}}Steps{{/i}}</th>
</tr>
</thead>
<tbody>
<tr>
<td>Node with makefile</td>
<td>{{_i}}Node with makefile{{/i}}</td>
<td>
<p>Install the LESS command line compiler with npm by running the following command:</p>
<p>{{_i}}Install the LESS command line compiler with npm by running the following command:{{/i}}</p>
<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>
<p>{{_i}}Once installed just run <code>make</code> from the root of your bootstrap directory and you're all set.{{/i}}</p>
<p>{{_i}}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).{{/i}}</p>
</td>
</tr>
<td>Javascript</td>
<td>{{_i}}Javascript{{/i}}</td>
<td>
<p><a href="http://lesscss.org/">Download the latest Less.js</a> and include the path to it (and Bootstrap) in the <code>&lt;head&gt;</code>.</p>
<p>{{_i}}<a href="http://lesscss.org/">Download the latest Less.js</a> and include the path to it (and Bootstrap) in the <code>&lt;head&gt;</code>.{{/i}}</p>
<pre class="prettyprint">
&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>{{_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>
</td>
</tr>
<tr>
<td>Command line</td>
<td>{{_i}}Command line{{/i}}</td>
<td>
<p>Install the LESS command line tool via Node and run the following command:</p>
<p>{{_i}}Install the LESS command line tool via Node and run the following command:{{/i}}</p>
<pre>$ lessc ./lib/bootstrap.less > bootstrap.css</pre>
<p>Be sure to include <code>--compress</code> in that command if you're trying to save some bytes!</p>
<p>{{_i}}Be sure to include <code>--compress</code> in that command if you're trying to save some bytes!{{/i}}</p>
</td>
</tr>
<tr>
<td><a href="http://incident57.com/less/" target="_blank">Unofficial Mac app</a></td>
<td><a href="http://incident57.com/less/" target="_blank">{{_i}}Unofficial Mac app{{/i}}</a></td>
<td>
<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>
<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>
</td>
</tr>
<tr>
<td><a href="http://crunchapp.net/" target="_blank">Crunch</a></td>
<td>Crunch is a great looking LESS editor and compiler built on Adobe Air.</td>
<td>{{_i}}Crunch is a great looking LESS editor and compiler built on Adobe Air.{{/i}}</td>
</tr>
<tr>
<td><a href="http://incident57.com/codekit/" target="_blank">CodeKit</a></td>
<td>Created by the same guy as the unofficial Mac app, CodeKit is a Mac app that compiles LESS, SASS, Stylus, and CoffeeScript.</td>
<td>{{_i}}Created by the same guy as the unofficial Mac app, CodeKit is a Mac app that compiles LESS, SASS, Stylus, and CoffeeScript.{{/i}}</td>
</tr>
<tr>
<td><a href="http://wearekiss.com/simpless" target="_blank">Simpless</a></td>
<td>Mac, Linux, and PC 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>.</td>
<td>{{_i}}Mac, Linux, and PC 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}}</td>
</tr>
</tbody>
</table>

View File

@@ -1,12 +1,12 @@
<!-- Masthead
================================================== -->
<header class="jumbotron subhead" id="overview">
<h1>Scaffolding</h1>
<p class="lead">Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.</p>
<h1>{{_i}}Scaffolding{{/i}}</h1>
<p class="lead">{{_i}}Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.{{/i}}</p>
<ul class="nav pills">
<li><a href="./scaffolding.html#grid-system">Grid system</a></li>
<li><a href="./scaffolding.html#layouts">Layouts</a></li>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li>
<li><a href="./scaffolding.html#grid-system">{{_i}}Grid system{{/i}}</a></li>
<li><a href="./scaffolding.html#layouts">{{_i}}Layouts{{/i}}</a></li>
<li><a href="./scaffolding.html#responsive">{{_i}}Responsive design{{/i}}</a></li>
</ul>
</header>
@@ -16,7 +16,7 @@
================================================== -->
<section id="grid-system">
<div class="page-header">
<h1>Grid system <small>12 columns with a responsive twist</small></h1>
<h1>{{_i}}Grid system <small>12 columns with a responsive twist</small>{{/i}}</h1>
</div>
<h2>Default 940px grid</h2>
@@ -53,8 +53,8 @@
<div class="row">
<div class="span4">
<p>The default grid system provided as part of Bootstrap is a <strong>940px-wide, 12-column grid</strong>.</p>
<p>It also has three responsive variations for various devices and resolutions: phone, tablet, and large widescreen desktops.</p>
<p>{{_i}}The default grid system provided as part of Bootstrap is a <strong>940px-wide, 12-column grid</strong>.{{/i}}</p>
<p>{{_i}}It also has three responsive variations for various devices and resolutions: phone, tablet, and large widescreen desktops.{{/i}}</p>
</div>
<div class="span4">
<pre class="prettyprint linenums">
@@ -65,7 +65,7 @@
</pre>
</div>
<div class="span4">
<p>As shown here, a basic layout can be created with two "columns," each spanning a number of the 12 foundational columns we defined as part of our grid system.</p>
<p>{{_i}}As shown here, a basic layout can be created with two "columns," each spanning a number of the 12 foundational columns we defined as part of our grid system.{{/i}}</p>
</div>
</div><!-- /row -->
@@ -84,20 +84,20 @@
<br>
<h2>Nesting columns</h2>
<h2>{{_i}}Nesting columns{{/i}}</h2>
<div class="row">
<div class="span6">
<p>With the static (non-fluid) grid system in Bootstrap, nesting is easy. To nest your content, just add a new <code>.row</code> and set of <code>.span*</code> columns within an existing <code>.span*</code> column.</p>
<h4>Example</h4>
<p>{{_i}}With the static (non-fluid) grid system in Bootstrap, nesting is easy. To nest your content, just add a new <code>.row</code> and set of <code>.span*</code> columns within an existing <code>.span*</code> column.{{/i}}</p>
<h4>{{_i}}Example{{/i}}</h4>
<div class="row show-grid">
<div class="span6">
Level 1 of column
{{_i}}Level 1 of column{{/i}}
<div class="row show-grid">
<div class="span3">
Level 2
{{_i}}Level 2{{/i}}
</div>
<div class="span3">
Level 2
{{_i}}Level 2{{/i}}
</div>
</div>
</div>
@@ -107,10 +107,10 @@
<pre class="prettyprint linenums">
&lt;div class="row"&gt;
&lt;div class="span12"&gt;
Level 1 of column
{{_i}}Level 1 of column{{/i}}
&lt;div class="row"&gt;
&lt;div class="span6"&gt;Level 2&lt;/div&gt;
&lt;div class="span6"&gt;Level 2&lt;/div&gt;
&lt;div class="span6"&gt;{{_i}}Level 2{{/i}}&lt;/div&gt;
&lt;div class="span6"&gt;{{_i}}Level 2{{/i}}&lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;
@@ -118,50 +118,50 @@
</div>
</div>
<h2>Grid customization</h2>
<h2>{{_i}}Grid customization{{/i}}</h2>
<table class="table table-bordered table-striped">
<thead>
<tr>
<th>Variable</th>
<th>Default value</th>
<th>Description</th>
<th>{{_i}}Variable{{/i}}</th>
<th>{{_i}}Default value{{/i}}</th>
<th>{{_i}}Description{{/i}}</th>
</tr>
</thead>
<tbody>
<tr>
<td><code>@gridColumns</code></td>
<td>12</td>
<td>Number of columns</td>
<td>{{_i}}Number of columns{{/i}}</td>
</tr>
<tr>
<td><code>@gridColumnWidth</code></td>
<td>60px</td>
<td>Width of each column</td>
<td>{{_i}}Width of each column{{/i}}</td>
</tr>
<tr>
<td><code>@gridGutterWidth</code></td>
<td>20px</td>
<td>Negative space between columns</td>
<td>{{_i}}Negative space between columns{{/i}}</td>
</tr>
<tr>
<td><code>@siteWidth</code></td>
<td><em>Computed sum of all columns and gutters</em></td>
<td>Counts number of columns and gutters to set width of the <code>.fixed-container()</code> mixin</td>
<td><em>{{_i}}Computed sum of all columns and gutters{{/i}}</em></td>
<td>{{_i}}Counts number of columns and gutters to set width of the <code>.fixed-container()</code> mixin{{/i}}</td>
</tr>
</tbody>
</table>
<div class="row">
<div class="span4">
<h3>Variables in LESS</h3>
<p>Built into Bootstrap are a handful of variables for customizing the default 940px grid system, documented above. All variables for the grid are stored in variables.less.</p>
<h3>{{_i}}Variables in LESS{{/i}}</h3>
<p>{{_i}}Built into Bootstrap are a handful of variables for customizing the default 940px grid system, documented above. All variables for the grid are stored in variables.less.{{/i}}</p>
</div>
<div class="span4">
<h3>How to customize</h3>
<p>Modifying the grid means changing the three <code>@grid*</code> variables and recompiling Bootstrap. Change the grids in the preboot.less file and use one of the <a href="#compiling">four ways documented to recompile</a>.</p>
<h3>{{_i}}How to customize{{/i}}</h3>
<p>{{_i}}Modifying the grid means changing the three <code>@grid*</code> variables and recompiling Bootstrap. Change the grids in the preboot.less file and use one of the <a href="#compiling">four ways documented to recompile</a>.{{/i}}</p>
</div>
<div class="span4">
<h3>Staying responsive</h3>
<p>Customization of the grid only works at the default level, the 940px grid. To maintain the responsive aspects of Bootstrap, you'll also have to customize the grids in responsive.less.</p>
<h3>{{_i}}Staying responsive{{/i}}</h3>
<p>{{_i}}Customization of the grid only works at the default level, the 940px grid. To maintain the responsive aspects of Bootstrap, you'll also have to customize the grids in responsive.less.{{/i}}</p>
</div>
</div><!-- /row -->
@@ -173,13 +173,13 @@
================================================== -->
<section id="layouts">
<div class="page-header">
<h1>Layouts <small>Basic templates to create webpages</small></h1>
<h1>{{_i}}Layouts <small>Basic templates to create webpages</small>{{/i}}</h1>
</div>
<div class="row">
<div class="span6">
<h2>Fixed layout</h2>
<p>The default and simple 940px-wide, centered layout for just about any website or page provided by a single <code>&lt;div class="container"&gt;</code>.</p>
<h2>{{_i}}Fixed layout{{/i}}</h2>
<p>{{_i}}The default and simple 940px-wide, centered layout for just about any website or page provided by a single <code>&lt;div class="container"&gt;</code>.{{/i}}</p>
<div class="mini-layout">
<div class="mini-layout-body"></div>
</div>
@@ -192,8 +192,8 @@
</pre>
</div><!-- /col -->
<div class="span6">
<h2>Fluid layout</h2>
<p><code>&lt;div class="fluid-container"&gt;</code> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.</p>
<h2>{{_i}}Fluid layout{{/i}}</h2>
<p>{{_i}}<code>&lt;div class="fluid-container"&gt;</code> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.{{/i}}</p>
<div class="mini-layout fluid">
<div class="mini-layout-sidebar"></div>
<div class="mini-layout-body"></div>
@@ -221,7 +221,7 @@
================================================== -->
<section id="responsive">
<div class="page-header">
<h1>Responsive design <small>Media queries for various devices and resolutions</small></h1>
<h1>{{_i}}Responsive design <small>Media queries for various devices and resolutions</small>{{/i}}</h1>
</div>
<!-- Supported devices -->
<div class="row">
@@ -229,42 +229,42 @@
<img src="assets/img/responsive-illustrations.png" alt="Responsive devices">
</div>
<div class="span8">
<h2>Supported devices</h2>
<p>Bootstrap supports a handful of media queries to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:</p>
<h2>{{_i}}Supported devices{{/i}}</h2>
<p>{{_i}}Bootstrap supports a handful of media queries to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:{{/i}}</p>
<table class="table table-bordered table-striped">
<thead>
<tr>
<th>Label</th>
<th>Layout width</th>
<th>Column width</th>
<th>Gutter width</th>
<th>{{_i}}Label{{/i}}</th>
<th>{{_i}}Layout width{{/i}}</th>
<th>{{_i}}Column width{{/i}}</th>
<th>{{_i}}Gutter width{{/i}}</th>
</tr>
</thead>
<tbody>
<tr>
<td>Smartphones</td>
<td>{{_i}}Smartphones{{/i}}</td>
<td>480px and below</td>
<td class="muted" colspan="2">Fluid columns, no fixed widths</td>
<td class="muted" colspan="2">{{_i}}Fluid columns, no fixed widths{{/i}}</td>
</tr>
<tr>
<td>Portrait tablets</td>
<td>{{_i}}Portrait tablets{{/i}}</td>
<td>480px to 768px</td>
<td class="muted" colspan="2">Fluid columns, no fixed widths</td>
<td class="muted" colspan="2">{{_i}}Fluid columns, no fixed widths{{/i}}</td>
</tr>
<tr>
<td>Landscape tablets</td>
<td>{{_i}}Landscape tablets{{/i}}</td>
<td>768px to 940px</td>
<td>44px</td>
<td>20px</td>
</tr>
<tr>
<td>Default</td>
<td>{{_i}}Default{{/i}}</td>
<td>940px and up</td>
<td>60px</td>
<td>20px</td>
</tr>
<tr>
<td>Large display</td>
<td>{{_i}}Large display{{/i}}</td>
<td>1210px and up</td>
<td>70px</td>
<td>30px</td>
@@ -272,12 +272,12 @@
</tbody>
</table>
<h3>What they do</h3>
<p>Media queries allow for custom CSS based on a number of conditions&mdash;ratios, widths, display type, etc&mdash;but usually focuses around <code>min-width</code> and <code>max-width</code>.</p>
<h3>{{_i}}What they do{{/i}}</h3>
<p>{{_i}}Media queries allow for custom CSS based on a number of conditions&mdash;ratios, widths, display type, etc&mdash;but usually focuses around <code>min-width</code> and <code>max-width</code>.{{/i}}</p>
<ul>
<li>Modify the width of column in our grid</li>
<li>Stack elements instead of float wherever necessary</li>
<li>Resize headings and text to be more appropriate for devices</li>
<li>{{_i}}Modify the width of column in our grid{{/i}}</li>
<li>{{_i}}Stack elements instead of float wherever necessary{{/i}}</li>
<li>{{_i}}Resize headings and text to be more appropriate for devices{{/i}}</li>
</ul>
</div>
</div>
@@ -285,29 +285,29 @@
<br>
<!-- Media query code -->
<h2>Using the media queries</h2>
<h2>{{_i}}Using the media queries{{/i}}</h2>
<div class="row">
<div class="span5">
<p>Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:</p>
<p>{{_i}}Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:{{/i}}</p>
<ol>
<li>Use the compiled responsive version, bootstrap.reponsive.css</li>
<li>Add @import "responsive.less" and recompile Bootstrap</li>
<li>Compile responsive.less as a separate file and include that</li>
<li>{{_i}}Use the compiled responsive version, bootstrap.reponsive.css{{/i}}</li>
<li>{{_i}}Add @import "responsive.less" and recompile Bootstrap{{/i}}</li>
<li>{{_i}}Compile responsive.less as a separate file and include that{{/i}}</li>
</ol>
<p><strong>Why not just include it?</strong> Truth be told, not everything needs to be responsive. Instead of encouraging developers to remove this feature, we figure it best to enable it.</p>
<p>{{_i}}<strong>Why not just include it?</strong> Truth be told, not everything needs to be responsive. Instead of encouraging developers to remove this feature, we figure it best to enable it.{{/i}}</p>
</div>
<div class="span7">
<pre class="prettyprint linenums">
// Landscape phones and down
// {{_i}}Landscape phones and down{{/i}}
@media (max-width: 480px) { ... }
// Landscape phone to portrait tablet
// {{_i}}Landscape phone to portrait tablet{{/i}}
@media (min-width: 480px) and (max-width: 768px) { ... }
// Portrait tablet to landscape and desktop
// {{_i}}Portrait tablet to landscape and desktop{{/i}}
@media (min-width: 768px) and (max-width: 940px) { ... }
// Large desktop
// {{_i}}Large desktop{{/i}}
@media (min-width: 1210px) { .. }
</pre>
</div>

View File

@@ -1,78 +1,78 @@
<!-- Masthead
================================================== -->
<header class="jumbotron subhead" id="overview">
<h1>Upgrading to Bootstrap 2</h1>
<p class="lead">Learn about significant changes and additions since v1.4 with this handy guide.</p>
<h1>{{_i}}Upgrading to Bootstrap 2{{/i}}</h1>
<p class="lead">{{_i}}Learn about significant changes and additions since v1.4 with this handy guide.{{/i}}</p>
</header>
<h2>Rough outline</h2>
<ul>
<li>Docs completely overhauled
<li>{{_i}}Docs completely overhauled{{/i}}
<ul>
<li>Responsive thanks to new grid system</li>
<li>Now less marketing and more information</li>
<li>Extensive use of tables to share classes and elements of most components</li>
<li>Broken down into several pages for easier consumption</li>
<li>{{_i}}Responsive thanks to new grid system{{/i}}</li>
<li>{{_i}}Now less marketing and more information{{/i}}</li>
<li>{{_i}}Extensive use of tables to share classes and elements of most components{{/i}}</li>
<li>{{_i}}Broken down into several pages for easier consumption{{/i}}</li>
</ul>
</li>
<li>Updated grid system, now only 12 columns
<li>{{_i}}Updated grid system, now only 12 columns{{/i}}
<ul>
<li>Same great classes, but now only 12 columns</li>
<li>Responsive approach means your projects virtually work out of the box on smartphones, tablets, and more</li>
<li>{{_i}}Same great classes, but now only 12 columns{{/i}}</li>
<li>{{_i}}Responsive approach means your projects virtually work out of the box on smartphones, tablets, and more{{/i}}</li>
</ul>
</li>
<li>New thumbnails (previously media grids)
<li>{{_i}}New thumbnails (previously media grids){{/i}}
<ul>
<li><code>.media-grid</code> class has been changed to <code>.thumbnails</code></li>
<li>Individual thumbnails now require <code>.thumbnail</code> class</li>
<li>{{_i}}<code>.media-grid</code> class has been changed to <code>.thumbnails</code>{{/i}}</li>
<li>{{_i}}Individual thumbnails now require <code>.thumbnail</code> class{{/i}}</li>
</ul>
</li>
<li>Updated forms
<li>{{_i}}Updated forms{{/i}}
<ul>
<li>Default form style is now stacked to use less CSS and add flexibility</li>
<li>Exact same markup is required for vertical or horizontal forms&mdash;just swap the classes</li>
<li>New form defaults for search, inline, vertical, and horizontal</li>
<li>{{_i}}Default form style is now stacked to use less CSS and add flexibility{{/i}}</li>
<li>{{_i}}Exact same markup is required for vertical or horizontal forms&mdash;just swap the classes{{/i}}</li>
<li>{{_i}}New form defaults for search, inline, vertical, and horizontal{{/i}}</li>
</ul>
</li>
<li>Updated tables
<ul>
<li>Table classes made more consistent</li>
<li>Removed unused table color options (too much code for such little impact)</li>
<li>{{_i}}Table classes made more consistent{{/i}}</li>
<li>{{_i}}Removed unused table color options (too much code for such little impact){{/i}}</li>
</ul>
</li>
<li>Typography
<ul>
<li>Right-aligned option for blockquotes if float: right;</li>
<li><code>h4</code> elements were dropped from 16px to 14px with a default <code>line-height</code> of 18px</li>
<li><code>h5</code> elements were dropped from 14px to 12px</li>
<li><code>h6</code> elements were dropped from 13px to 11px</li>
<li>{{_i}}Right-aligned option for blockquotes if float: right;{{/i}}</li>
<li>{{_i}}<code>h4</code> elements were dropped from 16px to 14px with a default <code>line-height</code> of 18px{{/i}}</li>
<li>{{_i}}<code>h5</code> elements were dropped from 14px to 12px{{/i}}</li>
<li>{{_i}}<code>h6</code> elements were dropped from 13px to 11px{{/i}}</li>
</ul>
</li>
<li>Buttons
<li>{{_i}}Buttons{{/i}}
<ul>
<li>Added button bar options</li>
<li>{{_i}}Added button bar options{{/i}}</li>
</ul>
</li>
<li>Examples
<li>{{_i}}Examples{{/i}}
<ul>
<li>Fluid examples redone. <code>.fluid-container</code> now requires a <code>.sidebar-left</code> or <code>.sidebar-right</code> as well. Fluid sidebar element has a new class, <code>.fluid-sidebar</code>.</li>
<li>{{_i}}Fluid examples redone. <code>.fluid-container</code> now requires a <code>.sidebar-left</code> or <code>.sidebar-right</code> as well. Fluid sidebar element has a new class, <code>.fluid-sidebar</code>.{{/i}}</li>
</ul>
</li>
<li>Dropdown menus
<li>{{_i}}Dropdown menus{{/i}}
<ul>
<li>Updated the <code>.dropdown-menu</code> to tighten up spacing</li>
<li>Now requires you to add a <code>&lt;span class="caret"&gt;&lt;/span&gt;</code> to show the dropdown arrow</li>
<li>The navbar (fixed topbar) has brand new dropdowns. Gone are the dark versions and in their place are the standard white ones with an additional caret at their tops for clarity of position.</li>
<li>{{_i}}Updated the <code>.dropdown-menu</code> to tighten up spacing{{/i}}</li>
<li>{{_i}}Now requires you to add a <code>&lt;span class="caret"&gt;&lt;/span&gt;</code> to show the dropdown arrow{{/i}}</li>
<li>{{_i}}The navbar (fixed topbar) has brand new dropdowns. Gone are the dark versions and in their place are the standard white ones with an additional caret at their tops for clarity of position.{{/i}}</li>
</ul>
</li>
<li>Navigation
<li>{{_i}}Navigation{{/i}}
<ul>
<li>Tabs and pills now require the use of a new base class, <code>.nav</code>, on their <code>&lt;ul&gt;</code></li>
<li>New nav list component added that uses the same base class, <code>.nav</code></li>
<li>Vertical tabs and pills have been added&mdash;just add <code>.stacked</code> to the <code>&lt;ul&gt;</code></li>
<li>Pills were restyled to be less rounded by default</li>
<li>Pills now have dropdown menu support (they share the same markup and styles as tabs)</li>
<li>{{_i}}Tabs and pills now require the use of a new base class, <code>.nav</code>, on their <code>&lt;ul&gt;</code>{{/i}}</li>
<li>{{_i}}New nav list component added that uses the same base class, <code>.nav</code>{{/i}}</li>
<li>{{_i}}Vertical tabs and pills have been added&mdash;just add <code>.stacked</code> to the <code>&lt;ul&gt;</code><{{/i}}/li>
<li>{{_i}}Pills were restyled to be less rounded by default{{/i}}</li>
<li>{{_i}}Pills now have dropdown menu support (they share the same markup and styles as tabs){{/i}}</li>
</ul>
</li>
</ul>

View File

@@ -1,5 +1,5 @@
/* ============================================================
* bootstrap-buttons.js v2.0.0
* bootstrap-button.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.

View File

@@ -1,6 +1,6 @@
/* ==========================================================
* bootstrap-carousel.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#alerts
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
*

View File

@@ -1,6 +1,6 @@
/* =============================================================
* bootstrap-collapsible.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#collapsible
* bootstrap-collapse.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
*

View File

@@ -1,6 +1,6 @@
/* ============================================================
* bootstrap-dropdown.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#dropdown
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
*

View File

@@ -1,6 +1,6 @@
/* =========================================================
* bootstrap-modal.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#modal
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
*

View File

@@ -1,6 +1,6 @@
/* ===========================================================
* bootstrap-popover.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#popover
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.
*

2
js/bootstrap-tab.js vendored
View File

@@ -1,5 +1,5 @@
/* ========================================================
* bootstrap-tabs.js v2.0.0
* bootstrap-tab.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.

View File

@@ -1,6 +1,6 @@
/* ===========================================================
* bootstrap-tooltip.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#tooltip
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
* Copyright 2012 Twitter, Inc.

View File

@@ -1,6 +1,6 @@
/* ===================================================
* bootstrap-transitions.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html
* bootstrap-transition.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.
*

View File

@@ -1,6 +1,6 @@
/* =============================================================
* bootstrap-typeahead.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#collapsible
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.
*