Skip to content

B
bootstrap
Commit 58f7fd30 authored by Mark Otto's avatar Mark Otto
Browse files
Options

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

Conflicts:
	docs/templates/pages/index.mustache
parents fecd4ddd a800d6ce
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 583 additions and 583 deletions
docs/base-css.html
View file @ 58f7fd30
......@@ -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>
......
docs/index.html
View file @ 58f7fd30
......@@ -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;
......
docs/templates/pages/base-css.mustache
View file @ 58f7fd30
This diff is collapsed.
docs/templates/pages/index.mustache
View file @ 58f7fd30
This diff is collapsed.
docs/templates/pages/less.mustache
View file @ 58f7fd30
This diff is collapsed.
docs/templates/pages/scaffolding.mustache
View file @ 58f7fd30
This diff is collapsed.
docs/templates/pages/upgrading.mustache
View file @ 58f7fd30
<!-- 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>
......
js/bootstrap-button.js
View file @ 58f7fd30
/* ============================================================
* bootstrap-buttons.js v2.0.0
* bootstrap-button.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
......
js/bootstrap-carousel.js
View file @ 58f7fd30
/* ==========================================================
* 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.
*
......
js/bootstrap-collapse.js
View file @ 58f7fd30
/* =============================================================
* 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.
*
......
js/bootstrap-dropdown.js
View file @ 58f7fd30
/* ============================================================
* 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.
*
......
js/bootstrap-modal.js
View file @ 58f7fd30
/* =========================================================
* 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.
*
......
js/bootstrap-popover.js
View file @ 58f7fd30
/* ===========================================================
* 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.
*
......
js/bootstrap-tab.js
View file @ 58f7fd30
/* ========================================================
* bootstrap-tabs.js v2.0.0
* bootstrap-tab.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.
......
js/bootstrap-tooltip.js
View file @ 58f7fd30
/* ===========================================================
* 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.
......
js/bootstrap-transition.js
View file @ 58f7fd30
/* ===================================================
* 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.
*
......
js/bootstrap-typeahead.js
View file @ 58f7fd30
/* =============================================================
* 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.
*
......
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