1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00

Formatting and docs changes

This commit is contained in:
Mark Otto 2014-01-12 00:04:24 -08:00
parent 36aa3afb4f
commit 4b1ff7fa49
5 changed files with 4582 additions and 4666 deletions

View file

@ -290,6 +290,7 @@ body {
/* Page headers */ /* Page headers */
.bs-header { .bs-header {
margin-bottom: 40px;
padding: 30px 15px 40px; /* side padding builds on .container 15px, so 30px */ padding: 30px 15px 40px; /* side padding builds on .container 15px, so 30px */
font-size: 20px; font-size: 20px;
text-align: center; text-align: center;
@ -534,8 +535,6 @@ body {
.bs-sidenav { .bs-sidenav {
margin-top: 20px; margin-top: 20px;
margin-bottom: 20px; margin-bottom: 20px;
padding-top: 5px;
padding-bottom: 5px;
} }
/* All levels of nav */ /* All levels of nav */
@ -630,8 +629,8 @@ body {
margin-bottom: 60px; margin-bottom: 60px;
} }
/* Janky fix for preventing navbar from overlapping */
h1[id] { h1[id] {
margin-top: 0;
padding-top: 20px; padding-top: 20px;
} }

File diff suppressed because one or more lines are too long

View file

@ -9,9 +9,7 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,
<!-- Glyphicons <!-- Glyphicons
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="glyphicons" class="page-header">Glyphicons</h1>
<h1 id="glyphicons">Glyphicons</h1>
</div>
<h2 id="glyphicons-glyphs">Available glyphs</h2> <h2 id="glyphicons-glyphs">Available glyphs</h2>
<p>Includes 200 glyphs in font format from the Glyphicon Halflings set. <a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask that you include a link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever possible.</p> <p>Includes 200 glyphs in font format from the Glyphicon Halflings set. <a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask that you include a link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever possible.</p>
@ -61,16 +59,15 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,
<span class="glyphicon glyphicon-star"></span> Star <span class="glyphicon glyphicon-star"></span> Star
</button> </button>
{% endhighlight %} {% endhighlight %}
</div> </div>
<!-- Dropdowns <!-- Dropdowns
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="dropdowns" class="page-header">Dropdowns</h1>
<h1 id="dropdowns">Dropdowns</h1>
</div>
<p class="lead">Toggleable, contextual menu for displaying lists of links. Made interactive with the <a href="../javascript/#dropdowns">dropdown JavaScript plugin</a>.</p> <p class="lead">Toggleable, contextual menu for displaying lists of links. Made interactive with the <a href="../javascript/#dropdowns">dropdown JavaScript plugin</a>.</p>
<h3 id="dropdowns-example">Example</h3> <h3 id="dropdowns-example">Example</h3>
@ -180,9 +177,8 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,
<!-- Button Groups <!-- Button Groups
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="btn-groups" class="page-header">Button groups</h1>
<h1 id="btn-groups">Button groups</h1>
</div>
<p class="lead">Group a series of buttons together on a single line with the button group. Add on optional JavaScript radio and checkbox style behavior with <a href="../javascript/#buttons">our buttons plugin</a>.</p> <p class="lead">Group a series of buttons together on a single line with the button group. Add on optional JavaScript radio and checkbox style behavior with <a href="../javascript/#buttons">our buttons plugin</a>.</p>
<div class="bs-callout bs-callout-info"> <div class="bs-callout bs-callout-info">
@ -409,7 +405,6 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,
... ...
</div> </div>
{% endhighlight %} {% endhighlight %}
</div> </div>
@ -417,9 +412,8 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,
<!-- Split button dropdowns <!-- Split button dropdowns
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="btn-dropdowns" class="page-header">Button dropdowns</h1>
<h1 id="btn-dropdowns">Button dropdowns</h1>
</div>
<p class="lead">Use any button to trigger a dropdown menu by placing it within a <code>.btn-group</code> and providing the proper menu markup.</p> <p class="lead">Use any button to trigger a dropdown menu by placing it within a <code>.btn-group</code> and providing the proper menu markup.</p>
<div class="bs-callout bs-callout-danger"> <div class="bs-callout bs-callout-danger">
@ -737,18 +731,15 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,
</ul> </ul>
</div> </div>
{% endhighlight %} {% endhighlight %}
</div> </div>
<!-- Input groups <!-- Input groups
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="input-groups" class="page-header">Input groups</h1>
<h1 id="input-groups">Input groups</h1>
</div>
<p class="lead">Extend form controls by adding text or buttons before, after, or on both sides of any text-based input. Use <code>.input-group</code> with an <code>.input-group-addon</code> to prepend or append elements to a single <code>.form-control</code>.</p> <p class="lead">Extend form controls by adding text or buttons before, after, or on both sides of any text-based input. Use <code>.input-group</code> with an <code>.input-group-addon</code> to prepend or append elements to a single <code>.form-control</code>.</p>
<div class="bs-callout bs-callout-danger"> <div class="bs-callout bs-callout-danger">
@ -1057,7 +1048,6 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,
</div> </div>
</div> </div>
{% endhighlight %} {% endhighlight %}
</div> </div>
@ -1065,9 +1055,7 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,
<!-- Navs <!-- Navs
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="nav" class="page-header">Navs</h1>
<h1 id="nav">Navs</h1>
</div>
<p class="lead">Navs available in Bootstrap have shared markup, starting with the base <code>.nav</code> class, as well as shared states. Swap modifier classes to switch between each style.</p> <p class="lead">Navs available in Bootstrap have shared markup, starting with the base <code>.nav</code> class, as well as shared states. Swap modifier classes to switch between each style.</p>
@ -1246,7 +1234,6 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,
... ...
</ul> </ul>
{% endhighlight %} {% endhighlight %}
</div> </div>
@ -1254,9 +1241,7 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="navbar" class="page-header">Navbar</h1>
<h1 id="navbar">Navbar</h1>
</div>
<h2 id="navbar-default">Default navbar</h2> <h2 id="navbar-default">Default navbar</h2>
<p>Navbars are responsive meta components that serve as navigation headers for your application or site. They begin collapsed (and are toggleable) in mobile views and become horizontal as the available viewport width increases.</p> <p>Navbars are responsive meta components that serve as navigation headers for your application or site. They begin collapsed (and are toggleable) in mobile views and become horizontal as the available viewport width increases.</p>
@ -1679,7 +1664,6 @@ body { padding-bottom: 70px; }
... ...
</nav> </nav>
{% endhighlight %} {% endhighlight %}
</div> </div>
@ -1687,9 +1671,8 @@ body { padding-bottom: 70px; }
<!-- Breadcrumbs <!-- Breadcrumbs
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="breadcrumbs" class="page-header">Breadcrumbs</h1>
<h1 id="breadcrumbs">Breadcrumbs <small></small></h1>
</div>
<p class="lead">Indicate the current page's location within a navigational hierarchy.</p> <p class="lead">Indicate the current page's location within a navigational hierarchy.</p>
<p>Separators are automatically added in CSS through <code>:before</code> and <code>content</code>.</p> <p>Separators are automatically added in CSS through <code>:before</code> and <code>content</code>.</p>
<div class="bs-example"> <div class="bs-example">
@ -1720,9 +1703,8 @@ body { padding-bottom: 70px; }
<!-- Pagination <!-- Pagination
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="pagination" class="page-header">Pagination</h1>
<h1 id="pagination">Pagination</h1>
</div>
<p class="lead">Provide pagination links for your site or app with the multi-page pagination component, or the simpler <a href="#pagination-pager">pager alternative</a>.</p> <p class="lead">Provide pagination links for your site or app with the multi-page pagination component, or the simpler <a href="#pagination-pager">pager alternative</a>.</p>
<h2 id="pagination-default">Default pagination</h2> <h2 id="pagination-default">Default pagination</h2>
@ -1879,10 +1861,7 @@ body { padding-bottom: 70px; }
<!-- Labels <!-- Labels
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="labels" class="page-header">Labels</h1>
<h1 id="labels">Labels</h1>
</div>
<p class="lead"></p>
<h3>Example</h3> <h3>Example</h3>
<div class="bs-example"> <div class="bs-example">
@ -1915,7 +1894,6 @@ body { padding-bottom: 70px; }
<span class="label label-warning">Warning</span> <span class="label label-warning">Warning</span>
<span class="label label-danger">Danger</span> <span class="label label-danger">Danger</span>
{% endhighlight %} {% endhighlight %}
</div> </div>
@ -1923,9 +1901,8 @@ body { padding-bottom: 70px; }
<!-- Badges <!-- Badges
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="badges" class="page-header">Badges</h1>
<h1 id="badges">Badges</h1>
</div>
<p class="lead">Easily highlight new or unread items by adding a <code>&lt;span class="badge"&gt;</code> to links, Bootstrap navs, and more.</p> <p class="lead">Easily highlight new or unread items by adding a <code>&lt;span class="badge"&gt;</code> to links, Bootstrap navs, and more.</p>
<div class="bs-example"> <div class="bs-example">
@ -1990,9 +1967,8 @@ body { padding-bottom: 70px; }
<!-- Jumbotron <!-- Jumbotron
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="jumbotron" class="page-header">Jumbotron</h1>
<h1 id="jumbotron">Jumbotron</h1>
</div>
<p>A lightweight, flexible component that can optionally extend the entire viewport to showcase key content on your site.</p> <p>A lightweight, flexible component that can optionally extend the entire viewport to showcase key content on your site.</p>
<div class="bs-example"> <div class="bs-example">
<div class="jumbotron"> <div class="jumbotron">
@ -2016,7 +1992,6 @@ body { padding-bottom: 70px; }
</div> </div>
</div> </div>
{% endhighlight %} {% endhighlight %}
</div> </div>
@ -2024,9 +1999,8 @@ body { padding-bottom: 70px; }
<!-- Page header <!-- Page header
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="page-header" class="page-header">Page header</h1>
<h1 id="page-header">Page header</h1>
</div>
<p>A simple shell for an <code>h1</code> to appropriately space out and segment sections of content on a page. It can utilize the <code>h1</code>'s default <code>small</code> element, as well as most other components (with additional styles).</p> <p>A simple shell for an <code>h1</code> to appropriately space out and segment sections of content on a page. It can utilize the <code>h1</code>'s default <code>small</code> element, as well as most other components (with additional styles).</p>
<div class="bs-example"> <div class="bs-example">
<div class="page-header"> <div class="page-header">
@ -2045,9 +2019,8 @@ body { padding-bottom: 70px; }
<!-- Thumbnails <!-- Thumbnails
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="thumbnails" class="page-header">Thumbnails</h1>
<h1 id="thumbnails">Thumbnails</h1>
</div>
<p class="lead">Extend Bootstrap's <a href="../css/#grid">grid system</a> with the thumbnail component to easily display grids of images, videos, text, and more.</p> <p class="lead">Extend Bootstrap's <a href="../css/#grid">grid system</a> with the thumbnail component to easily display grids of images, videos, text, and more.</p>
<h3 id="thumbnails-default">Default example</h3> <h3 id="thumbnails-default">Default example</h3>
@ -2141,13 +2114,11 @@ body { padding-bottom: 70px; }
<!-- Alerts <!-- Alerts
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="alerts" class="page-header">Alerts</h1>
<h1 id="alerts">Alerts</h1>
</div>
<p class="lead">Provide contextual feedback messages for typical user actions with the handful of available and flexible alert messages. For inline dismissal, use the <a href="../javascript/#alerts">alerts jQuery plugin</a>.</p> <p class="lead">Provide contextual feedback messages for typical user actions with the handful of available and flexible alert messages. For inline dismissal, use the <a href="../javascript/#alerts">alerts jQuery plugin</a>.</p>
<h2 id="alerts-examples">Examples</h2> <h2 id="alerts-examples">Examples</h2>
@ -2233,13 +2204,11 @@ body { padding-bottom: 70px; }
<!-- Progress bars <!-- Progress bars
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="progress" class="page-header">Progress bars</h1>
<h1 id="progress">Progress bars</h1>
</div>
<p class="lead">Provide up-to-date feedback on the progress of a workflow or action with simple yet flexible progress bars.</p> <p class="lead">Provide up-to-date feedback on the progress of a workflow or action with simple yet flexible progress bars.</p>
<div class="bs-callout bs-callout-danger"> <div class="bs-callout bs-callout-danger">
@ -2405,13 +2374,11 @@ body { padding-bottom: 70px; }
<!-- Media object <!-- Media object
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="media" class="page-header">Media object</h1>
<h1 id="media">Media object</h1>
</div>
<p class="lead">Abstract object styles for building various types of components (like blog comments, Tweets, etc) that feature a left- or right-aligned image alongside textual content.</p> <p class="lead">Abstract object styles for building various types of components (like blog comments, Tweets, etc) that feature a left- or right-aligned image alongside textual content.</p>
<h3 id="media-default">Default media</h3> <h3 id="media-default">Default media</h3>
@ -2531,9 +2498,8 @@ body { padding-bottom: 70px; }
<!-- List group <!-- List group
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="list-group" class="page-header">List group</h1>
<h1 id="list-group">List group</h1>
</div>
<p class="lead">List groups are a flexible and powerful component for displaying not only simple lists of elements, but complex ones with custom content.</p> <p class="lead">List groups are a flexible and powerful component for displaying not only simple lists of elements, but complex ones with custom content.</p>
<h3 id="list-group-basic">Basic example</h3> <h3 id="list-group-basic">Basic example</h3>
@ -2676,13 +2642,11 @@ body { padding-bottom: 70px; }
<!-- Panels <!-- Panels
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="panels" class="page-header">Panels</h1>
<h1 id="panels">Panels</h1>
</div>
<p class="lead">While not always necessary, sometimes you need to put your DOM in a box. For those situations, try the panel component.</p> <p class="lead">While not always necessary, sometimes you need to put your DOM in a box. For those situations, try the panel component.</p>
<h3 id="panels-basic">Basic example</h3> <h3 id="panels-basic">Basic example</h3>
@ -2919,7 +2883,6 @@ body { padding-bottom: 70px; }
{% endhighlight %} {% endhighlight %}
<h3 id="panels-list-group">With list groups</h3> <h3 id="panels-list-group">With list groups</h3>
<p>Easily include full-width <a href="#list-group">list groups</a> within any panel.</p> <p>Easily include full-width <a href="#list-group">list groups</a> within any panel.</p>
<div class="bs-example"> <div class="bs-example">
@ -2958,19 +2921,14 @@ body { padding-bottom: 70px; }
</ul> </ul>
</div> </div>
{% endhighlight %} {% endhighlight %}
</div> </div>
<!-- Wells <!-- Wells
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="wells" class="page-header">Wells</h1>
<h1 id="wells">Wells</h1>
</div>
<h3>Default well</h3> <h3>Default well</h3>
<p>Use the well as a simple effect on an element to give it an inset effect.</p> <p>Use the well as a simple effect on an element to give it an inset effect.</p>

View file

@ -9,9 +9,8 @@ lead: "Global CSS settings, fundamental HTML elements styled and enhanced with e
<!-- Global Bootstrap settings <!-- Global Bootstrap settings
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="overview" class="page-header">Overview</h1>
<h1 id="overview">Overview</h1>
</div>
<p class="lead">Get the lowdown on the key pieces of Bootstrap's infrastructure, including our approach to better, faster, stronger web development.</p> <p class="lead">Get the lowdown on the key pieces of Bootstrap's infrastructure, including our approach to better, faster, stronger web development.</p>
<h3 id="overview-doctype">HTML5 doctype</h3> <h3 id="overview-doctype">HTML5 doctype</h3>
@ -67,9 +66,8 @@ lead: "Global CSS settings, fundamental HTML elements styled and enhanced with e
<!-- Grid system <!-- Grid system
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="grid" class="page-header">Grid system</h1>
<h1 id="grid">Grid system</h1>
</div>
<p class="lead">Bootstrap includes a responsive, mobile first fluid grid system that appropriately scales up to 12 columns as the device or viewport size increases. It includes <a href="#grid-example-basic">predefined classes</a> for easy layout options, as well as powerful <a href="#grid-less">mixins for generating more semantic layouts</a>.</p> <p class="lead">Bootstrap includes a responsive, mobile first fluid grid system that appropriately scales up to 12 columns as the device or viewport size increases. It includes <a href="#grid-example-basic">predefined classes</a> for easy layout options, as well as powerful <a href="#grid-less">mixins for generating more semantic layouts</a>.</p>
<h3 id="grid-intro">Introduction</h3> <h3 id="grid-intro">Introduction</h3>
@ -613,18 +611,14 @@ lead: "Global CSS settings, fundamental HTML elements styled and enhanced with e
<div class="content-secondary">...</div> <div class="content-secondary">...</div>
</div> </div>
{% endhighlight %} {% endhighlight %}
</div> </div>
<!-- Typography <!-- Typography
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="type" class="page-header">Typography</h1>
<h1 id="type">Typography</h1>
</div>
<!-- Headings --> <!-- Headings -->
<h2 id="type-headings">Headings</h2> <h2 id="type-headings">Headings</h2>
@ -1028,12 +1022,11 @@ lead: "Global CSS settings, fundamental HTML elements styled and enhanced with e
</div> </div>
<!-- Code <!-- Code
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="code" class="page-header">Code</h1>
<h1 id="code">Code</h1>
</div>
<h2 id="code-inline">Inline</h2> <h2 id="code-inline">Inline</h2>
<p>Wrap inline snippets of code with <code>&lt;code&gt;</code>.</p> <p>Wrap inline snippets of code with <code>&lt;code&gt;</code>.</p>
@ -1070,9 +1063,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<!-- Tables <!-- Tables
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="tables" class="page-header">Tables</h1>
<h1 id="tables">Tables</h1>
</div>
<h2 id="tables-example">Basic example</h2> <h2 id="tables-example">Basic example</h2>
<p>For basic styling&mdash;light padding and only horizontal dividers&mdash;add the base class <code>.table</code> to any <code>&lt;table&gt;</code>. It may seem super redundant, but given the widespread use of tables for other plugins like calendars and date pickers, we've opted to isolate our custom table styles.</p> <p>For basic styling&mdash;light padding and only horizontal dividers&mdash;add the base class <code>.table</code> to any <code>&lt;table&gt;</code>. It may seem super redundant, but given the widespread use of tables for other plugins like calendars and date pickers, we've opted to isolate our custom table styles.</p>
@ -1520,7 +1511,6 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
</table> </table>
</div> </div>
{% endhighlight %} {% endhighlight %}
</div> </div>
@ -1528,9 +1518,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<!-- Forms <!-- Forms
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="forms" class="page-header">Forms</h1>
<h1 id="forms">Forms</h1>
</div>
<h2 id="forms-example">Basic example</h2> <h2 id="forms-example">Basic example</h2>
<p>Individual form controls automatically receive some global styling. All textual <code>&lt;input&gt;</code>, <code>&lt;textarea&gt;</code>, and <code>&lt;select&gt;</code> elements with <code>.form-control</code> are set to <code>width: 100%;</code> by default. Wrap labels and controls in <code>.form-group</code> for optimum spacing.</p> <p>Individual form controls automatically receive some global styling. All textual <code>&lt;input&gt;</code>, <code>&lt;textarea&gt;</code>, and <code>&lt;select&gt;</code> elements with <code>.form-control</code> are set to <code>width: 100%;</code> by default. Wrap labels and controls in <code>.form-group</code> for optimum spacing.</p>
@ -1877,7 +1865,6 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
</form> </form>
{% endhighlight %} {% endhighlight %}
<h2 id="forms-control-focus">Input focus</h2> <h2 id="forms-control-focus">Input focus</h2>
<p>We remove the default <code>outline</code> styles on some form controls and apply a <code>box-shadow</code> in its place for <code>:focus</code>.</p> <p>We remove the default <code>outline</code> styles on some form controls and apply a <code>box-shadow</code> in its place for <code>:focus</code>.</p>
<div class="bs-example"> <div class="bs-example">
@ -2078,7 +2065,6 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
{% endhighlight %} {% endhighlight %}
<h2 id="forms-control-sizes">Control sizing</h2> <h2 id="forms-control-sizes">Control sizing</h2>
<p>Set heights using classes like <code>.input-lg</code>, and set widths using grid column classes like <code>.col-lg-*</code>.</p> <p>Set heights using classes like <code>.input-lg</code>, and set widths using grid column classes like <code>.col-lg-*</code>.</p>
@ -2155,7 +2141,6 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
{% highlight html %} {% highlight html %}
<span class="help-block">A block of help text that breaks onto a new line and may extend beyond one line.</span> <span class="help-block">A block of help text that breaks onto a new line and may extend beyond one line.</span>
{% endhighlight %} {% endhighlight %}
</div> </div>
@ -2163,9 +2148,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<!-- Buttons <!-- Buttons
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="buttons" class="page-header">Buttons</h1>
<h1 id="buttons">Buttons</h1>
</div>
<h2 id="buttons-options">Options</h2> <h2 id="buttons-options">Options</h2>
<p>Use any of the available button classes to quickly create a styled button.</p> <p>Use any of the available button classes to quickly create a styled button.</p>
@ -2341,7 +2324,6 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<p>As a best practice, <strong>we highly recommend using the <code>&lt;button&gt;</code> element whenever possible</strong> to ensure matching cross-browser rendering.</p> <p>As a best practice, <strong>we highly recommend using the <code>&lt;button&gt;</code> element whenever possible</strong> to ensure matching cross-browser rendering.</p>
<p>Among other things, there's <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=697451">a Firefox bug</a> that prevents us from setting the <code>line-height</code> of <code>&lt;input&gt;</code>-based buttons, causing them to not exactly match the height of other buttons on Firefox.</p> <p>Among other things, there's <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=697451">a Firefox bug</a> that prevents us from setting the <code>line-height</code> of <code>&lt;input&gt;</code>-based buttons, causing them to not exactly match the height of other buttons on Firefox.</p>
</div> </div>
</div> </div>
@ -2349,9 +2331,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<!-- Images <!-- Images
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="images" class="page-header">Images</h1>
<h1 id="images">Images</h1>
</div>
<p>Add classes to an <code>&lt;img&gt;</code> element to easily style images in any project.</p> <p>Add classes to an <code>&lt;img&gt;</code> element to easily style images in any project.</p>
<div class="bs-callout bs-callout-danger"> <div class="bs-callout bs-callout-danger">
@ -2373,16 +2353,14 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<h4>Responsive images</h4> <h4>Responsive images</h4>
<p>Looking for how to make images more responsive? <a href="#overview-responsive-images">Check out the responsive images section</a> up top.</p> <p>Looking for how to make images more responsive? <a href="#overview-responsive-images">Check out the responsive images section</a> up top.</p>
</div> </div>
</div> </div>
<!-- Helpers <!-- Helpers
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="helper-classes" class="page-header">Helper classes</h1>
<h1 id="helper-classes">Helper classes</h1>
</div>
<h3 id="helper-classes-colors">Contextual colors</h3> <h3 id="helper-classes-colors">Contextual colors</h3>
<p>Convey meaning through color with a handful of emphasis utility classes. These may also be applied to links and will darken on hover just like our default link styles.</p> <p>Convey meaning through color with a handful of emphasis utility classes. These may also be applied to links and will darken on hover just like our default link styles.</p>
@ -2495,7 +2473,6 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
{% endhighlight %} {% endhighlight %}
<h3 id="helper-classes-clearfix">Clearfix</h3> <h3 id="helper-classes-clearfix">Clearfix</h3>
<p>Clear the <code>float</code> on any element with the <code>.clearfix</code> class. Utilizes <a href="http://nicolasgallagher.com/micro-clearfix-hack/">the micro clearfix</a> as popularized by Nicolas Gallagher. Can also be used as a mixin.</p> <p>Clear the <code>float</code> on any element with the <code>.clearfix</code> class. Utilizes <a href="http://nicolasgallagher.com/micro-clearfix-hack/">the micro clearfix</a> as popularized by Nicolas Gallagher. Can also be used as a mixin.</p>
{% highlight html %} {% highlight html %}
@ -2583,10 +2560,9 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<!-- Responsive utilities <!-- Responsive utilities
================================================== --> ================================================== -->
<div class="bs-docs-section" id="responsive-utilities"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="responsive-utilities" class="page-header">Responsive utilities</h1>
<h1>Responsive utilities</h1>
</div>
<p class="lead">For faster mobile-friendly development, use these utility classes for showing and hiding content by device via media query. Also included are utility classes for toggling content when printed.</p> <p class="lead">For faster mobile-friendly development, use these utility classes for showing and hiding content by device via media query. Also included are utility classes for toggling content when printed.</p>
<p>Try to use these on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation. <strong>Responsive utilities are currently only available for block and table toggling.</strong> Use with inline and table elements is currently not supported.</p> <p>Try to use these on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation. <strong>Responsive utilities are currently only available for block and table toggling.</strong> Use with inline and table elements is currently not supported.</p>
@ -2809,17 +2785,15 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<span class="visible-sm visible-md">&#10004; Hidden on small and medium</span> <span class="visible-sm visible-md">&#10004; Hidden on small and medium</span>
</div> </div>
</div> </div>
</div> </div>
<!-- Using Less <!-- Using Less
================================================== --> ================================================== -->
<div class="bs-docs-section" id="less"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="less" class="page-header">Using Less</h1>
<h1>Using Less</h1>
</div>
<p class="lead">Bootstrap's CSS is built on Less, a preprocessor with additional functionality like variables, mixins, and functions for compiling CSS. Those looking to use the source Less files instead of our compiled CSS files can make use of the numerous variables and mixins we use throughout the framework.</p> <p class="lead">Bootstrap's CSS is built on Less, a preprocessor with additional functionality like variables, mixins, and functions for compiling CSS. Those looking to use the source Less files instead of our compiled CSS files can make use of the numerous variables and mixins we use throughout the framework.</p>
<p>Grid variables and mixins are covered <a href="#grid-less">within the Grid system section</a>.</p> <p>Grid variables and mixins are covered <a href="#grid-less">within the Grid system section</a>.</p>
@ -3313,10 +3287,8 @@ a {
<!-- Using Sass <!-- Using Sass
================================================== --> ================================================== -->
<div class="bs-docs-section" id="sass"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="sass" class="page-header">Using Sass</h1>
<h1>Using Sass</h1>
</div>
<p class="lead">While Bootstrap is built on Less, it also has an <a href="{{ site.sass_repo }}">official Sass port</a>. We maintain it in a separate GitHub repository and handle updates with a conversion script.</p> <p class="lead">While Bootstrap is built on Less, it also has an <a href="{{ site.sass_repo }}">official Sass port</a>. We maintain it in a separate GitHub repository and handle updates with a conversion script.</p>
<h2 id="sass-contents">What's included</h2> <h2 id="sass-contents">What's included</h2>
@ -3511,6 +3483,4 @@ app/assets/stylesheets/bootstrap-custom.scss
//= require bootstrap/modal //= require bootstrap/modal
//= require bootstrap/dropdown //= require bootstrap/dropdown
{% endhighlight %} {% endhighlight %}
</div> </div>

View file

@ -9,9 +9,8 @@ lead: "An overview of Bootstrap, how to download and use, basic templates and ex
<!-- Getting started <!-- Getting started
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="download" class="page-header">Download</h1>
<h1 id="download">Download</h1>
</div>
<p class="lead">Bootstrap has a few easy ways to quickly get started, each one appealing to a different skill level and use case. Read through to see what suits your particular needs.</p> <p class="lead">Bootstrap has a few easy ways to quickly get started, each one appealing to a different skill level and use case. Read through to see what suits your particular needs.</p>
<div class="row bs-downloads"> <div class="row bs-downloads">
@ -51,12 +50,12 @@ lead: "An overview of Bootstrap, how to download and use, basic templates and ex
</div> </div>
<!-- File structure <!-- File structure
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="whats-included" class="page-header">What's included</h1>
<h1 id="whats-included">What's included</h1>
</div>
<p class="lead">Bootstrap is downloadable in two forms, within which you'll find the following directories and files, logically grouping common resources and providing both compiled and minified variations.</p> <p class="lead">Bootstrap is downloadable in two forms, within which you'll find the following directories and files, logically grouping common resources and providing both compiled and minified variations.</p>
<div class="bs-callout bs-callout-warning" id="jquery-required"> <div class="bs-callout bs-callout-warning" id="jquery-required">
@ -105,12 +104,12 @@ bootstrap/
</div> </div>
<!-- Template <!-- Template
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="template" class="page-header">Basic template</h1>
<h1 id="template">Basic template</h1>
</div>
<p class="lead">Start with this basic HTML template, or modify <a href="#examples">these examples</a>. We hope you'll customize our templates and examples, adapting them to suit your needs.</p> <p class="lead">Start with this basic HTML template, or modify <a href="#examples">these examples</a>. We hope you'll customize our templates and examples, adapting them to suit your needs.</p>
<p>Copy the HTML below to begin working with a minimal Bootstrap document.</p> <p>Copy the HTML below to begin working with a minimal Bootstrap document.</p>
@ -143,12 +142,12 @@ bootstrap/
</div> </div>
<!-- Template <!-- Template
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="examples" class="page-header">Examples</h1>
<h1 id="examples">Examples</h1>
</div>
<p class="lead">Build on the basic template above with Bootstrap's many components. See also <a href="#customizing">Customizing Bootstrap</a> for tips on maintaining your own Bootstrap variants.</p> <p class="lead">Build on the basic template above with Bootstrap's many components. See also <a href="#customizing">Customizing Bootstrap</a> for tips on maintaining your own Bootstrap variants.</p>
<h3 id="examples-framework">Using the framework</h3> <h3 id="examples-framework">Using the framework</h3>
@ -304,16 +303,15 @@ bootstrap/
<p>Build a toggleable off-canvas navigation menu for use with Bootstrap.</p> <p>Build a toggleable off-canvas navigation menu for use with Bootstrap.</p>
</div> </div>
</div> </div>
</div> </div>
<!-- Template <!-- Template
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="disable-responsive" class="page-header">Disabling responsiveness</h1>
<h1 id="disable-responsive">Disabling responsiveness</h1>
</div>
<p class="lead">Bootstrap automatically adapts your pages for various screen sizes. <p class="lead">Bootstrap automatically adapts your pages for various screen sizes.
Here's how to disable this feature so your page works like in <a href="../examples/non-responsive/">this non-responsive example</a>.</p> Here's how to disable this feature so your page works like in <a href="../examples/non-responsive/">this non-responsive example</a>.</p>
@ -335,12 +333,11 @@ bootstrap/
</div> </div>
<!-- Migration <!-- Migration
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="migration" class="page-header">Migrating from 2.x to 3.0</h1>
<h1 id="migration">Migrating from 2.x to 3.0</h1>
</div>
<p class="lead">Bootstrap 3 is not backwards compatible with v2.x. Use this section as a general guide to upgrading from v2.x to v3.0. For a broader overview, see <a href="http://blog.getbootstrap.com/2013/08/19/bootstrap-3-released/">what's new</a> in the v3.0 release announcement.</p> <p class="lead">Bootstrap 3 is not backwards compatible with v2.x. Use this section as a general guide to upgrading from v2.x to v3.0. For a broader overview, see <a href="http://blog.getbootstrap.com/2013/08/19/bootstrap-3-released/">what's new</a> in the v3.0 release announcement.</p>
<h2 id="migration-classes">Major class changes</h2> <h2 id="migration-classes">Major class changes</h2>
@ -752,12 +749,11 @@ bootstrap/
</div> </div>
<!-- Browser support <!-- Browser support
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="support" class="page-header">Browser and device support</h1>
<h1 id="support">Browser and device support</h1>
</div>
<p class="lead">Bootstrap is built to work best in the latest desktop and mobile browsers, meaning older browsers might display differently styled, though fully functional, renderings of certain components.</p> <p class="lead">Bootstrap is built to work best in the latest desktop and mobile browsers, meaning older browsers might display differently styled, though fully functional, renderings of certain components.</p>
<h3 id="support-browsers">Supported browsers</h3> <h3 id="support-browsers">Supported browsers</h3>
@ -896,16 +892,14 @@ if (isAndroid) {
</script> </script>
{% endhighlight %} {% endhighlight %}
<p>Want to see an example? <a href="http://jsbin.com/OyaqoDO/2">Check out this JS Bin demo.</a></p> <p>Want to see an example? <a href="http://jsbin.com/OyaqoDO/2">Check out this JS Bin demo.</a></p>
</div> </div>
<!-- Third party support <!-- Third party support
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="third-parties" class="page-header">Third party support</h1>
<h1 id="third-parties">Third party support</h1>
</div>
<p class="lead">While we don't officially support any third party plugins or add-ons, we do offer some useful advice to help avoid potential issues in your projects.</p> <p class="lead">While we don't officially support any third party plugins or add-ons, we do offer some useful advice to help avoid potential issues in your projects.</p>
<h3>Box-sizing</h3> <h3>Box-sizing</h3>
@ -957,12 +951,11 @@ if (isAndroid) {
</div> </div>
<!-- Accessibility <!-- Accessibility
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="accessibility" class="page-header">Accessibility</h1>
<h1 id="accessibility">Accessibility</h1>
</div>
<p class="lead">Bootstrap follows common web standards, and with minimal extra effort, can be used to create sites that are accessible to those using <abbr title="Assistive Technology" class="initialism">AT</abbr>.</p> <p class="lead">Bootstrap follows common web standards, and with minimal extra effort, can be used to create sites that are accessible to those using <abbr title="Assistive Technology" class="initialism">AT</abbr>.</p>
<h3>Skip navigation</h3> <h3>Skip navigation</h3>
@ -989,12 +982,11 @@ if (isAndroid) {
</div> </div>
<!-- License FAQs <!-- License FAQs
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="license-faqs" class="page-header">License FAQs</h1>
<h1 id="license-faqs">License FAQs</h1>
</div>
<p class="lead">Bootstrap is released under the MIT license and is copyright {{ site.time | date: "%Y" }} Twitter. Boiled down to smaller chunks, it can be described with the following conditions.</p> <p class="lead">Bootstrap is released under the MIT license and is copyright {{ site.time | date: "%Y" }} Twitter. Boiled down to smaller chunks, it can be described with the following conditions.</p>
<h4>It requires you to:</h4> <h4>It requires you to:</h4>
@ -1030,9 +1022,7 @@ if (isAndroid) {
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <h1 id="customizing" class="page-header">Customizing Bootstrap</h1>
<h1 id="customizing">Customizing Bootstrap</h1>
</div>
<p class="lead">Bootstrap is best maintained when you treat it as a separate and independently-versioned dependency in your development environment. Doing this makes upgrading Bootstrap easier in the future.</p> <p class="lead">Bootstrap is best maintained when you treat it as a separate and independently-versioned dependency in your development environment. Doing this makes upgrading Bootstrap easier in the future.</p>
<p>Once you've downloaded and included Bootstrap's styles and scripts, you can customize its components. Just create a new stylesheet (LESS, if you like, or just plain CSS) to house your customizations.</p> <p>Once you've downloaded and included Bootstrap's styles and scripts, you can customize its components. Just create a new stylesheet (LESS, if you like, or just plain CSS) to house your customizations.</p>
@ -1103,5 +1093,4 @@ if (isAndroid) {
<h3>Removing potential bloat</h3> <h3>Removing potential bloat</h3>
<p>Not all sites and applications need to make use of everything Bootstrap has to offer, especially in production environments where optimizing bandwidth is an issue. We encourage you to remove whatever is unused with our <a href="../customize/">Customizer</a>.</p> <p>Not all sites and applications need to make use of everything Bootstrap has to offer, especially in production environments where optimizing bandwidth is an issue. We encourage you to remove whatever is unused with our <a href="../customize/">Customizer</a>.</p>
<p>Using the Customizer, simply uncheck any component, feature, or asset you don't need. Hit download and swap out the default Bootstrap files with these newly customized ones. You'll get vanilla Bootstrap, but without the features *you* deem unnecessary. All custom builds include compiled and minified versions, so use whichever works for you.</p> <p>Using the Customizer, simply uncheck any component, feature, or asset you don't need. Hit download and swap out the default Bootstrap files with these newly customized ones. You'll get vanilla Bootstrap, but without the features *you* deem unnecessary. All custom builds include compiled and minified versions, so use whichever works for you.</p>
</div> </div>