From 76cfe1700248cd3c7086333b67050f418a897a03 Mon Sep 17 00:00:00 2001 From: Aleksey V Zapparov Date: Mon, 23 Jul 2012 20:55:27 +0200 Subject: [PATCH 1/9] Fix transition end name for opera 11+12 Fix transition end name for Opera 11 and Opera 12. Should fix issues: #3896, #3897, #4157, #4158 --- js/bootstrap-transition.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index 2f15dd0093..0c37ebb187 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -36,7 +36,7 @@ , transEndEventNames = { 'WebkitTransition' : 'webkitTransitionEnd' , 'MozTransition' : 'transitionend' - , 'OTransition' : 'otransitionend' + , 'OTransition' : 'oTransitionEnd otransitionend' , 'msTransition' : 'MSTransitionEnd' , 'transition' : 'transitionend' } From b05fc00d591d0d24f72cde6fc656fd021a52c82c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 23 Jul 2012 12:51:36 -0700 Subject: [PATCH 2/9] fixes #4148, readme typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 827019e9df..f3b2bf5632 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Versioning For transparency and insight into our release cycle, and for striving to maintain backward compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible. -Releases will be numbered with the follow format: +Releases will be numbered with the following format: `..` From 5b8838aeace0bf725438be84a7396d988749d62c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 23 Jul 2012 12:51:48 -0700 Subject: [PATCH 3/9] more alignment fixes for customize page --- docs/assets/css/docs.css | 2 ++ docs/customize.html | 8 +++----- docs/templates/pages/customize.mustache | 8 +++----- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index e4dd2e966d..8e32d186be 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -407,6 +407,8 @@ hr.soften { /* Custom, larger checkbox labels */ .download .checkbox { padding: 6px 10px 6px 25px; + font-size: 13px; + line-height: 18px; color: #555; background-color: #f9f9f9; -webkit-border-radius: 3px; diff --git a/docs/customize.html b/docs/customize.html index 251da8691f..160b02c4b6 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -134,8 +134,6 @@ - -

JS Components

@@ -168,7 +166,7 @@
-
+
-
+
-
+

Heads up!

All checked plugins will be compiled into a single file, bootstrap.js. All plugins require the latest version of jQuery to be included.

diff --git a/docs/templates/pages/customize.mustache b/docs/templates/pages/customize.mustache index 8d14be78c0..1e56eb3ba0 100644 --- a/docs/templates/pages/customize.mustache +++ b/docs/templates/pages/customize.mustache @@ -63,8 +63,6 @@ -
-

{{_i}}JS Components{{/i}}

@@ -97,7 +95,7 @@
-
+
-
+
-
+

{{_i}}Heads up!{{/i}}

{{_i}}All checked plugins will be compiled into a single file, bootstrap.js. All plugins require the latest version of jQuery to be included.{{/i}}

From 5247b15411a29f98832e38957f57a1e03e7065ae Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 23 Jul 2012 18:12:23 -0700 Subject: [PATCH 4/9] following #4148 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 827019e9df..f3b2bf5632 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Versioning For transparency and insight into our release cycle, and for striving to maintain backward compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible. -Releases will be numbered with the follow format: +Releases will be numbered with the following format: `..` From 614d52bd7f86591a0b0ab09e1c16ee888610d8a3 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 23 Jul 2012 18:17:43 -0700 Subject: [PATCH 5/9] delete this test for now - as affix is still heavily underdevelopment --- js/bootstrap-affix.js | 2 +- js/tests/unit/bootstrap-affix.js | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/js/bootstrap-affix.js b/js/bootstrap-affix.js index a1cd10933f..7563029b14 100644 --- a/js/bootstrap-affix.js +++ b/js/bootstrap-affix.js @@ -88,7 +88,7 @@ $('[data-spy="affix"]').each(function () { var $spy = $(this) , data = $spy.data() - + data.offset = data.offset || {} data.offsetX && (data.offset.x = data.offsetX) diff --git a/js/tests/unit/bootstrap-affix.js b/js/tests/unit/bootstrap-affix.js index 2d4419def4..bc25df9917 100644 --- a/js/tests/unit/bootstrap-affix.js +++ b/js/tests/unit/bootstrap-affix.js @@ -16,10 +16,4 @@ $(function () { ok(!$affix.hasClass('affix'), 'affix class was not added') }) - test("should add affix class if scrolled to correct position", function () { - var $affix = $('
').appendTo('body').affix() - $('body').trigger('scroll') - ok($affix.hasClass('affix'), 'element has class affix') - }) - }) \ No newline at end of file From 0dda2c4659c6e0407b5b9fda6618ab5c8c12a897 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 23 Jul 2012 22:36:08 -0700 Subject: [PATCH 6/9] make docs scroll over jumbotrons, but only for 980px up --- docs/assets/css/docs.css | 32 + docs/base-css.html | 2324 +++++++-------- docs/components.html | 2628 ++++++++-------- docs/customize.html | 691 ++--- docs/getting-started.html | 269 +- docs/index.html | 138 +- docs/javascript.html | 2362 ++++++++------- docs/scaffolding.html | 610 ++-- docs/templates/pages/base-css.mustache | 2348 +++++++-------- docs/templates/pages/components.mustache | 2646 ++++++++--------- docs/templates/pages/customize.mustache | 663 +++-- docs/templates/pages/getting-started.mustache | 275 +- docs/templates/pages/index.mustache | 140 +- docs/templates/pages/javascript.mustache | 2390 ++++++++------- docs/templates/pages/scaffolding.mustache | 624 ++-- 15 files changed, 9100 insertions(+), 9040 deletions(-) diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 8e32d186be..95495456cb 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -940,3 +940,35 @@ form.bs-docs-example { } } + + +@media (min-width: 979px) { + .masthead, + .subhead { + position: fixed; + top: 40px; + right: 0; + left: 0; + } + .masthead { + height: 400px; + } + .subhead { + height: 120px; /* +80px pdding */ + } + .bs-docs-canvas { + position: absolute; + width: 100%; + z-index: 10; + background-color: #fff; + -webkit-box-shadow: 0 1px 5px rgba(0,0,0,.5); + -moz-box-shadow: 0 1px 5px rgba(0,0,0,.5); + box-shadow: 0 1px 5px rgba(0,0,0,.5); + } + .masthead + .bs-docs-canvas { + top: 550px; + } + .subhead + .bs-docs-canvas { + top: 240px; + } +} diff --git a/docs/base-css.html b/docs/base-css.html index 8713a1b258..5ad0dfeaf1 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -78,128 +78,130 @@
-
+
- -
- -
+
+ + +
+ +
- -
- + +
+ -

Headings

-

All HTML headings, <h1> through <h6> are available.

-
-

h1. Heading 1

-

h2. Heading 2

-

h3. Heading 3

-

h4. Heading 4

-
h5. Heading 5
-
h6. Heading 6
-
+

Headings

+

All HTML headings, <h1> through <h6> are available.

+
+

h1. Heading 1

+

h2. Heading 2

+

h3. Heading 3

+

h4. Heading 4

+
h5. Heading 5
+
h6. Heading 6
+
-

Body copy

-

Bootstrap's global default font-size is 14px, with a line-height of 20px. This is applied to the <body> and all paragraphs. In addition, <p> (paragraphs) receive a bottom margin of half their line-height (9px by default).

-
-

Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.

-

Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec ullamcorper nulla non metus auctor fringilla. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec ullamcorper nulla non metus auctor fringilla.

-

Maecenas sed diam eget risus varius blandit sit amet non magna. Donec id elit non mi porta gravida at eget metus. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.

-
-
<p>...</p>
+

Body copy

+

Bootstrap's global default font-size is 14px, with a line-height of 20px. This is applied to the <body> and all paragraphs. In addition, <p> (paragraphs) receive a bottom margin of half their line-height (9px by default).

+
+

Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.

+

Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec ullamcorper nulla non metus auctor fringilla. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec ullamcorper nulla non metus auctor fringilla.

+

Maecenas sed diam eget risus varius blandit sit amet non magna. Donec id elit non mi porta gravida at eget metus. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.

+
+
<p>...</p>
-

Lead body copy

-

Make a paragraph stand out by adding .lead.

-
-

Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus.

-
-
<p class="lead">...</p>
+

Lead body copy

+

Make a paragraph stand out by adding .lead.

+
+

Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus.

+
+
<p class="lead">...</p>
-

Built with Less

-

The typographic scale is based on two LESS variables in variables.less: @baseFontSize and @baseLineHeight. The first is the base font-size used throughout and the second is the base line-height. We use those variables and some simple math to create the margins, paddings, and line-heights of all our type and more. Customize them and Bootstrap adapts.

+

Built with Less

+

The typographic scale is based on two LESS variables in variables.less: @baseFontSize and @baseLineHeight. The first is the base font-size used throughout and the second is the base line-height. We use those variables and some simple math to create the margins, paddings, and line-heights of all our type and more. Customize them and Bootstrap adapts.

-
+
-

Emphasis

-

Make use of HTML's default emphasis tags, <strong> and <em>.

+

Emphasis

+

Make use of HTML's default emphasis tags, <strong> and <em>.

-

<strong>

-

For emphasizing a snippet of text with important

-
-

The following snippet of text is rendered as bold text.

-
-
<strong>rendered as bold text</strong>
+

<strong>

+

For emphasizing a snippet of text with important

+
+

The following snippet of text is rendered as bold text.

+
+
<strong>rendered as bold text</strong>
-

<em>

-

For emphasizing a snippet of text with stress

-
-

The following snippet of text is rendered as italicized text.

-
-
<em>rendered as italicized text</em>
+

<em>

+

For emphasizing a snippet of text with stress

+
+

The following snippet of text is rendered as italicized text.

+
+
<em>rendered as italicized text</em>
-

Heads up! Feel free to use <b> and <i> in HTML5. <b> is meant to highlight words or phrases without conveying additional importance while <i> is mostly for voice, technical terms, etc.

+

Heads up! Feel free to use <b> and <i> in HTML5. <b> is meant to highlight words or phrases without conveying additional importance while <i> is mostly for voice, technical terms, etc.

-
+
-

Abbreviations

-

Stylized implemenation of HTML's <abbr> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a title attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.

+

Abbreviations

+

Stylized implemenation of HTML's <abbr> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a title attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.

-

<abbr>

-

For expanded text on long hover of an abbreviation, include the title attribute.

-
-

An abbreviation of the word attribute is attr.

-
-
<abbr title="attribute">attr</abbr>
+

<abbr>

+

For expanded text on long hover of an abbreviation, include the title attribute.

+
+

An abbreviation of the word attribute is attr.

+
+
<abbr title="attribute">attr</abbr>
-

<abbr class="initialism">

-

Add .initialism to an abbreviation for a slightly smaller font-size.

-
-

HTML is the best thing since sliced bread.

-
-
<abbr title="attribute" class="initialism">attr</abbr>
+

<abbr class="initialism">

+

Add .initialism to an abbreviation for a slightly smaller font-size.

+
+

HTML is the best thing since sliced bread.

+
+
<abbr title="attribute" class="initialism">attr</abbr>
-
+
-

Addresses

-

Present contact information for the nearest ancestor or the entire body of work.

+

Addresses

+

Present contact information for the nearest ancestor or the entire body of work.

-

<address>

-

Preserve formatting by ending all lines with <br>.

-
-
- Twitter, Inc.
- 795 Folsom Ave, Suite 600
- San Francisco, CA 94107
- P: (123) 456-7890 -
-
- Full Name
- first.last@gmail.com -
-
+

<address>

+

Preserve formatting by ending all lines with <br>.

+
+
+ Twitter, Inc.
+ 795 Folsom Ave, Suite 600
+ San Francisco, CA 94107
+ P: (123) 456-7890 +
+
+ Full Name
+ first.last@gmail.com +
+
 <address>
   <strong>Twitter, Inc.</strong><br>
@@ -215,36 +217,36 @@
 
-
+
-

Blockquotes

-

For quoting blocks of content from another source within your document.

+

Blockquotes

+

For quoting blocks of content from another source within your document.

-

Default blockqoute

-

Wrap <blockquote> around any HTML as the quote. For straight quotes we recommend a <p>.

-
-
-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

-
-
+

Default blockqoute

+

Wrap <blockquote> around any HTML as the quote. For straight quotes we recommend a <p>.

+
+
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

+
+
 <blockquote>
   <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
 </blockquote>
 
-

Blockquote options

-

Style and content changes for simple variations on a standard blockquote.

+

Blockquote options

+

Style and content changes for simple variations on a standard blockquote.

-

Naming a source

-

Add <small> tag for identifying the source. Wrap the name of the source work in <cite>.

-
-
-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

- Someone famous in Source Title -
-
+

Naming a source

+

Add <small> tag for identifying the source. Wrap the name of the source work in <cite>.

+
+
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

+ Someone famous in Source Title +
+
 <blockquote>
   <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
@@ -252,14 +254,14 @@
 </blockquote>
 
-

Alternate displays

-

Use .pull-right for a floated, right-aligned blockquote.

-
-
-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

- Someone famous in Source Title -
-
+

Alternate displays

+

Use .pull-right for a floated, right-aligned blockquote.

+
+
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

+ Someone famous in Source Title +
+
 <blockquote class="pull-right">
   ...
@@ -267,16 +269,63 @@
 
-
+
- -

Lists

+ +

Lists

-

Unordered

-

A list of items in which the order does not explicitly matter.

+

Unordered

+

A list of items in which the order does not explicitly matter.

+
+
    +
  • Lorem ipsum dolor sit amet
  • +
  • Consectetur adipiscing elit
  • +
  • Integer molestie lorem at massa
  • +
  • Facilisis in pretium nisl aliquet
  • +
  • Nulla volutpat aliquam velit +
      +
    • Phasellus iaculis neque
    • +
    • Purus sodales ultricies
    • +
    • Vestibulum laoreet porttitor sem
    • +
    • Ac tristique libero volutpat at
    • +
    +
  • +
  • Faucibus porta lacus fringilla vel
  • +
  • Aenean sit amet erat nunc
  • +
  • Eget porttitor lorem
  • +
+
+
+<ul>
+  <li>...</li>
+</ul>
+
+ +

Ordered

+

A list of items in which the order does explicitly matter.

+
+
    +
  1. Lorem ipsum dolor sit amet
  2. +
  3. Consectetur adipiscing elit
  4. +
  5. Integer molestie lorem at massa
  6. +
  7. Facilisis in pretium nisl aliquet
  8. +
  9. Nulla volutpat aliquam velit
  10. +
  11. Faucibus porta lacus fringilla vel
  12. +
  13. Aenean sit amet erat nunc
  14. +
  15. Eget porttitor lorem
  16. +
+
+
+<ol>
+  <li>...</li>
+</ol>
+
+ +

Unstyled

+

A list of items with no list-style or additional left padding.

-
    +
    • Lorem ipsum dolor sit amet
    • Consectetur adipiscing elit
    • Integer molestie lorem at massa
    • @@ -295,71 +344,24 @@
-<ul>
-  <li>...</li>
-</ul>
-
- -

Ordered

-

A list of items in which the order does explicitly matter.

-
-
    -
  1. Lorem ipsum dolor sit amet
  2. -
  3. Consectetur adipiscing elit
  4. -
  5. Integer molestie lorem at massa
  6. -
  7. Facilisis in pretium nisl aliquet
  8. -
  9. Nulla volutpat aliquam velit
  10. -
  11. Faucibus porta lacus fringilla vel
  12. -
  13. Aenean sit amet erat nunc
  14. -
  15. Eget porttitor lorem
  16. -
-
-
-<ol>
-  <li>...</li>
-</ol>
-
- -

Unstyled

-

A list of items with no list-style or additional left padding.

-
-
    -
  • Lorem ipsum dolor sit amet
  • -
  • Consectetur adipiscing elit
  • -
  • Integer molestie lorem at massa
  • -
  • Facilisis in pretium nisl aliquet
  • -
  • Nulla volutpat aliquam velit -
      -
    • Phasellus iaculis neque
    • -
    • Purus sodales ultricies
    • -
    • Vestibulum laoreet porttitor sem
    • -
    • Ac tristique libero volutpat at
    • -
    -
  • -
  • Faucibus porta lacus fringilla vel
  • -
  • Aenean sit amet erat nunc
  • -
  • Eget porttitor lorem
  • -
-
-
 <ul class="unstyled">
   <li>...</li>
 </ul>
 
-

Description

-

A list of terms with their associated descriptions.

-
-
-
Description lists
-
A description list is perfect for defining terms.
-
Euismod
-
Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.
-
Donec id elit non mi porta gravida at eget metus.
-
Malesuada porta
-
Etiam porta sem malesuada magna mollis euismod.
-
-
+

Description

+

A list of terms with their associated descriptions.

+
+
+
Description lists
+
A description list is perfect for defining terms.
+
Euismod
+
Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.
+
Donec id elit non mi porta gravida at eget metus.
+
Malesuada porta
+
Etiam porta sem malesuada magna mollis euismod.
+
+
 <dl>
   <dt>...</dt>
@@ -367,50 +369,50 @@
 </dl>
 
-

Horizontal description

-

Make terms and descriptions in <dl> line up side-by-side.

-
-
-
Description lists
-
A description list is perfect for defining terms.
-
Euismod
-
Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.
-
Donec id elit non mi porta gravida at eget metus.
-
Malesuada porta
-
Etiam porta sem malesuada magna mollis euismod.
-
Felis euismod semper eget lacinia
-
Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
-
-
+

Horizontal description

+

Make terms and descriptions in <dl> line up side-by-side.

+
+
+
Description lists
+
A description list is perfect for defining terms.
+
Euismod
+
Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.
+
Donec id elit non mi porta gravida at eget metus.
+
Malesuada porta
+
Etiam porta sem malesuada magna mollis euismod.
+
Felis euismod semper eget lacinia
+
Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
+
+
 <dl class="dl-horizontal">
   <dt>...</dt>
   <dd>...</dd>
 </dl>
 
-

- Heads up! - Horizontal description lists will truncate terms that are too long to fit in the left column fix text-overflow. In narrower viewports, they will change to the default stacked layout. -

-
+

+ Heads up! + Horizontal description lists will truncate terms that are too long to fit in the left column fix text-overflow. In narrower viewports, they will change to the default stacked layout. +

+
- -
- + +
+ -

Inline

-

Wrap inline snippets of code with <code>.

+

Inline

+

Wrap inline snippets of code with <code>.

 For example, <code>section</code> should be wrapped as inline.
 
-

Basic block

-

Use <pre> for multiple lines of code. Be sure to escape any angle brackets in the code for proper rendering.

+

Basic block

+

Use <pre> for multiple lines of code. Be sure to escape any angle brackets in the code for proper rendering.

 <p>Sample text here...</p>
 
@@ -419,53 +421,53 @@ For example, <code>section</code> should be wrapped as inline. &lt;p&gt;Sample text here...&lt;/p&gt; </pre> -

Note: Be sure to keep code within <pre> tags as close to the left as possible; it will render all tabs.

-

You may optionally add the .pre-scrollable class which will set a max-height of 350px and provide a y-axis scrollbar.

-
+

Note: Be sure to keep code within <pre> tags as close to the left as possible; it will render all tabs.

+

You may optionally add the .pre-scrollable class which will set a max-height of 350px and provide a y-axis scrollbar.

+
- -
- + +
+ -

Default styles

-

For basic styling—light padding and only horizontal dividers—add the base class .table to any <table>.

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#First NameLast NameUsername
1MarkOtto@mdo
2JacobThornton@fat
3Larrythe Bird@twitter
-
+

Default styles

+

For basic styling—light padding and only horizontal dividers—add the base class .table to any <table>.

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#First NameLast NameUsername
1MarkOtto@mdo
2JacobThornton@fat
3Larrythe Bird@twitter
+
 <table class="table">
   …
@@ -473,168 +475,168 @@ For example, <code>section</code> should be wrapped as inline.
 
-
+
-

Optional classes

-

Add any of the follow classes to the .table base class.

+

Optional classes

+

Add any of the follow classes to the .table base class.

-

.table-striped

-

Adds zebra-striping to any table row within the <tbody> via the :nth-child CSS selector (not available in IE7-IE8).

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#First NameLast NameUsername
1MarkOtto@mdo
2JacobThornton@fat
3Larrythe Bird@twitter
-
+

.table-striped

+

Adds zebra-striping to any table row within the <tbody> via the :nth-child CSS selector (not available in IE7-IE8).

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#First NameLast NameUsername
1MarkOtto@mdo
2JacobThornton@fat
3Larrythe Bird@twitter
+
 <table class="table table-striped">
   …
 </table>
 
-

.table-bordered

-

Add borders and rounded corners to the table.

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#First NameLast NameUsername
1MarkOtto@mdo
MarkOtto@TwBootstrap
2JacobThornton@fat
3Larry the Bird@twitter
-
+

.table-bordered

+

Add borders and rounded corners to the table.

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#First NameLast NameUsername
1MarkOtto@mdo
MarkOtto@TwBootstrap
2JacobThornton@fat
3Larry the Bird@twitter
+
 <table class="table table-bordered">
   …
 </table>
 
-

.table-hover

-

Enable a hover state on table rows within a <tbody>.

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#First NameLast NameUsername
1MarkOtto@mdo
2JacobThornton@fat
3Larry the Bird@twitter
-
+

.table-hover

+

Enable a hover state on table rows within a <tbody>.

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#First NameLast NameUsername
1MarkOtto@mdo
2JacobThornton@fat
3Larry the Bird@twitter
+
 <table class="table table-hover">
   …
 </table>
 
-

.table-condensed

-

Makes tables more compact by cutting cell padding in half.

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#First NameLast NameUsername
1MarkOtto@mdo
2JacobThornton@fat
3Larry the Bird@twitter
-
+

.table-condensed

+

Makes tables more compact by cutting cell padding in half.

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#First NameLast NameUsername
1MarkOtto@mdo
2JacobThornton@fat
3Larry the Bird@twitter
+
 <table class="table table-condensed">
   …
@@ -642,75 +644,75 @@ For example, <code>section</code> should be wrapped as inline.
 
-
+
-

Optional row classes

-

Use contextual classes to color table rows.

- - - - - - - - - - - - - - - - - - - - - - - - - -
ClassDescription
- .success - Indicates a successful or positive action.
- .error - Indicates a dangerous or potentially negative action.
- .info - Used as an alternative to the default styles.
-
- +

Optional row classes

+

Use contextual classes to color table rows.

+
+ + + + - - - - + + - - - - - + + + - - - - - + + + - - - - - + + +
#ProductPayment TakenStatusClassDescription
1TB - Monthly01/04/2012Approved
+ .success + Indicates a successful or positive action.
2TB - Monthly02/04/2012Declined
+ .error + Indicates a dangerous or potentially negative action.
3TB - Monthly03/04/2012Pending
+ .info + Used as an alternative to the default styles.
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#ProductPayment TakenStatus
1TB - Monthly01/04/2012Approved
2TB - Monthly02/04/2012Declined
3TB - Monthly03/04/2012Pending
+
 ...
   <tr class="success">
@@ -723,82 +725,82 @@ For example, <code>section</code> should be wrapped as inline.
 
-
+
-

Supported table markup

-

List of supported table HTML elements and how they should be used.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
TagDescription
- <table> - - Wrapping element for displaying data in a tabular format -
- <thead> - - Container element for table header rows (<tr>) to label table columns -
- <tbody> - - Container element for table rows (<tr>) in the body of the table -
- <tr> - - Container element for a set of table cells (<td> or <th>) that appears on a single row -
- <td> - - Default table cell -
- <th> - - Special table cell for column (or row, depending on scope and placement) labels
- Must be used within a <thead> -
- <caption> - - Description or summary of what the table holds, especially useful for screen readers -
+

Supported table markup

+

List of supported table HTML elements and how they should be used.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
TagDescription
+ <table> + + Wrapping element for displaying data in a tabular format +
+ <thead> + + Container element for table header rows (<tr>) to label table columns +
+ <tbody> + + Container element for table rows (<tr>) in the body of the table +
+ <tr> + + Container element for a set of table cells (<td> or <th>) that appears on a single row +
+ <td> + + Default table cell +
+ <th> + + Special table cell for column (or row, depending on scope and placement) labels
+ Must be used within a <thead> +
+ <caption> + + Description or summary of what the table holds, especially useful for screen readers +
 <table>
   <thead>
@@ -816,29 +818,29 @@ For example, <code>section</code> should be wrapped as inline.
 </table>
 
-
+
- -
- + +
+ -

Default styles

-

Individual form controls receive styling, but without any required base class on the <form> or large changes in markup. Results in stacked, left-aligned labels on top of form controls.

-
- Legend - - -

Example block-level help text here.

- - -
+

Default styles

+

Individual form controls receive styling, but without any required base class on the <form> or large changes in markup. Results in stacked, left-aligned labels on top of form controls.

+
+ Legend + + +

Example block-level help text here.

+ + +
 <form class="well">
   <label>Label name</label>
@@ -852,18 +854,18 @@ For example, <code>section</code> should be wrapped as inline.
 
-
+
-

Optional layouts

-

Included with Bootstrap are three optional form layouts for common use cases.

+

Optional layouts

+

Included with Bootstrap are three optional form layouts for common use cases.

-

Search form

-

Add .form-search to the form and .search-query to the <input> for an extra-rounded text input.

- +

Search form

+

Add .form-search to the form and .search-query to the <input> for an extra-rounded text input.

+
 <form class="form-search">
   <input type="text" class="input-medium search-query">
@@ -871,16 +873,16 @@ For example, <code>section</code> should be wrapped as inline.
 </form>
 
-

Inline form

-

Add .form-inline for left-aligned labels and inline-block controls for a compact layout.

-
- - - - -
+

Inline form

+

Add .form-inline for left-aligned labels and inline-block controls for a compact layout.

+
+ + + + +
 <form class="form-inline">
   <input type="text" class="input-small" placeholder="Email">
@@ -892,37 +894,37 @@ For example, <code>section</code> should be wrapped as inline.
 </form>
 
-

Horizontal form

-

Right align labels and float them to the left to make them appear on the same line as controls. Requires the most markup changes from a default form:

-
    -
  • Add .form-horizontal to the form
  • -
  • Wrap labels and controls in .control-group
  • -
  • Add .control-label to the label
  • -
  • Wrap any associated controls in .controls for proper alignment
  • -
-
- Legend -
- -
- +

Horizontal form

+

Right align labels and float them to the left to make them appear on the same line as controls. Requires the most markup changes from a default form:

+
    +
  • Add .form-horizontal to the form
  • +
  • Wrap labels and controls in .control-group
  • +
  • Add .control-label to the label
  • +
  • Wrap any associated controls in .controls for proper alignment
  • +
+ + Legend +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
-
- - +
+
+ + +
-
- +
 <form class="form-horizontal">
   <div class="control-group">
@@ -949,49 +951,49 @@ For example, <code>section</code> should be wrapped as inline.
 
-
+
-

Supported form controls

-

Examples of standard form controls supported in an example form layout.

+

Supported form controls

+

Examples of standard form controls supported in an example form layout.

-

Inputs

-

Most common form control, text-based input fields. Includes support for all HTML5 types: text, password, datetime, datetime-local, date, month, time, week, number, email, url, search, tel, and color.

-

Requires the use of a specified type at all times.

-
- -
+

Inputs

+

Most common form control, text-based input fields. Includes support for all HTML5 types: text, password, datetime, datetime-local, date, month, time, week, number, email, url, search, tel, and color.

+

Requires the use of a specified type at all times.

+
+ +
 <input type="text" placeholder="Text input">
 
-

Textarea

-

Form control which supports multiple lines of text. Change row attribute as necessary.

-
- -
+

Textarea

+

Form control which supports multiple lines of text. Change row attribute as necessary.

+
+ +
 <textarea id="textarea" rows="3"></textarea>
 
-

Checkboxes and radios

-

Checkboxes are for selecting one or several options in a list while radios are for selecting one option from many.

-

Default (stacked)

-
- -
- - -
+

Checkboxes and radios

+

Checkboxes are for selecting one or several options in a list while radios are for selecting one option from many.

+

Default (stacked)

+
+ +
+ + +
 <label class="checkbox">
   <input type="checkbox" value="">
@@ -1008,19 +1010,19 @@ For example, <code>section</code> should be wrapped as inline.
 </label>
 
-

Inline checkboxes

-

Add the .inline class to a series of checkboxes or radios for controls appear on the same line.

-
- - - -
+

Inline checkboxes

+

Add the .inline class to a series of checkboxes or radios for controls appear on the same line.

+
+ + + +
 <label class="checkbox inline">
   <input type="checkbox" id="inlineCheckbox1" value="option1"> 1
@@ -1033,25 +1035,25 @@ For example, <code>section</code> should be wrapped as inline.
 </label>
 
-

Selects

-

Use the default option or specify a multiple="multiple" to show multiple options at once.

-
- -
- -
+

Selects

+

Use the default option or specify a multiple="multiple" to show multiple options at once.

+
+ +
+ +
 <select>
   <option>something</option>
@@ -1071,28 +1073,28 @@ For example, <code>section</code> should be wrapped as inline.
 
-
+
-

Extending form controls

-

Adding on top of existing browser controls, Bootstrap includes other useful form components.

+

Extending form controls

+

Adding on top of existing browser controls, Bootstrap includes other useful form components.

-

Prepended and appended inputs

-

Add text or buttons before or after any text-based input. Do note that select elements are not supported here.

+

Prepended and appended inputs

+

Add text or buttons before or after any text-based input. Do note that select elements are not supported here.

-

Default options

-

Wrap a .add-on and an input with one of two classes to prepend or append text to an input.

-
-
- @ - -
-
-
- - .00 -
-
+

Default options

+

Wrap a .add-on and an input with one of two classes to prepend or append text to an input.

+
+
+ @ + +
+
+
+ + .00 +
+
 <div class="input-prepend">
   <span class="add-on">@</span><input class="span2" id="prependedInput" size="16" type="text" placeholder="Username">
@@ -1102,35 +1104,35 @@ For example, <code>section</code> should be wrapped as inline.
 </div>
 
-

Combined

-

Use both classes and two instances of .add-on to prepend and append an input.

-
-
- $ - - .00 -
-
+

Combined

+

Use both classes and two instances of .add-on to prepend and append an input.

+
+
+ $ + + .00 +
+
 <div class="input-prepend input-append">
   <span class="add-on">$</span><input class="span2" id="appendedPrependedInput" size="16" type="text"><span class="add-on">.00</span>
 </div>
 
-

Buttons instead of text

-

Instead of a <span> with text, use a .btn to attach a button (or two) to an input.

-
-
- - -
-
-
- - - -
-
+

Buttons instead of text

+

Instead of a <span> with text, use a .btn to attach a button (or two) to an input.

+
+
+ + +
+
+
+ + + +
+
 <div class="input-append">
   <input class="span2" id="appendedInputButton" size="16" type="text"><button class="btn" type="button">Go!</button>
@@ -1141,17 +1143,17 @@ For example, <code>section</code> should be wrapped as inline.
 </div>
 
-

Search form

- +

Search form

+
 <form class="form-search">
   <input type="text" class="span2 search-query">
@@ -1159,20 +1161,20 @@ For example, <code>section</code> should be wrapped as inline.
 </form>
 
-

Control sizing

-

Use relative sizing classes like .input-large or match your inputs to the grid column sizes using .span* classes.

+

Control sizing

+

Use relative sizing classes like .input-large or match your inputs to the grid column sizes using .span* classes.

-

Relative sizing

-
-
- - - - - - -
-
+

Relative sizing

+
+
+ + + + + + +
+
 <input class="input-mini" type="text">
 <input class="input-small" type="text">
@@ -1181,68 +1183,68 @@ For example, <code>section</code> should be wrapped as inline.
 <input class="input-xlarge" type="text">
 <input class="input-xxlarge" type="text">
 
-

- Heads up! In future versions, we'll be altering the use of these relative input classes to match our button sizes. For example, .input-large will increase the padding and font-size of an input. -

+

+ Heads up! In future versions, we'll be altering the use of these relative input classes to match our button sizes. For example, .input-large will increase the padding and font-size of an input. +

-

Grid sizing

-

Use .span1 to .span12 for inputs that match the same sizes of the grid columns.

-
-
- - - - - - -
-
+

Grid sizing

+

Use .span1 to .span12 for inputs that match the same sizes of the grid columns.

+
+
+ + + + + + +
+
 <input class="span1" type="text">
 <input class="span2" type="text">
 <input class="span3" type="text">
 
-

For multiple grid inputs per line, use the .controls-row modifier class for proper spacing. It floats the inputs to collapse white-space, sets the proper margins, and the clears the float.

-
-
- -
-
- - -
-
- - -
-
- - -
-
- - -
-
+

For multiple grid inputs per line, use the .controls-row modifier class for proper spacing. It floats the inputs to collapse white-space, sets the proper margins, and the clears the float.

+
+
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
 <div class="controls controls-row">
   <input class="span4" type="text" placeholder=".span4">
@@ -1250,23 +1252,23 @@ For example, <code>section</code> should be wrapped as inline.
 </div>
 
-

Uneditable inputs

-

Present data in a form that's not editable without using actual form markup.

-
- Some value here -
+

Uneditable inputs

+

Present data in a form that's not editable without using actual form markup.

+
+ Some value here +
   <span class="input-xlarge uneditable-input">Some value here</span>
 
-

Form actions

-

End a form with a group of actions (buttons). When placed within a .form-horizontal, the buttons will automatically indent to line up with the form controls.

-
-
- - -
-
+

Form actions

+

End a form with a group of actions (buttons). When placed within a .form-horizontal, the buttons will automatically indent to line up with the form controls.

+
+
+ + +
+
 <div class="form-actions">
   <button type="submit" class="btn btn-primary">Save changes</button>
@@ -1274,76 +1276,76 @@ For example, <code>section</code> should be wrapped as inline.
 </div>
 
-

Help text

-

Inline and block level support for help text that appears around form controls.

-

Inline help

-
- Inline help text -
+

Help text

+

Inline and block level support for help text that appears around form controls.

+

Inline help

+
+ Inline help text +
 <span class="help-inline">Inline help text</span>
 
-

Block help

-
- - A longer block of help text that breaks onto a new line and may extend beyond one line. -
+

Block help

+
+ + A longer block of help text that breaks onto a new line and may extend beyond one line. +
 <span class="help-block">A longer block of help text that breaks onto a new line and may extend beyond one line.</span>
 
-
+
-

Form control states

-

Provide feedback to users or visitors with basic feedback states on form controls and labels.

+

Form control states

+

Provide feedback to users or visitors with basic feedback states on form controls and labels.

-

Input focus

-

We remove the default outline styles on some form controls and apply a box-shadow in its place for :focus.

-
- -
-
-<input class="input-xlarge" id="focusedInput" type="text" value="This is focused...">
-
+

Input focus

+

We remove the default outline styles on some form controls and apply a box-shadow in its place for :focus.

+
+ +
+
+  <input class="input-xlarge" id="focusedInput" type="text" value="This is focused...">
+  
-

Disabled inputs

-

Add the disabled attribute on an input to prevent user input and trigger a slightly different look.

-
- -
+

Disabled inputs

+

Add the disabled attribute on an input to prevent user input and trigger a slightly different look.

+
+ +
 <input class="input-xlarge" id="disabledInput" type="text" placeholder="Disabled input here..." disabled>
 
-

Validation states

-

Bootstrap includes validation styles for error, warning, and success messages. To use, add the appropriate class to the surrounding .control-group.

+

Validation states

+

Bootstrap includes validation styles for error, warning, and success messages. To use, add the appropriate class to the surrounding .control-group.

-
-
- -
- - Something may have gone wrong + +
+ +
+ + Something may have gone wrong +
-
-
- -
- - Please correct the error +
+ +
+ + Please correct the error +
-
-
- -
- - Woohoo! +
+ +
+ + Woohoo! +
-
- +
 <div class="control-group warning">
   <label class="control-label" for="inputWarning">Input with warning</label>
@@ -1368,138 +1370,138 @@ For example, <code>section</code> should be wrapped as inline.
 </div>
 
-
+
- -
- + +
+ -

Default buttons

-

Button styles can be applied to anything with the .btn class applied. However, typically you'll want to apply these to only <a> and <button> elements for the best rendering.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Buttonclass=""Description
btnStandard gray button with gradient
btn btn-primaryProvides extra visual weight and identifies the primary action in a set of buttons
btn btn-infoUsed as an alternative to the default styles
btn btn-successIndicates a successful or positive action
btn btn-warningIndicates caution should be taken with this action
btn btn-dangerIndicates a dangerous or potentially negative action
btn btn-inverseAlternate dark gray button, not tied to a semantic action or use
btn btn-linkDeemphasize a button by making it look like a link while maintaining button behavior
+

Default buttons

+

Button styles can be applied to anything with the .btn class applied. However, typically you'll want to apply these to only <a> and <button> elements for the best rendering.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Buttonclass=""Description
btnStandard gray button with gradient
btn btn-primaryProvides extra visual weight and identifies the primary action in a set of buttons
btn btn-infoUsed as an alternative to the default styles
btn btn-successIndicates a successful or positive action
btn btn-warningIndicates caution should be taken with this action
btn btn-dangerIndicates a dangerous or potentially negative action
btn btn-inverseAlternate dark gray button, not tied to a semantic action or use
btn btn-linkDeemphasize a button by making it look like a link while maintaining button behavior
-

Cross browser compatibility

-

IE9 doesn't crop background gradients on rounded corners, so we remove it. Related, IE9 jankifies disabled button elements, rendering text gray with a nasty text-shadow that we cannot fix.

+

Cross browser compatibility

+

IE9 doesn't crop background gradients on rounded corners, so we remove it. Related, IE9 jankifies disabled button elements, rendering text gray with a nasty text-shadow that we cannot fix.

-
+
-

Button sizes

-

Fancy larger or smaller buttons? Add .btn-large, .btn-small, or .btn-mini for two additional sizes.

-

- - -

-

- - -

-

- - -

+

Button sizes

+

Fancy larger or smaller buttons? Add .btn-large, .btn-small, or .btn-mini for two additional sizes.

+

+ + +

+

+ + +

+

+ + +

-
+
-

Disabled state

-

Make buttons look unclickable by fading them back 50%.

+

Disabled state

+

Make buttons look unclickable by fading them back 50%.

-

Anchor element

-

Add the .disabled class to <a> buttons.

-

- Primary link - Link -

+

Anchor element

+

Add the .disabled class to <a> buttons.

+

+ Primary link + Link +

 <a href="#" class="btn btn-large btn-primary disabled">Primary link</a>
 <a href="#" class="btn btn-large disabled">Link</a>
 
-

- Heads up! - We use .disabled as a utility class here, similar to the common .active class, so no prefix is required. -

+

+ Heads up! + We use .disabled as a utility class here, similar to the common .active class, so no prefix is required. +

-

Button element

-

Add the disabled attribute to <button> buttons.

-

- - -

+

Button element

+

Add the disabled attribute to <button> buttons.

+

+ + +

 <button type="button" class="btn btn-large btn-primary disabled" disabled="disabled">Primary button</button>
 <button type="button" class="btn btn-large" disabled>Button</button>
 
-
+
-

One class, multiple tags

-

Use the .btn class on an <a>, <button>, or <input> element.

-
- Link - - - -
+

One class, multiple tags

+

Use the .btn class on an <a>, <button>, or <input> element.

+
+ Link + + + +
 <a class="btn" href="">Link</a>
 <button class="btn" type="submit">
@@ -1510,248 +1512,250 @@ For example, <code>section</code> should be wrapped as inline.
 <input class="btn" type="submit"
          value="Submit">
 
-

As a best practice, try to match the element for you context to ensure matching cross-browser rendering. If you have an input, use an <input type="submit"> for your button.

+

As a best practice, try to match the element for you context to ensure matching cross-browser rendering. If you have an input, use an <input type="submit"> for your button.

-
+
- -
- + +
+ -

Icon glyphs

-

140 icons in sprite form, available in dark gray (default) and white, provided by Glyphicons.

-
    -
  • icon-glass
  • -
  • icon-music
  • -
  • icon-search
  • -
  • icon-envelope
  • -
  • icon-heart
  • -
  • icon-star
  • -
  • icon-star-empty
  • -
  • icon-user
  • -
  • icon-film
  • -
  • icon-th-large
  • -
  • icon-th
  • -
  • icon-th-list
  • -
  • icon-ok
  • -
  • icon-remove
  • -
  • icon-zoom-in
  • -
  • icon-zoom-out
  • -
  • icon-off
  • -
  • icon-signal
  • -
  • icon-cog
  • -
  • icon-trash
  • -
  • icon-home
  • -
  • icon-file
  • -
  • icon-time
  • -
  • icon-road
  • -
  • icon-download-alt
  • -
  • icon-download
  • -
  • icon-upload
  • -
  • icon-inbox
  • +

    Icon glyphs

    +

    140 icons in sprite form, available in dark gray (default) and white, provided by Glyphicons.

    +
      +
    • icon-glass
    • +
    • icon-music
    • +
    • icon-search
    • +
    • icon-envelope
    • +
    • icon-heart
    • +
    • icon-star
    • +
    • icon-star-empty
    • +
    • icon-user
    • +
    • icon-film
    • +
    • icon-th-large
    • +
    • icon-th
    • +
    • icon-th-list
    • +
    • icon-ok
    • +
    • icon-remove
    • +
    • icon-zoom-in
    • +
    • icon-zoom-out
    • +
    • icon-off
    • +
    • icon-signal
    • +
    • icon-cog
    • +
    • icon-trash
    • +
    • icon-home
    • +
    • icon-file
    • +
    • icon-time
    • +
    • icon-road
    • +
    • icon-download-alt
    • +
    • icon-download
    • +
    • icon-upload
    • +
    • icon-inbox
    • -
    • icon-play-circle
    • -
    • icon-repeat
    • -
    • icon-refresh
    • -
    • icon-list-alt
    • -
    • icon-lock
    • -
    • icon-flag
    • -
    • icon-headphones
    • -
    • icon-volume-off
    • -
    • icon-volume-down
    • -
    • icon-volume-up
    • -
    • icon-qrcode
    • -
    • icon-barcode
    • -
    • icon-tag
    • -
    • icon-tags
    • -
    • icon-book
    • -
    • icon-bookmark
    • -
    • icon-print
    • -
    • icon-camera
    • -
    • icon-font
    • -
    • icon-bold
    • -
    • icon-italic
    • -
    • icon-text-height
    • -
    • icon-text-width
    • -
    • icon-align-left
    • -
    • icon-align-center
    • -
    • icon-align-right
    • -
    • icon-align-justify
    • -
    • icon-list
    • +
    • icon-play-circle
    • +
    • icon-repeat
    • +
    • icon-refresh
    • +
    • icon-list-alt
    • +
    • icon-lock
    • +
    • icon-flag
    • +
    • icon-headphones
    • +
    • icon-volume-off
    • +
    • icon-volume-down
    • +
    • icon-volume-up
    • +
    • icon-qrcode
    • +
    • icon-barcode
    • +
    • icon-tag
    • +
    • icon-tags
    • +
    • icon-book
    • +
    • icon-bookmark
    • +
    • icon-print
    • +
    • icon-camera
    • +
    • icon-font
    • +
    • icon-bold
    • +
    • icon-italic
    • +
    • icon-text-height
    • +
    • icon-text-width
    • +
    • icon-align-left
    • +
    • icon-align-center
    • +
    • icon-align-right
    • +
    • icon-align-justify
    • +
    • icon-list
    • -
    • icon-indent-left
    • -
    • icon-indent-right
    • -
    • icon-facetime-video
    • -
    • icon-picture
    • -
    • icon-pencil
    • -
    • icon-map-marker
    • -
    • icon-adjust
    • -
    • icon-tint
    • -
    • icon-edit
    • -
    • icon-share
    • -
    • icon-check
    • -
    • icon-move
    • -
    • icon-step-backward
    • -
    • icon-fast-backward
    • -
    • icon-backward
    • -
    • icon-play
    • -
    • icon-pause
    • -
    • icon-stop
    • -
    • icon-forward
    • -
    • icon-fast-forward
    • -
    • icon-step-forward
    • -
    • icon-eject
    • -
    • icon-chevron-left
    • -
    • icon-chevron-right
    • -
    • icon-plus-sign
    • -
    • icon-minus-sign
    • -
    • icon-remove-sign
    • -
    • icon-ok-sign
    • +
    • icon-indent-left
    • +
    • icon-indent-right
    • +
    • icon-facetime-video
    • +
    • icon-picture
    • +
    • icon-pencil
    • +
    • icon-map-marker
    • +
    • icon-adjust
    • +
    • icon-tint
    • +
    • icon-edit
    • +
    • icon-share
    • +
    • icon-check
    • +
    • icon-move
    • +
    • icon-step-backward
    • +
    • icon-fast-backward
    • +
    • icon-backward
    • +
    • icon-play
    • +
    • icon-pause
    • +
    • icon-stop
    • +
    • icon-forward
    • +
    • icon-fast-forward
    • +
    • icon-step-forward
    • +
    • icon-eject
    • +
    • icon-chevron-left
    • +
    • icon-chevron-right
    • +
    • icon-plus-sign
    • +
    • icon-minus-sign
    • +
    • icon-remove-sign
    • +
    • icon-ok-sign
    • -
    • icon-question-sign
    • -
    • icon-info-sign
    • -
    • icon-screenshot
    • -
    • icon-remove-circle
    • -
    • icon-ok-circle
    • -
    • icon-ban-circle
    • -
    • icon-arrow-left
    • -
    • icon-arrow-right
    • -
    • icon-arrow-up
    • -
    • icon-arrow-down
    • -
    • icon-share-alt
    • -
    • icon-resize-full
    • -
    • icon-resize-small
    • -
    • icon-plus
    • -
    • icon-minus
    • -
    • icon-asterisk
    • -
    • icon-exclamation-sign
    • -
    • icon-gift
    • -
    • icon-leaf
    • -
    • icon-fire
    • -
    • icon-eye-open
    • -
    • icon-eye-close
    • -
    • icon-warning-sign
    • -
    • icon-plane
    • -
    • icon-calendar
    • -
    • icon-random
    • -
    • icon-comment
    • -
    • icon-magnet
    • +
    • icon-question-sign
    • +
    • icon-info-sign
    • +
    • icon-screenshot
    • +
    • icon-remove-circle
    • +
    • icon-ok-circle
    • +
    • icon-ban-circle
    • +
    • icon-arrow-left
    • +
    • icon-arrow-right
    • +
    • icon-arrow-up
    • +
    • icon-arrow-down
    • +
    • icon-share-alt
    • +
    • icon-resize-full
    • +
    • icon-resize-small
    • +
    • icon-plus
    • +
    • icon-minus
    • +
    • icon-asterisk
    • +
    • icon-exclamation-sign
    • +
    • icon-gift
    • +
    • icon-leaf
    • +
    • icon-fire
    • +
    • icon-eye-open
    • +
    • icon-eye-close
    • +
    • icon-warning-sign
    • +
    • icon-plane
    • +
    • icon-calendar
    • +
    • icon-random
    • +
    • icon-comment
    • +
    • icon-magnet
    • -
    • icon-chevron-up
    • -
    • icon-chevron-down
    • -
    • icon-retweet
    • -
    • icon-shopping-cart
    • -
    • icon-folder-close
    • -
    • icon-folder-open
    • -
    • icon-resize-vertical
    • -
    • icon-resize-horizontal
    • -
    • icon-hdd
    • -
    • icon-bullhorn
    • -
    • icon-bell
    • -
    • icon-certificate
    • -
    • icon-thumbs-up
    • -
    • icon-thumbs-down
    • -
    • icon-hand-right
    • -
    • icon-hand-left
    • -
    • icon-hand-up
    • -
    • icon-hand-down
    • -
    • icon-circle-arrow-right
    • -
    • icon-circle-arrow-left
    • -
    • icon-circle-arrow-up
    • -
    • icon-circle-arrow-down
    • -
    • icon-globe
    • -
    • icon-wrench
    • -
    • icon-tasks
    • -
    • icon-filter
    • -
    • icon-briefcase
    • -
    • icon-fullscreen
    • -
    +
  • icon-chevron-up
  • +
  • icon-chevron-down
  • +
  • icon-retweet
  • +
  • icon-shopping-cart
  • +
  • icon-folder-close
  • +
  • icon-folder-open
  • +
  • icon-resize-vertical
  • +
  • icon-resize-horizontal
  • +
  • icon-hdd
  • +
  • icon-bullhorn
  • +
  • icon-bell
  • +
  • icon-certificate
  • +
  • icon-thumbs-up
  • +
  • icon-thumbs-down
  • +
  • icon-hand-right
  • +
  • icon-hand-left
  • +
  • icon-hand-up
  • +
  • icon-hand-down
  • +
  • icon-circle-arrow-right
  • +
  • icon-circle-arrow-left
  • +
  • icon-circle-arrow-up
  • +
  • icon-circle-arrow-down
  • +
  • icon-globe
  • +
  • icon-wrench
  • +
  • icon-tasks
  • +
  • icon-filter
  • +
  • icon-briefcase
  • +
  • icon-fullscreen
  • +
-

Glyphicons attribution

-

Glyphicons Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creators have made this possible at not cost to you as developers. As a thank you, we ask you to include an optional link back to Glyphicons whenever practical.

+

Glyphicons attribution

+

Glyphicons Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creators have made this possible at not cost to you as developers. As a thank you, we ask you to include an optional link back to Glyphicons whenever practical.

-
+
-

How to use

-

All icons require an <i> tag with a unique class, prefixed with icon-. To use, place the following code just about anywhere:

+

How to use

+

All icons require an <i> tag with a unique class, prefixed with icon-. To use, place the following code just about anywhere:

 <i class="icon-search"></i>
 
-

There are also styles available for inverted (white) icons, made ready with one extra class:

+

There are also styles available for inverted (white) icons, made ready with one extra class:

 <i class="icon-search icon-white"></i>
 
-

- Heads up! - When using beside strings of text, as in buttons or nav links, be sure to leave a space after the <i> tag for proper spacing. -

+

+ Heads up! + When using beside strings of text, as in buttons or nav links, be sure to leave a space after the <i> tag for proper spacing. +

-
+
-

Icon examples

-

Use them in buttons, button groups for a toolbar, navigation, or prepended form inputs.

+

Icon examples

+

Use them in buttons, button groups for a toolbar, navigation, or prepended form inputs.

-

Buttons

-
-
-
- - - - -
- -
-
- -

Navigation

- - -

Form fields

-
-
- -
-
- +

Buttons

+
+
+
+ + + + +
+
- -
+

Navigation

+ + +

Form fields

+
+
+ +
+
+ +
+
+
+
+ +
+
+
diff --git a/docs/components.html b/docs/components.html index 11a23efb61..d95d359737 100644 --- a/docs/components.html +++ b/docs/components.html @@ -78,53 +78,54 @@
-
+
+
- -
- -
+ +
+ +
- - +

Aligning the menus

+

...

+ - -
- - -

Examples

-

Two basic options, along with two more specific variations.

- -

Single button group

-

Wrap a series of buttons with .btn in .btn-group.

-
-
- - - + +
+ + +

Examples

+

Two basic options, along with two more specific variations.

+ +

Single button group

+

Wrap a series of buttons with .btn in .btn-group.

+
+
+ + + +
-
 <div class="btn-group">
   <button class="btn">1</button>
@@ -196,26 +197,26 @@
 </div>
 
-

Multiple button groups

-

Combine sets of <div class="btn-group"> into a <div class="btn-toolbar"> for more complex components.

-
-
-
- - - - -
-
- - - -
-
- +

Multiple button groups

+

Combine sets of <div class="btn-group"> into a <div class="btn-toolbar"> for more complex components.

+
+
+
+ + + + +
+
+ + + +
+
+ +
-
 <div class="btn-toolbar">
   <div class="btn-group">
@@ -224,16 +225,16 @@
 </div>
 
-

Vertical button groups

-

Make a set of buttons appear vertically stacked rather than horizontally.

-
-
- - - - +

Vertical button groups

+

Make a set of buttons appear vertically stacked rather than horizontally.

+
+
+ + + + +
-
 <div class="btn-group btn-group-vertical">
   ...
@@ -241,102 +242,102 @@
 
-
+
-

Checkbox and radio flavors

-

Button groups can also function as radios, where only one button may be active, or checkboxes, where any number of buttons may be active. View the Javascript docs for that.

+

Checkbox and radio flavors

+

Button groups can also function as radios, where only one button may be active, or checkboxes, where any number of buttons may be active. View the Javascript docs for that.

-

Dropdowns in button groups

-

Heads up! Buttons with dropdowns must be individually wrapped in their own .btn-group within a .btn-toolbar for proper rendering.

-
+

Dropdowns in button groups

+

Heads up! Buttons with dropdowns must be individually wrapped in their own .btn-group within a .btn-toolbar for proper rendering.

+ - -
- + +
+ -

Overview and examples

-

Use any button to trigger a dropdown menu by placing it within a .btn-group and providing the proper menu markup.

- +

Overview and examples

+

Use any button to trigger a dropdown menu by placing it within a .btn-group and providing the proper menu markup.

+
 <div class="btn-group">
   <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
@@ -349,134 +350,134 @@
 </div>
 
-

Works with all button sizes

-

Button dropdowns work at any size. your button sizes to .btn-large, .btn-small, or .btn-mini.

-
-
-
- - -
-
- - -
- -
-
+

Works with all button sizes

+

Button dropdowns work at any size. your button sizes to .btn-large, .btn-small, or .btn-mini.

+
+
+
+ + +
+
+ + +
+ +
+
-

Requires javascript

-

Button dropdowns require the Bootstrap dropdown plugin to function.

-

In some cases—like mobile—dropdown menus will extend outside the viewport. You need to resolve the alignment manually or with custom javascript.

+

Requires javascript

+

Button dropdowns require the Bootstrap dropdown plugin to function.

+

In some cases—like mobile—dropdown menus will extend outside the viewport. You need to resolve the alignment manually or with custom javascript.

-
+
-

Split button dropdowns

-

Building on the button group styles and markup, we can easily create a split button. Split buttons feature a standard action on the left and a dropdown toggle on the right with contextual links.

- +

Split button dropdowns

+

Building on the button group styles and markup, we can easily create a split button. Split buttons feature a standard action on the left and a dropdown toggle on the right with contextual links.

+
 <div class="btn-group">
   <button class="btn">Action</button>
@@ -489,49 +490,49 @@
 </div>
 
-

Sizes

-

Utilize the extra button classes .btn-mini, .btn-small, or .btn-large for sizing.

-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
+

Sizes

+

Utilize the extra button classes .btn-mini, .btn-small, or .btn-large for sizing.

+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
 <div class="btn-group">
   <button class="btn btn-mini">Action</button>
@@ -544,34 +545,34 @@
 </div>
 
-

Dropup menus

-

Dropdown menus can also be toggled from the bottom up by adding a single class to the immediate parent of .dropdown-menu. It will flip the direction of the .caret and reposition the menu itself to move from the bottom up instead of top down.

-
-
- -
- - - -
+

Dropup menus

+

Dropdown menus can also be toggled from the bottom up by adding a single class to the immediate parent of .dropdown-menu. It will flip the direction of the .caret and reposition the menu itself to move from the bottom up instead of top down.

+
+
+ +
+ + + +
+
-
 <div class="btn-group dropup">
   <button class="btn">Dropup</button>
@@ -584,29 +585,29 @@
 </div>
 
-
+
- - - - - - - -
- - -

Standard pagination

-

Simple pagination inspired by Rdio, great for apps and search results. The large block is hard to miss, easily scalable, and provides large click areas.

-
-
 <div class="pagination">
   <ul>
@@ -1345,26 +1346,26 @@
 
-
+
-

Options

+

Options

-

Disabled and active states

-

Links are customizable for different circumstances. Use .disabled for unclickable links and .active to indicate the current page.

-
-
 <div class="pagination ">
   <ul>
@@ -1375,39 +1376,39 @@
 </div>
 
-

Alignment

-

Add one of two optional classes to change the alignment of pagination links: .pagination-centered and .pagination-right.

-
-
 <div class="pagination pagination-centered">
   ...
 </div>
 
-
-
 <div class="pagination pagination-right">
   ...
@@ -1415,20 +1416,20 @@
 
-
+
-

Pager

-

Quick previous and next links for simple pagination implementations with light markup and styles. It's great for simple sites like blogs or magazines.

+

Pager

+

Quick previous and next links for simple pagination implementations with light markup and styles. It's great for simple sites like blogs or magazines.

-

Default example

-

By default, the pager centers links.

-
- -
+

Default example

+

By default, the pager centers links.

+
+ +
 <ul class="pager">
   <li><a href="#">Previous</a></li>
@@ -1436,14 +1437,14 @@
 </ul>
 
-

Aligned links

-

Alternatively, you can align each link to the sides:

-
- -
+

Aligned links

+

Alternatively, you can align each link to the sides:

+
+ +
 <ul class="pager">
   <li class="previous">
@@ -1455,14 +1456,14 @@
 </ul>
 
-

Optional disabled state

-

Pager links also use the general .disabled utility class from the pagination.

-
- -
+

Optional disabled state

+

Pager links also use the general .disabled utility class from the pagination.

+
+ +
 <ul class="pager">
   <li class="previous disabled">
@@ -1472,175 +1473,175 @@
 </ul>
 
-
+ - -
- -

Labels

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
LabelsMarkup
- Default - - <span class="label">Default</span> -
- Success - - <span class="label label-success">Success</span> -
- Warning - - <span class="label label-warning">Warning</span> -
- Important - - <span class="label label-important">Important</span> -
- Info - - <span class="label label-info">Info</span> -
- Inverse - - <span class="label label-inverse">Inverse</span> -
- -

Badges

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameExampleMarkup
- Default - - 1 - - <span class="badge">1</span> -
- Success - - 2 - - <span class="badge badge-success">2</span> -
- Warning - - 4 - - <span class="badge badge-warning">4</span> -
- Important - - 6 - - <span class="badge badge-important">6</span> -
- Info - - 8 - - <span class="badge badge-info">8</span> -
- Inverse - - 10 - - <span class="badge badge-inverse">10</span> -
- -
- - - - -
- - -

Hero unit

-

A lightweight, flexible component to showcase key content on your site. It works well on marketing and content-heavy sites.

-
-
-

Hello, world!

-

This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.

-

Learn more

+ +
+ +

Labels

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
LabelsMarkup
+ Default + + <span class="label">Default</span> +
+ Success + + <span class="label label-success">Success</span> +
+ Warning + + <span class="label label-warning">Warning</span> +
+ Important + + <span class="label label-important">Important</span> +
+ Info + + <span class="label label-info">Info</span> +
+ Inverse + + <span class="label label-inverse">Inverse</span> +
+ +

Badges

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameExampleMarkup
+ Default + + 1 + + <span class="badge">1</span> +
+ Success + + 2 + + <span class="badge badge-success">2</span> +
+ Warning + + 4 + + <span class="badge badge-warning">4</span> +
+ Important + + 6 + + <span class="badge badge-important">6</span> +
+ Info + + 8 + + <span class="badge badge-info">8</span> +
+ Inverse + + 10 + + <span class="badge badge-inverse">10</span> +
+ +
+ + + + +
+ + +

Hero unit

+

A lightweight, flexible component to showcase key content on your site. It works well on marketing and content-heavy sites.

+
+
+

Hello, world!

+

This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.

+

Learn more

+
-
 <div class="hero-unit">
   <h1>Heading</h1>
@@ -1653,105 +1654,105 @@
 </div>
 
-

Page header

-

A simple shell for an h1 to appropriately space out and segment sections of content on a page. It can utilize the h1's default small, element as well most other components (with additional styles).

-
-
 <div class="page-header">
   <h1>Example page header</h1>
 </div>
 
-
+ - -
- + +
+ -

Default thumbnails

-

By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.

-
- -
+

Default thumbnails

+

By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.

+
+ +
-

Highly customizable

-

With a bit of extra markup, it's possible to add any kind of HTML content like headings, paragraphs, or buttons into thumbnails.

-
-
    -
  • -
    - -
    -

    Thumbnail label

    -

    Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

    -

    Action Action

    +

    Highly customizable

    +

    With a bit of extra markup, it's possible to add any kind of HTML content like headings, paragraphs, or buttons into thumbnails.

    +
    +
      +
    • +
      + +
      +

      Thumbnail label

      +

      Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

      +

      Action Action

      +
      -
    -
  • -
  • -
    - -
    -

    Thumbnail label

    -

    Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

    -

    Action Action

    +
  • +
  • +
    + +
    +

    Thumbnail label

    +

    Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

    +

    Action Action

    +
    -
- -
  • -
    - -
    -

    Thumbnail label

    -

    Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

    -

    Action Action

    +
  • +
  • +
    + +
    +

    Thumbnail label

    +

    Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

    +

    Action Action

    +
    -
  • - - -
    + + +
    -

    Why use thumbnails

    -

    Thumbnails (previously .media-grid up until v1.4) are great for grids of photos or videos, image search results, retail products, portfolios, and much more. They can be links or static content.

    +

    Why use thumbnails

    +

    Thumbnails (previously .media-grid up until v1.4) are great for grids of photos or videos, image search results, retail products, portfolios, and much more. They can be links or static content.

    -

    Simple, flexible markup

    -

    Thumbnail markup is simple—a ul with any number of li elements is all that is required. It's also super flexible, allowing for any type of content with just a bit more markup to wrap your contents.

    +

    Simple, flexible markup

    +

    Thumbnail markup is simple—a ul with any number of li elements is all that is required. It's also super flexible, allowing for any type of content with just a bit more markup to wrap your contents.

    -

    Uses grid column sizes

    -

    Lastly, the thumbnails component uses existing grid system classes—like .span2 or .span3—for control of thumbnail dimensions.

    +

    Uses grid column sizes

    +

    Lastly, the thumbnails component uses existing grid system classes—like .span2 or .span3—for control of thumbnail dimensions.

    -

    Markup

    -

    As mentioned previously, the required markup for thumbnails is light and straightforward. Here's a look at the default setup for linked images:

    +

    Markup

    +

    As mentioned previously, the required markup for thumbnails is light and straightforward. Here's a look at the default setup for linked images:

     <ul class="thumbnails">
       <li class="span4">
    @@ -1762,7 +1763,7 @@
       ...
     </ul>
     
    -

    For custom HTML content in thumbnails, the markup changes slightly. To allow block level content anywhere, we swap the <a> for a <div> like so:

    +

    For custom HTML content in thumbnails, the markup changes slightly. To allow block level content anywhere, we swap the <a> for a <div> like so:

     <ul class="thumbnails">
       <li class="span4">
    @@ -1776,55 +1777,55 @@
     </ul>
     
    -

    More examples

    -

    Explore all your options with the various grid classes available to you. You can also mix and match different sizes.

    - +

    More examples

    +

    Explore all your options with the various grid classes available to you. You can also mix and match different sizes.

    + - + - -
    - - -

    Default alert

    -

    Wrap any text and an optional dismiss button in .alert for a basic warning alert message.

    -
    -
    - - Warning! Best check yo self, you're not looking too good. + +
    + + +

    Default alert

    +

    Wrap any text and an optional dismiss button in .alert for a basic warning alert message.

    +
    +
    + + Warning! Best check yo self, you're not looking too good. +
    -
     <div class="alert">
       <button type="button" class="close" data-dismiss="alert">×</button>
    @@ -1832,32 +1833,28 @@
     </div>
     
    -

    Dismiss buttons

    -

    Mobile Safari and Mobile Opera browsers, in addition to the data-dismiss="alert" attribute, require an href="#" for the dismissal of alerts when using an <a> tag.

    -
    -<a href="#" class="close" data-dismiss="alert">×</button>
    -
    -

    Alternatively, you may use a <button> element with the data attribute, which we have opted to do for our docs. When using <button>, you must include type="button" or your forms may not submit.

    -
    -<button type="button" class="close" data-dismiss="alert">×</button>
    -
    +

    Dismiss buttons

    +

    Mobile Safari and Mobile Opera browsers, in addition to the data-dismiss="alert" attribute, require an href="#" for the dismissal of alerts when using an <a> tag.

    +
    <a href="#" class="close" data-dismiss="alert">×</button>
    +

    Alternatively, you may use a <button> element with the data attribute, which we have opted to do for our docs. When using <button>, you must include type="button" or your forms may not submit.

    +
    <button type="button" class="close" data-dismiss="alert">×</button>
    -

    Dismiss alerts via javascript

    -

    Use the alerts jQuery plugin for quick and easy dismissal of alerts.

    +

    Dismiss alerts via javascript

    +

    Use the alerts jQuery plugin for quick and easy dismissal of alerts.

    -
    +
    -

    Options

    -

    For longer messages, increase the padding on the top and bottom of the alert wrapper by adding .alert-block.

    -
    -
    - -

    Warning!

    -

    Best check yo self, you're not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

    +

    Options

    +

    For longer messages, increase the padding on the top and bottom of the alert wrapper by adding .alert-block.

    +
    +
    + +

    Warning!

    +

    Best check yo self, you're not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

    +
    -
     <div class="alert alert-block">
       <a class="close" data-dismiss="alert" href="#">&times;</a>
    @@ -1867,97 +1864,97 @@
     
    -
    +
    -

    Contextual alternatives

    -

    Add optional classes to change an alert's connotation.

    +

    Contextual alternatives

    +

    Add optional classes to change an alert's connotation.

    -

    Error or danger

    -
    -
    - - Oh snap! Change a few things up and try submitting again. +

    Error or danger

    +
    +
    + + Oh snap! Change a few things up and try submitting again. +
    -
     <div class="alert alert-error">
       ...
     </div>
     
    -

    Success

    -
    -
    - - Well done! You successfully read this important alert message. +

    Success

    +
    +
    + + Well done! You successfully read this important alert message. +
    -
     <div class="alert alert-success">
       ...
     </div>
     
    -

    Information

    -
    -
    - - Heads up! This alert needs your attention, but it's not super important. +

    Information

    +
    +
    + + Heads up! This alert needs your attention, but it's not super important. +
    -
     <div class="alert alert-info">
       ...
     </div>
     
    -
    + - -
    - - -

    Examples and markup

    - -

    Basic

    -

    Default progress bar with a vertical gradient.

    -
    -
    -
    + +
    + + +

    Examples and markup

    + +

    Basic

    +

    Default progress bar with a vertical gradient.

    +
    +
    +
    +
    -
     <div class="progress">
       <div class="bar" style="width: 60%;"></div>
     </div>
     
    -

    Striped

    -

    Uses a gradient to create a striped effect. Not available in IE7-8.

    -
    -
    -
    +

    Striped

    +

    Uses a gradient to create a striped effect. Not available in IE7-8.

    +
    +
    +
    +
    -
     <div class="progress progress-striped">
       <div class="bar" style="width: 20%;"></div>
     </div>
     
    -

    Animated

    -

    Add .active to .progress-striped to animate the stripes right to left. Not available in all versions of IE.

    -
    -
    -
    +

    Animated

    +

    Add .active to .progress-striped to animate the stripes right to left. Not available in all versions of IE.

    +
    +
    +
    +
    -
     <div class="progress progress-striped active">
       <div class="bar" style="width: 40%;"></div>
    @@ -1965,27 +1962,27 @@
     
    -
    +
    -

    Options

    +

    Options

    -

    Additional colors

    -

    Progress bars use some of the same button and alert classes for consistent styles.

    -
    -
    -
    +

    Additional colors

    +

    Progress bars use some of the same button and alert classes for consistent styles.

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
     <div class="progress progress-info">
       <div class="bar" style="width: 20%"></div>
    @@ -2001,22 +1998,22 @@
     </div>
     
    -

    Striped bars

    -

    Similar to the solid colors, we have varied striped progress bars.

    -
    -
    -
    +

    Striped bars

    +

    Similar to the solid colors, we have varied striped progress bars.

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
     <div class="progress progress-info progress-striped">
       <div class="bar" style="width: 20%"></div>
    @@ -2033,74 +2030,75 @@
     
    -
    +
    -

    Browser support

    -

    Progress bars use CSS3 gradients, transitions, and animations to achieve all their effects. These features are not supported in IE7-9 or older versions of Firefox.

    -

    Opera and IE do not support animations at this time.

    +

    Browser support

    +

    Progress bars use CSS3 gradients, transitions, and animations to achieve all their effects. These features are not supported in IE7-9 or older versions of Firefox.

    +

    Opera and IE do not support animations at this time.

    -
    + - -
    - - -

    Wells

    -

    Use the well as a simple effect on an element to give it an inset effect.

    -
    -
    - Look, I'm in a well! + +
    + + +

    Wells

    +

    Use the well as a simple effect on an element to give it an inset effect.

    +
    +
    + Look, I'm in a well! +
    -
     <div class="well">
       ...
     </div>
     
    -

    Optional classes

    -

    Control padding and rounded corners with two optional modifier classes.

    -
    -
    - Look, I'm in a well! +

    Optional classes

    +

    Control padding and rounded corners with two optional modifier classes.

    +
    +
    + Look, I'm in a well! +
    -
     <div class="well well-large">
       ...
     </div>
     
    -
    -
    - Look, I'm in a well! +
    +
    + Look, I'm in a well! +
    -
     <div class="well well-small">
       ...
     </div>
     
    -

    Close icon

    -

    Use the generic close icon for dismissing content like modals and alerts.

    -
    -

    -
    -
    <button class="close">&times;</button>
    -

    iOS devices require an href="#" for click events if you rather use an anchor.

    -
    <a class="close" href="#">&times;</a>
    -

    Helper classes

    -

    Simple, focused classes for small display or behavior tweaks.

    +

    Close icon

    +

    Use the generic close icon for dismissing content like modals and alerts.

    +
    +

    +
    +
    <button class="close">&times;</button>
    +

    iOS devices require an href="#" for click events if you rather use an anchor.

    +
    <a class="close" href="#">&times;</a>
    -

    .pull-left

    -

    Float an element left

    +

    Helper classes

    +

    Simple, focused classes for small display or behavior tweaks.

    + +

    .pull-left

    +

    Float an element left

     class="pull-left"
     
    @@ -2110,8 +2108,8 @@ class="pull-left" } -

    .pull-right

    -

    Float an element right

    +

    .pull-right

    +

    Float an element right

     class="pull-right"
     
    @@ -2121,8 +2119,8 @@ class="pull-right" } -

    .muted

    -

    Change an element's color to #999

    +

    .muted

    +

    Change an element's color to #999

     class="muted"
     
    @@ -2132,8 +2130,8 @@ class="muted" } -

    .clearfix

    -

    Clear the float on any element

    +

    .clearfix

    +

    Clear the float on any element

     class="clearfix"
     
    @@ -2151,11 +2149,13 @@ class="clearfix" } -
    + +
    +
    diff --git a/docs/customize.html b/docs/customize.html index 160b02c4b6..72f2d81b19 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -74,357 +74,360 @@

    Customize and download

    -

    Download the full repository or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.

    +

    Download Bootstrap or customize variables, components, javascript plugins, and more.

    -
    +
    + +
    + + +
    + +
    - -
    -
    - + + +
    +
    + +
    +
    +

    Scaffolding

    + + + + +

    Base CSS

    + + + + + + + +
    +
    +

    Components

    + + + + + + + + + + +

    JS Components

    + + + + + + +
    +
    +

    Miscellaneous

    + + + + +

    Responsive

    + + + + + +
    +
    +
    + +
    + +
    +
    + + + + + + +
    +
    + + + + + + +
    +
    +

    Heads up!

    +

    All checked plugins will be compiled into a single file, bootstrap.js. All plugins require the latest version of jQuery to be included.

    +
    +
    +
    + + +
    + +
    +
    +

    Scaffolding

    + + + + + +

    Links

    + + + + +

    Colors

    + + + + + + + + + + + + + + + +

    Sprites

    + + + + + +
    +
    +

    Grid system

    + + + + + + + + + + + + + + + +

    Typography

    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    +

    Tables

    + + + + + + + + + +

    Navbar

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    Dropdowns

    + + + + + + + + + + +
    +
    +

    Forms

    + + + + + + + + + + + + + + + + + + +

    Form states & alerts

    + + + + + + + + + + + + + + + + +
    +
    +
    + +
    + +
    + Customize and Download +

    What's included?

    +

    Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.

    +
    +
    +
    + + + +
    -
    - - - -
    -
    - -
    -
    -

    Scaffolding

    - - - - -

    Base CSS

    - - - - - - - -
    -
    -

    Components

    - - - - - - - - - - -

    JS Components

    - - - - - - -
    -
    -

    Miscellaneous

    - - - - -

    Responsive

    - - - - - -
    -
    -
    - -
    - -
    -
    - - - - - - -
    -
    - - - - - - -
    -
    -

    Heads up!

    -

    All checked plugins will be compiled into a single file, bootstrap.js. All plugins require the latest version of jQuery to be included.

    -
    -
    -
    - - -
    - -
    -
    -

    Scaffolding

    - - - - - -

    Links

    - - - - -

    Colors

    - - - - - - - - - - - - - - - -

    Sprites

    - - - - - -
    -
    -

    Grid system

    - - - - - - - - - - - - - - - -

    Typography

    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    -

    Tables

    - - - - - - - - - -

    Navbar

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    Dropdowns

    - - - - - - - - - - -
    -
    -

    Forms

    - - - - - - - - - - - - - - - - - - -

    Form states & alerts

    - - - - - - - - - - - - - - - - -
    -
    -
    - -
    - -
    - Customize and Download -

    What's included?

    -

    Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.

    -
    -
    -
    - - - -
    diff --git a/docs/getting-started.html b/docs/getting-started.html index d2d261fd1e..4f353603af 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -78,55 +78,58 @@
    -
    +
    +
    -
    - -
    + +
    + +
    - -
    - -

    Before downloading, be sure to have a code editor (we recommend Sublime Text 2) and some working knowledge of HTML and CSS. We won't walk through the source files here, but they are available for download. We'll focus on getting started with our the compiled Bootstrap files.

    - -
    -
    -

    Download compiled

    -

    Fastest way to get started: get the compiled and minified versions of our CSS, JS, and images. No docs or original source files.

    -

    Download Bootstrap

    + +
    + -
    -

    Download source

    -

    Get the original files for all CSS and Javasript, along with a local copy of the docs by downloading the latest version directly from GitHub.

    -

    Download Bootstrap source

    +

    Before downloading, be sure to have a code editor (we recommend Sublime Text 2) and some working knowledge of HTML and CSS. We won't walk through the source files here, but they are available for download. We'll focus on getting started with our the compiled Bootstrap files.

    + +
    +
    +

    Download compiled

    +

    Fastest way to get started: get the compiled and minified versions of our CSS, JS, and images. No docs or original source files.

    +

    Download Bootstrap

    +
    +
    +

    Download source

    +

    Get the original files for all CSS and Javasript, along with a local copy of the docs by downloading the latest version directly from GitHub.

    +

    Download Bootstrap source

    +
    -
    -
    +
    - -
    - -

    Once downloaded, unzip the compressed folder to see the structure of (the compiled) Bootstrap. You'll see something like this:

    + +
    + +

    Once downloaded, unzip the compressed folder to see the structure of (the compiled) Bootstrap. You'll see something like this:

       bootstrap/
       ├── css/
    @@ -140,67 +143,67 @@
       │   ├── glyphicons-halflings-white.png
       └── README.md
     
    -

    This is the most basic form of Bootstrap: compiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (bootstrap.*), as well as compiled and minified CSS and JS (bootstrap.min.*). The image files are compressed using ImageOptim, a Mac app for compressing PNGs.

    -
    +

    This is the most basic form of Bootstrap: compiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (bootstrap.*), as well as compiled and minified CSS and JS (bootstrap.min.*). The image files are compressed using ImageOptim, a Mac app for compressing PNGs.

    +
    - -
    - -

    Bootstrap comes equipped with HTML, CSS, and JS for all sorts of things, but they can be summarized with a handful of categories visible at the top of the Bootstrap documentation.

    + +
    + +

    Bootstrap comes equipped with HTML, CSS, and JS for all sorts of things, but they can be summarized with a handful of categories visible at the top of the Bootstrap documentation.

    -

    Scaffolding

    -

    Global styles for the body to reset type and background, link styles, grid system, and two simple layouts.

    +

    Scaffolding

    +

    Global styles for the body to reset type and background, link styles, grid system, and two simple layouts.

    -

    Base CSS

    -

    Styles for common HTML elements like typography, code, tables, forms, and buttons. Also includes Glyphicons, a great little icon set.

    +

    Base CSS

    +

    Styles for common HTML elements like typography, code, tables, forms, and buttons. Also includes Glyphicons, a great little icon set.

    -

    Components

    -

    Basic styles for common interface components like tabs and pills, navbar, alerts, page headers, and more.

    +

    Components

    +

    Basic styles for common interface components like tabs and pills, navbar, alerts, page headers, and more.

    -

    Javascript plugins

    -

    Similar to Components, these Javascript plugins are interactive components for things like tooltips, popovers, modals, and more.

    +

    Javascript plugins

    +

    Similar to Components, these Javascript plugins are interactive components for things like tooltips, popovers, modals, and more.

    -
    +
    -

    List of components

    -

    Together, the Components and Javascript plugins sections provide the following interface elements:

    -
      -
    • Button groups
    • -
    • Button dropdowns
    • -
    • Navigational tabs, pills, and lists
    • -
    • Navbar
    • -
    • Labels
    • -
    • Badges
    • -
    • Page headers and hero unit
    • -
    • Thumbnails
    • -
    • Alerts
    • -
    • Progress bars
    • -
    • Modals
    • -
    • Dropdowns
    • -
    • Tooltips
    • -
    • Popovers
    • -
    • Accordion
    • -
    • Carousel
    • -
    • Typeahead
    • -
    -

    In future guides, we may walk through these components individually in more detail. Until then, look for each of these in the documentation for information on how to utilize and customize them.

    -
    +

    List of components

    +

    Together, the Components and Javascript plugins sections provide the following interface elements:

    +
      +
    • Button groups
    • +
    • Button dropdowns
    • +
    • Navigational tabs, pills, and lists
    • +
    • Navbar
    • +
    • Labels
    • +
    • Badges
    • +
    • Page headers and hero unit
    • +
    • Thumbnails
    • +
    • Alerts
    • +
    • Progress bars
    • +
    • Modals
    • +
    • Dropdowns
    • +
    • Tooltips
    • +
    • Popovers
    • +
    • Accordion
    • +
    • Carousel
    • +
    • Typeahead
    • +
    +

    In future guides, we may walk through these components individually in more detail. Until then, look for each of these in the documentation for information on how to utilize and customize them.

    +
    - -
    - -

    With a brief intro into the contents out of the way, we can focus putting Bootstrap to use. To do that, we'll utilize a basic HTML template that includes everything we mentioned in the File structure.

    -

    Now, here's a look at a typical HTML file:

    + +
    + +

    With a brief intro into the contents out of the way, we can focus putting Bootstrap to use. To do that, we'll utilize a basic HTML template that includes everything we mentioned in the File structure.

    +

    Now, here's a look at a typical HTML file:

     <html>
       <head>
    @@ -211,7 +214,7 @@
       </body>
     </html>
     
    -

    To make this a Bootstrapped template, just include the appropriate CSS and JS files:

    +

    To make this a Bootstrapped template, just include the appropriate CSS and JS files:

     <html>
       <head>
    @@ -225,61 +228,63 @@
       </body>
     </html>
     
    -

    And you're set! With those two files added, you can begin to develop any site or application with Bootstrap.

    -
    +

    And you're set! With those two files added, you can begin to develop any site or application with Bootstrap.

    +
    - -
    - -

    Move beyond the base template with a few example layouts. We encourage folks to iterate on these examples and not simply use them as an end result.

    -
      -
    • - - - -

      Basic marketing site

      -

      Featuring a hero unit for a primary message and three supporting elements.

      -
    • -
    • - - - -

      Fluid layout

      -

      Uses our new responsive, fluid grid system to create a seamless liquid layout.

      -
    • -
    • - - - -

      Starter template

      -

      A barebones HTML document with all the Bootstrap CSS and javascript included.

      -
    • -
    -
    + +
    + +

    Move beyond the base template with a few example layouts. We encourage folks to iterate on these examples and not simply use them as an end result.

    +
      +
    • + + + +

      Basic marketing site

      +

      Featuring a hero unit for a primary message and three supporting elements.

      +
    • +
    • + + + +

      Fluid layout

      +

      Uses our new responsive, fluid grid system to create a seamless liquid layout.

      +
    • +
    • + + + +

      Starter template

      +

      A barebones HTML document with all the Bootstrap CSS and javascript included.

      +
    • +
    +
    - -
    - -

    Head to the docs for information, examples, and code snippets, or take the next leap and customize Bootstrap for any upcoming project.

    - Visit the Bootstrap docs - Customize Bootstrap -
    + +
    + +

    Head to the docs for information, examples, and code snippets, or take the next leap and customize Bootstrap for any upcoming project.

    + Visit the Bootstrap docs + Customize Bootstrap +
    +
    +
    diff --git a/docs/index.html b/docs/index.html index 92e9075c9d..11f5ab6e64 100644 --- a/docs/index.html +++ b/docs/index.html @@ -82,80 +82,84 @@
    -
    -
    - -
    -
    +
    -
    - -
    - -

    Introducing Bootstrap.

    - - -
    -
    - -

    By nerds, for nerds.

    -

    Built at Twitter by @mdo and @fat, Bootstrap utilizes LESS CSS, is compiled via Node, and is managed through GitHub to help nerds do awesome stuff on the web.

    -
    -
    - -

    Made for everyone.

    -

    Bootstrap was made to not only look and behave great in the latest desktop browsers (as well as IE7!), but in tablet and smartphone browsers via responsive CSS as well.

    -
    -
    - -

    Packed with features.

    -

    A 12-column responsive grid, dozens of components, javascript plugins, typography, form controls, and even a web-based Customizer to make Bootstrap your own.

    -
    -
    - -
    - -

    Built with Bootstrap.

    - -
    -
    -
    +
    + +
    + +

    Introducing Bootstrap.

    + + +
    +
    + +

    By nerds, for nerds.

    +

    Built at Twitter by @mdo and @fat, Bootstrap utilizes LESS CSS, is compiled via Node, and is managed through GitHub to help nerds do awesome stuff on the web.

    +
    +
    + +

    Made for everyone.

    +

    Bootstrap was made to not only look and behave great in the latest desktop browsers (as well as IE7!), but in tablet and smartphone browsers via responsive CSS as well.

    +
    +
    + +

    Packed with features.

    +

    A 12-column responsive grid, dozens of components, javascript plugins, typography, form controls, and even a web-based Customizer to make Bootstrap your own.

    +
    +
    + +
    + +

    Built with Bootstrap.

    + +
    + +
    + +
    + +
    diff --git a/docs/javascript.html b/docs/javascript.html index 70355957c6..2e51ba527d 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -78,104 +78,105 @@
    -
    +
    +
    - -
    - -
    - - - - -
    - - -

    Individual or compiled

    -

    If you have downloaded the latest version of Bootstrap, both bootstrap.js and bootstrap.min.js contain all of these plugins.

    - -

    Data attributes

    -

    ...

    - -

    Programmatic API

    -

    ...

    - - - -
    - - - - -
    - -

    About transitions

    -

    For simple transition effects, include bootstrap-transition.js once alongside the other JS files. If you're using the compiled (or minified) bootstrap.js, there is no need to include this—it's already there.

    -

    Use cases

    -

    A few examples of the transition plugin:

    -
    +
    +
    - -
    - + +
    + + +

    Individual or compiled

    +

    If you have downloaded the latest version of Bootstrap, both bootstrap.js and bootstrap.min.js contain all of these plugins.

    + +

    Data attributes

    +

    ...

    + +

    Programmatic API

    +

    ...

    -

    Examples

    -

    Modals are streamlined, but flexible, dialog prompts with the minimum required functionality and smart defaults.

    -

    Static example

    -

    A rendered modal with header, body, and set of actions in the footer.

    -
    -
    + + + + +
    + +

    About transitions

    +

    For simple transition effects, include bootstrap-transition.js once alongside the other JS files. If you're using the compiled (or minified) bootstrap.js, there is no need to include this—it's already there.

    +

    Use cases

    +

    A few examples of the transition plugin:

    +
      +
    • Sliding or fading in modals
    • +
    • Fading out tabs
    • +
    • Fading out alerts
    • +
    • Sliding carousel panes
    • +
    + +
    + + + + +
    + + + +

    Examples

    +

    Modals are streamlined, but flexible, dialog prompts with the minimum required functionality and smart defaults.

    + +

    Static example

    +

    A rendered modal with header, body, and set of actions in the footer.

    +
    +
    -
     <div class="modal hide fade">
       <div class="modal-header">
    @@ -192,43 +193,43 @@
     </div>
     
    -

    Live demo

    -

    Toggle a modal via javascript by clicking the button below. It will slide down and fade in from the top of the page.

    - -
    +
    diff --git a/docs/scaffolding.html b/docs/scaffolding.html index e43b4db30f..dca452fd13 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -78,35 +78,35 @@
    +
    -
    +
    - - -
    - -
    + +
    + +
    - -
    - + +
    + -

    Requires HTML5 doctype

    -

    Bootstrap makes use of certain HTML elements and CSS properties that require the use of the HTML5 doctype. Include it at the beginning of all your projects.

    +

    Requires HTML5 doctype

    +

    Bootstrap makes use of certain HTML elements and CSS properties that require the use of the HTML5 doctype. Include it at the beginning of all your projects.

     <!DOCTYPE html>
     <html lang="en">
    @@ -114,84 +114,84 @@
     </html>
     
    -

    Typography and links

    -

    Bootstrap sets basic global display, typography, and link styles. Specifically, we:

    -
      -
    • Remove margin on the body
    • -
    • Set background-color: white; on the body
    • -
    • Use the @baseFontFamily, @baseFontSize, and @baseLineHeight attributes as our typographyic base
    • -
    • Set the global link color via @linkColor and apply link underlines only on :hover
    • -
    -

    These styles can be found within scaffolding.less.

    +

    Typography and links

    +

    Bootstrap sets basic global display, typography, and link styles. Specifically, we:

    +
      +
    • Remove margin on the body
    • +
    • Set background-color: white; on the body
    • +
    • Use the @baseFontFamily, @baseFontSize, and @baseLineHeight attributes as our typographyic base
    • +
    • Set the global link color via @linkColor and apply link underlines only on :hover
    • +
    +

    These styles can be found within scaffolding.less.

    -

    Reset via Normalize

    -

    With Bootstrap 2, the old reset block has been dropped in favor of Normalize.css, a project by Nicolas Gallagher that also powers the HTML5 Boilerplate. While we use much of Normalize within our reset.less, we have removed some elements specifically for Bootstrap.

    +

    Reset via Normalize

    +

    With Bootstrap 2, the old reset block has been dropped in favor of Normalize.css, a project by Nicolas Gallagher that also powers the HTML5 Boilerplate. While we use much of Normalize within our reset.less, we have removed some elements specifically for Bootstrap.

    -
    +
    - -
    - - -

    Live grid example

    -

    The default Bootstrap grid system utilizes 12 columns, making for a 940px wide container without responsive features enabled. With the responsive CSS file added, the grid adapts to be 724px and 1170px wide depending on your viewport. Below 767px viewports, the columns become fluid and stack vertically.

    -
    -
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    + +
    + -
    -
    2
    -
    3
    -
    4
    -
    -
    -
    4
    -
    5
    -
    -
    -
    9
    -
    -
    -

    Basic grid HTML

    -

    For a simple two column layout, create a .row and add the appropriate number of .span* columns. As this is a 12-column grid, each .span* spans a number of those 12 columns, and should always add up to 12 for each row (or the number of columns in the parent).

    +

    Live grid example

    +

    The default Bootstrap grid system utilizes 12 columns, making for a 940px wide container without responsive features enabled. With the responsive CSS file added, the grid adapts to be 724px and 1170px wide depending on your viewport. Below 767px viewports, the columns become fluid and stack vertically.

    +
    +
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    +
    +
    2
    +
    3
    +
    4
    +
    +
    +
    4
    +
    5
    +
    +
    +
    9
    +
    +
    + +

    Basic grid HTML

    +

    For a simple two column layout, create a .row and add the appropriate number of .span* columns. As this is a 12-column grid, each .span* spans a number of those 12 columns, and should always add up to 12 for each row (or the number of columns in the parent).

     <div class="row">
       <div class="span4">...</div>
       <div class="span8">...</div>
     </div>
     
    -

    Given this example, we have .span4 and .span8, making for 12 total columns and a complete row.

    +

    Given this example, we have .span4 and .span8, making for 12 total columns and a complete row.

    -

    Offsetting columns

    -

    Move columns to the left using .offset* classes. Each class increases the left margin of a column by a whole column. For example, .offset4 moves .span4 over four columns.

    -
    -
    -
    4
    -
    3 offset 2
    -
    -
    -
    3 offset 1
    -
    3 offset 2
    -
    -
    -
    6 offset 3
    -
    -
    +

    Offsetting columns

    +

    Move columns to the left using .offset* classes. Each class increases the left margin of a column by a whole column. For example, .offset4 moves .span4 over four columns.

    +
    +
    +
    4
    +
    3 offset 2
    +
    +
    +
    3 offset 1
    +
    3 offset 2
    +
    +
    +
    6 offset 3
    +
    +
     <div class="row">
       <div class="span4">...</div>
    @@ -199,7 +199,7 @@
     </div>
     
    -

    Nesting columns

    +

    Nesting columns

    To nest your content with the default grid, add a new .row and set of .span* columns within an existing .span* column. Nested rows should include a set of columns that add up to the number of columns of its parent.

    Example

    Here two nested .span4 columns are placed within a .span8.

    @@ -227,54 +227,54 @@ </div> </div> -
    + - -
    - + +
    + -

    Live fluid grid example

    -

    The fluid grid system uses percents instead of pixels for column widths. It has the same responsive capabilities as our fixed grid system, ensuring proper proportions for key screen resolutions and devices.

    -
    -
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    +

    Live fluid grid example

    +

    The fluid grid system uses percents instead of pixels for column widths. It has the same responsive capabilities as our fixed grid system, ensuring proper proportions for key screen resolutions and devices.

    +
    +
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    +
    +
    4
    +
    4
    +
    4
    +
    +
    +
    4
    +
    8
    +
    +
    +
    6
    +
    6
    +
    +
    +
    12
    +
    -
    -
    4
    -
    4
    -
    4
    -
    -
    -
    4
    -
    8
    -
    -
    -
    6
    -
    6
    -
    -
    -
    12
    -
    -
    -

    Basic fluid grid HTML

    -

    Make any row "fluid" by changing .row to .row-fluid. The column classes stay the exact same, making it easy to flip between fixed and fluid grids.

    +

    Basic fluid grid HTML

    +

    Make any row "fluid" by changing .row to .row-fluid. The column classes stay the exact same, making it easy to flip between fixed and fluid grids.

     <div class="row-fluid">
       <div class="span4">...</div>
    @@ -282,21 +282,21 @@
     </div>
     
    -

    Fluid offsetting

    -

    Operates the same way as the fixed grid system offsetting: add .offset* to any column to offset by that many columns.

    -
    -
    -
    4
    -
    4 offset 4
    -
    -
    -
    3 offset 3
    -
    3 offset 3
    -
    -
    -
    6 offset 6
    -
    -
    +

    Fluid offsetting

    +

    Operates the same way as the fixed grid system offsetting: add .offset* to any column to offset by that many columns.

    +
    +
    +
    4
    +
    4 offset 4
    +
    +
    +
    3 offset 3
    +
    3 offset 3
    +
    +
    +
    6 offset 6
    +
    +
     <div class="row-fluid">
       <div class="span4">...</div>
    @@ -304,21 +304,21 @@
     </div>
     
    -

    Fluid nesting

    -

    Nesting with fluid grids is a bit different: the number of nested columns should not match the parent's number of columns. Instead, each level of nested columns are reset because each row takes up 100% of the parent column.

    -
    -
    - Fluid 12 -
    -
    - Fluid 6 -
    -
    - Fluid 6 +

    Fluid nesting

    +

    Nesting with fluid grids is a bit different: the number of nested columns should not match the parent's number of columns. Instead, each level of nested columns are reset because each row takes up 100% of the parent column.

    +
    +
    + Fluid 12 +
    +
    + Fluid 6 +
    +
    + Fluid 6 +
    -
     <div class="row-fluid">
       <div class="span12">
    @@ -331,23 +331,23 @@
     </div>
     
    -
    +
    - -
    - + +
    + -

    Fixed layout

    -

    Provides a common fixed-width (and optionally responsive) layout with only <div class="container"> required.

    -
    -
    -
    +

    Fixed layout

    +

    Provides a common fixed-width (and optionally responsive) layout with only <div class="container"> required.

    +
    +
    +
     <body>
       <div class="container">
    @@ -356,12 +356,12 @@
     </body>
     
    -

    Fluid layout

    -

    Create a fluid, two-column page with <div class="container-fluid">—great for applications and docs.

    -
    -
    -
    -
    +

    Fluid layout

    +

    Create a fluid, two-column page with <div class="container-fluid">—great for applications and docs.

    +
    +
    +
    +
     <div class="container-fluid">
       <div class="row-fluid">
    @@ -374,78 +374,78 @@
       </div>
     </div>
     
    -
    +
    - -
    - + +
    + -

    Enabling responsive features

    -

    Turn on responsive CSS in your project by including the proper meta tag and additional stylesheet within the <head> of your document. If you've compiled Bootstrap from the Customize page, you need only include the meta tag.

    +

    Enabling responsive features

    +

    Turn on responsive CSS in your project by including the proper meta tag and additional stylesheet within the <head> of your document. If you've compiled Bootstrap from the Customize page, you need only include the meta tag.

     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link href="assets/css/bootstrap-responsive.css" rel="stylesheet">
     
    -

    Heads up! Bootstrap doesn't include responsive features by default at this time as not everything needs to be responsive. Instead of encouraging developers to remove this feature, we figure it best to enable it as needed.

    +

    Heads up! Bootstrap doesn't include responsive features by default at this time as not everything needs to be responsive. Instead of encouraging developers to remove this feature, we figure it best to enable it as needed.

    -

    About responsive Bootstrap

    - Responsive devices -

    Media queries allow for custom CSS based on a number of conditions—ratios, widths, display type, etc—but usually focuses around min-width and max-width.

    -
      -
    • Modify the width of column in our grid
    • -
    • Stack elements instead of float wherever necessary
    • -
    • Resize headings and text to be more appropriate for devices
    • -
    -

    Use media queries responsibly and only as a start to your mobile audiences. For larger projects, do consider dedicated code bases and not layers of media queries.

    +

    About responsive Bootstrap

    + Responsive devices +

    Media queries allow for custom CSS based on a number of conditions—ratios, widths, display type, etc—but usually focuses around min-width and max-width.

    +
      +
    • Modify the width of column in our grid
    • +
    • Stack elements instead of float wherever necessary
    • +
    • Resize headings and text to be more appropriate for devices
    • +
    +

    Use media queries responsibly and only as a start to your mobile audiences. For larger projects, do consider dedicated code bases and not layers of media queries.

    -

    Supported devices

    -

    Bootstrap supports a handful of media queries in a single file to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    LabelLayout widthColumn widthGutter width
    Phones480px and belowFluid columns, no fixed widths
    Phones to tablets767px and belowFluid columns, no fixed widths
    Portrait tablets768px and above42px20px
    Default980px and up60px20px
    Large display1200px and up70px30px
    +

    Supported devices

    +

    Bootstrap supports a handful of media queries in a single file to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    LabelLayout widthColumn widthGutter width
    Phones480px and belowFluid columns, no fixed widths
    Phones to tablets767px and belowFluid columns, no fixed widths
    Portrait tablets768px and above42px20px
    Default980px and up60px20px
    Large display1200px and up70px30px
     /* Landscape phones and down */
     @media (max-width: 480px) { ... }
    @@ -461,82 +461,84 @@
     
    -

    Responsive utility classes

    -

    For faster mobile-friendly development, use these utility classes for showing and hiding content by device. Below is a table of the available classes and their effect on a given media query layout (labeled by device). They can be found in responsive.less.

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    ClassPhones 767px and belowTablets 979px to 768pxDesktops Default
    .visible-phoneVisible
    .visible-tabletVisible
    .visible-desktopVisible
    .hidden-phoneVisibleVisible
    .hidden-tabletVisibleVisible
    .hidden-desktopVisibleVisible
    +

    Responsive utility classes

    +

    For faster mobile-friendly development, use these utility classes for showing and hiding content by device. Below is a table of the available classes and their effect on a given media query layout (labeled by device). They can be found in responsive.less.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ClassPhones 767px and belowTablets 979px to 768pxDesktops Default
    .visible-phoneVisible
    .visible-tabletVisible
    .visible-desktopVisible
    .hidden-phoneVisibleVisible
    .hidden-tabletVisibleVisible
    .hidden-desktopVisibleVisible
    -

    When to use

    -

    Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation.

    +

    When to use

    +

    Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation.

    -

    Responsive utilities test case

    -

    Resize your browser or load on different devices to test the above classes.

    -

    Visible on...

    -

    Green checkmarks indicate that class is visible in your current viewport.

    -
      -
    • Phone✔ Phone
    • -
    • Tablet✔ Tablet
    • -
    • Desktop✔ Desktop
    • -
    -

    Hidden on...

    -

    Here, green checkmarks indicate that class is hidden in your current viewport.

    -
      -
    • Phone✔ Phone
    • -
    • Tablet✔ Tablet
    • -
    • Desktop✔ Desktop
    • -
    +

    Responsive utilities test case

    +

    Resize your browser or load on different devices to test the above classes.

    +

    Visible on...

    +

    Green checkmarks indicate that class is visible in your current viewport.

    +
      +
    • Phone✔ Phone
    • +
    • Tablet✔ Tablet
    • +
    • Desktop✔ Desktop
    • +
    +

    Hidden on...

    +

    Here, green checkmarks indicate that class is hidden in your current viewport.

    +
      +
    • Phone✔ Phone
    • +
    • Tablet✔ Tablet
    • +
    • Desktop✔ Desktop
    • +
    -
    +
    +
    +
    diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 4819745913..34bd544745 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -7,135 +7,137 @@
    -
    +
    - -
    - -
    +
    + + +
    + +
    - -
    - + +
    + - {{! Headings }} -

    {{_i}}Headings{{/i}}

    -

    {{_i}}All HTML headings, <h1> through <h6> are available.{{/i}}

    -
    -

    h1. {{_i}}Heading 1{{/i}}

    -

    h2. {{_i}}Heading 2{{/i}}

    -

    h3. {{_i}}Heading 3{{/i}}

    -

    h4. {{_i}}Heading 4{{/i}}

    -
    h5. {{_i}}Heading 5{{/i}}
    -
    h6. {{_i}}Heading 6{{/i}}
    -
    + {{! Headings }} +

    {{_i}}Headings{{/i}}

    +

    {{_i}}All HTML headings, <h1> through <h6> are available.{{/i}}

    +
    +

    h1. {{_i}}Heading 1{{/i}}

    +

    h2. {{_i}}Heading 2{{/i}}

    +

    h3. {{_i}}Heading 3{{/i}}

    +

    h4. {{_i}}Heading 4{{/i}}

    +
    h5. {{_i}}Heading 5{{/i}}
    +
    h6. {{_i}}Heading 6{{/i}}
    +
    - {{! Body copy }} -

    {{_i}}Body copy{{/i}}

    -

    {{_i}}Bootstrap's global default font-size is 14px, with a line-height of 20px. This is applied to the <body> and all paragraphs. In addition, <p> (paragraphs) receive a bottom margin of half their line-height (9px by default).{{/i}}

    -
    -

    Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.

    -

    Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec ullamcorper nulla non metus auctor fringilla. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec ullamcorper nulla non metus auctor fringilla.

    -

    Maecenas sed diam eget risus varius blandit sit amet non magna. Donec id elit non mi porta gravida at eget metus. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.

    -
    -
    <p>...</p>
    + {{! Body copy }} +

    {{_i}}Body copy{{/i}}

    +

    {{_i}}Bootstrap's global default font-size is 14px, with a line-height of 20px. This is applied to the <body> and all paragraphs. In addition, <p> (paragraphs) receive a bottom margin of half their line-height (9px by default).{{/i}}

    +
    +

    Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.

    +

    Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec ullamcorper nulla non metus auctor fringilla. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec ullamcorper nulla non metus auctor fringilla.

    +

    Maecenas sed diam eget risus varius blandit sit amet non magna. Donec id elit non mi porta gravida at eget metus. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.

    +
    +
    <p>...</p>
    - {{! Body copy .lead }} -

    {{_i}}Lead body copy{{/i}}

    -

    {{_i}}Make a paragraph stand out by adding .lead.{{/i}}

    -
    -

    Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus.

    -
    -
    <p class="lead">...</p>
    + {{! Body copy .lead }} +

    {{_i}}Lead body copy{{/i}}

    +

    {{_i}}Make a paragraph stand out by adding .lead.{{/i}}

    +
    +

    Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus.

    +
    +
    <p class="lead">...</p>
    - {{! Using LESS }} -

    {{_i}}Built with Less{{/i}}

    -

    {{_i}}The typographic scale is based on two LESS variables in variables.less: @baseFontSize and @baseLineHeight. The first is the base font-size used throughout and the second is the base line-height. We use those variables and some simple math to create the margins, paddings, and line-heights of all our type and more. Customize them and Bootstrap adapts.{{/i}}

    + {{! Using LESS }} +

    {{_i}}Built with Less{{/i}}

    +

    {{_i}}The typographic scale is based on two LESS variables in variables.less: @baseFontSize and @baseLineHeight. The first is the base font-size used throughout and the second is the base line-height. We use those variables and some simple math to create the margins, paddings, and line-heights of all our type and more. Customize them and Bootstrap adapts.{{/i}}

    -
    +
    - {{! Emphasis }} -

    {{_i}}Emphasis{{/i}}

    -

    {{_i}}Make use of HTML's default emphasis tags, <strong> and <em>.{{/i}}

    + {{! Emphasis }} +

    {{_i}}Emphasis{{/i}}

    +

    {{_i}}Make use of HTML's default emphasis tags, <strong> and <em>.{{/i}}

    -

    <strong>

    -

    {{_i}}For emphasizing a snippet of text with important{{/i}}

    -
    -

    The following snippet of text is rendered as bold text.

    -
    -
    <strong>rendered as bold text</strong>
    +

    <strong>

    +

    {{_i}}For emphasizing a snippet of text with important{{/i}}

    +
    +

    The following snippet of text is rendered as bold text.

    +
    +
    <strong>rendered as bold text</strong>
    -

    <em>

    -

    {{_i}}For emphasizing a snippet of text with stress{{/i}}

    -
    -

    The following snippet of text is rendered as italicized text.

    -
    -
    <em>rendered as italicized text</em>
    +

    <em>

    +

    {{_i}}For emphasizing a snippet of text with stress{{/i}}

    +
    +

    The following snippet of text is rendered as italicized text.

    +
    +
    <em>rendered as italicized text</em>
    -

    {{_i}}Heads up!{{/i}} {{_i}}Feel free to use <b> and <i> in HTML5. <b> is meant to highlight words or phrases without conveying additional importance while <i> is mostly for voice, technical terms, etc.{{/i}}

    +

    {{_i}}Heads up!{{/i}} {{_i}}Feel free to use <b> and <i> in HTML5. <b> is meant to highlight words or phrases without conveying additional importance while <i> is mostly for voice, technical terms, etc.{{/i}}

    -
    +
    - {{! Abbreviations }} -

    {{_i}}Abbreviations{{/i}}

    -

    {{_i}}Stylized implemenation of HTML's <abbr> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a title attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.{{/i}}

    + {{! Abbreviations }} +

    {{_i}}Abbreviations{{/i}}

    +

    {{_i}}Stylized implemenation of HTML's <abbr> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a title attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.{{/i}}

    -

    <abbr>

    -

    {{_i}}For expanded text on long hover of an abbreviation, include the title attribute.{{/i}}

    -
    -

    {{_i}}An abbreviation of the word attribute is attr.{{/i}}

    -
    -
    <abbr title="attribute">attr</abbr>
    +

    <abbr>

    +

    {{_i}}For expanded text on long hover of an abbreviation, include the title attribute.{{/i}}

    +
    +

    {{_i}}An abbreviation of the word attribute is attr.{{/i}}

    +
    +
    <abbr title="attribute">attr</abbr>
    -

    <abbr class="initialism">

    -

    {{_i}}Add .initialism to an abbreviation for a slightly smaller font-size.{{/i}}

    -
    -

    {{_i}}HTML is the best thing since sliced bread.{{/i}}

    -
    -
    <abbr title="attribute" class="initialism">attr</abbr>
    +

    <abbr class="initialism">

    +

    {{_i}}Add .initialism to an abbreviation for a slightly smaller font-size.{{/i}}

    +
    +

    {{_i}}HTML is the best thing since sliced bread.{{/i}}

    +
    +
    <abbr title="attribute" class="initialism">attr</abbr>
    -
    +
    - {{! Addresses }} -

    {{_i}}Addresses{{/i}}

    -

    {{_i}}Present contact information for the nearest ancestor or the entire body of work.{{/i}}

    + {{! Addresses }} +

    {{_i}}Addresses{{/i}}

    +

    {{_i}}Present contact information for the nearest ancestor or the entire body of work.{{/i}}

    -

    <address>

    -

    {{_i}}Preserve formatting by ending all lines with <br>.{{/i}}

    -
    -
    - Twitter, Inc.
    - 795 Folsom Ave, Suite 600
    - San Francisco, CA 94107
    - P: (123) 456-7890 -
    -
    - {{_i}}Full Name{{/i}}
    - {{_i}}first.last@gmail.com{{/i}} -
    -
    +

    <address>

    +

    {{_i}}Preserve formatting by ending all lines with <br>.{{/i}}

    +
    +
    + Twitter, Inc.
    + 795 Folsom Ave, Suite 600
    + San Francisco, CA 94107
    + P: (123) 456-7890 +
    +
    + {{_i}}Full Name{{/i}}
    + {{_i}}first.last@gmail.com{{/i}} +
    +
     <address>
       <strong>Twitter, Inc.</strong><br>
    @@ -151,37 +153,37 @@
     
    -
    +
    - {{! Blockquotes }} -

    {{_i}}Blockquotes{{/i}}

    -

    {{_i}}For quoting blocks of content from another source within your document.{{/i}}

    + {{! Blockquotes }} +

    {{_i}}Blockquotes{{/i}}

    +

    {{_i}}For quoting blocks of content from another source within your document.{{/i}}

    -

    {{_i}}Default blockqoute{{/i}}

    -

    {{_i}}Wrap <blockquote> around any HTML as the quote. For straight quotes we recommend a <p>.{{/i}}

    -
    -
    -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

    -
    -
    +

    {{_i}}Default blockqoute{{/i}}

    +

    {{_i}}Wrap <blockquote> around any HTML as the quote. For straight quotes we recommend a <p>.{{/i}}

    +
    +
    +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

    +
    +
     <blockquote>
       <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
     </blockquote>
     
    -

    {{_i}}Blockquote options{{/i}}

    -

    {{_i}}Style and content changes for simple variations on a standard blockquote.{{/i}}

    +

    {{_i}}Blockquote options{{/i}}

    +

    {{_i}}Style and content changes for simple variations on a standard blockquote.{{/i}}

    -

    {{_i}}Naming a source{{/i}}

    -

    {{_i}}Add <small> tag for identifying the source. Wrap the name of the source work in <cite>.{{/i}}

    -
    -
    -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

    - {{_i}}Someone famous in Source Title{{/i}} -
    -
    +

    {{_i}}Naming a source{{/i}}

    +

    {{_i}}Add <small> tag for identifying the source. Wrap the name of the source work in <cite>.{{/i}}

    +
    +
    +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

    + {{_i}}Someone famous in Source Title{{/i}} +
    +
     <blockquote>
       <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
    @@ -189,14 +191,14 @@
     </blockquote>
     
    -

    {{_i}}Alternate displays{{/i}}

    -

    {{_i}}Use .pull-right for a floated, right-aligned blockquote.{{/i}}

    -
    -
    -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

    - {{_i}}Someone famous in Source Title{{/i}} -
    -
    +

    {{_i}}Alternate displays{{/i}}

    +

    {{_i}}Use .pull-right for a floated, right-aligned blockquote.{{/i}}

    +
    +
    +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

    + {{_i}}Someone famous in Source Title{{/i}} +
    +
     <blockquote class="pull-right">
       ...
    @@ -204,16 +206,63 @@
     
    -
    +
    - -

    {{_i}}Lists{{/i}}

    + +

    {{_i}}Lists{{/i}}

    -

    {{_i}}Unordered{{/i}}

    -

    {{_i}}A list of items in which the order does not explicitly matter.{{/i}}

    +

    {{_i}}Unordered{{/i}}

    +

    {{_i}}A list of items in which the order does not explicitly matter.{{/i}}

    +
    +
      +
    • Lorem ipsum dolor sit amet
    • +
    • Consectetur adipiscing elit
    • +
    • Integer molestie lorem at massa
    • +
    • Facilisis in pretium nisl aliquet
    • +
    • Nulla volutpat aliquam velit +
        +
      • Phasellus iaculis neque
      • +
      • Purus sodales ultricies
      • +
      • Vestibulum laoreet porttitor sem
      • +
      • Ac tristique libero volutpat at
      • +
      +
    • +
    • Faucibus porta lacus fringilla vel
    • +
    • Aenean sit amet erat nunc
    • +
    • Eget porttitor lorem
    • +
    +
    +
    +<ul>
    +  <li>...</li>
    +</ul>
    +
    + +

    {{_i}}Ordered{{/i}}

    +

    {{_i}}A list of items in which the order does explicitly matter.{{/i}}

    +
    +
      +
    1. Lorem ipsum dolor sit amet
    2. +
    3. Consectetur adipiscing elit
    4. +
    5. Integer molestie lorem at massa
    6. +
    7. Facilisis in pretium nisl aliquet
    8. +
    9. Nulla volutpat aliquam velit
    10. +
    11. Faucibus porta lacus fringilla vel
    12. +
    13. Aenean sit amet erat nunc
    14. +
    15. Eget porttitor lorem
    16. +
    +
    +
    +<ol>
    +  <li>...</li>
    +</ol>
    +
    + +

    {{_i}}Unstyled{{/i}}

    +

    {{_i}}A list of items with no list-style or additional left padding.{{/i}}

    -
      +
      • Lorem ipsum dolor sit amet
      • Consectetur adipiscing elit
      • Integer molestie lorem at massa
      • @@ -232,71 +281,24 @@
    -<ul>
    -  <li>...</li>
    -</ul>
    -
    - -

    {{_i}}Ordered{{/i}}

    -

    {{_i}}A list of items in which the order does explicitly matter.{{/i}}

    -
    -
      -
    1. Lorem ipsum dolor sit amet
    2. -
    3. Consectetur adipiscing elit
    4. -
    5. Integer molestie lorem at massa
    6. -
    7. Facilisis in pretium nisl aliquet
    8. -
    9. Nulla volutpat aliquam velit
    10. -
    11. Faucibus porta lacus fringilla vel
    12. -
    13. Aenean sit amet erat nunc
    14. -
    15. Eget porttitor lorem
    16. -
    -
    -
    -<ol>
    -  <li>...</li>
    -</ol>
    -
    - -

    {{_i}}Unstyled{{/i}}

    -

    {{_i}}A list of items with no list-style or additional left padding.{{/i}}

    -
    -
      -
    • Lorem ipsum dolor sit amet
    • -
    • Consectetur adipiscing elit
    • -
    • Integer molestie lorem at massa
    • -
    • Facilisis in pretium nisl aliquet
    • -
    • Nulla volutpat aliquam velit -
        -
      • Phasellus iaculis neque
      • -
      • Purus sodales ultricies
      • -
      • Vestibulum laoreet porttitor sem
      • -
      • Ac tristique libero volutpat at
      • -
      -
    • -
    • Faucibus porta lacus fringilla vel
    • -
    • Aenean sit amet erat nunc
    • -
    • Eget porttitor lorem
    • -
    -
    -
     <ul class="unstyled">
       <li>...</li>
     </ul>
     
    -

    {{_i}}Description{{/i}}

    -

    {{_i}}A list of terms with their associated descriptions.{{/i}}

    -
    -
    -
    {{_i}}Description lists{{/i}}
    -
    {{_i}}A description list is perfect for defining terms.{{/i}}
    -
    Euismod
    -
    Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.
    -
    Donec id elit non mi porta gravida at eget metus.
    -
    Malesuada porta
    -
    Etiam porta sem malesuada magna mollis euismod.
    -
    -
    +

    {{_i}}Description{{/i}}

    +

    {{_i}}A list of terms with their associated descriptions.{{/i}}

    +
    +
    +
    {{_i}}Description lists{{/i}}
    +
    {{_i}}A description list is perfect for defining terms.{{/i}}
    +
    Euismod
    +
    Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.
    +
    Donec id elit non mi porta gravida at eget metus.
    +
    Malesuada porta
    +
    Etiam porta sem malesuada magna mollis euismod.
    +
    +
     <dl>
       <dt>...</dt>
    @@ -304,50 +306,50 @@
     </dl>
     
    -

    {{_i}}Horizontal description{{/i}}

    -

    {{_i}}Make terms and descriptions in <dl> line up side-by-side.{{/i}}

    -
    -
    -
    {{_i}}Description lists{{/i}}
    -
    {{_i}}A description list is perfect for defining terms.{{/i}}
    -
    Euismod
    -
    Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.
    -
    Donec id elit non mi porta gravida at eget metus.
    -
    Malesuada porta
    -
    Etiam porta sem malesuada magna mollis euismod.
    -
    Felis euismod semper eget lacinia
    -
    Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
    -
    -
    +

    {{_i}}Horizontal description{{/i}}

    +

    {{_i}}Make terms and descriptions in <dl> line up side-by-side.{{/i}}

    +
    +
    +
    {{_i}}Description lists{{/i}}
    +
    {{_i}}A description list is perfect for defining terms.{{/i}}
    +
    Euismod
    +
    Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.
    +
    Donec id elit non mi porta gravida at eget metus.
    +
    Malesuada porta
    +
    Etiam porta sem malesuada magna mollis euismod.
    +
    Felis euismod semper eget lacinia
    +
    Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
    +
    +
     <dl class="dl-horizontal">
       <dt>...</dt>
       <dd>...</dd>
     </dl>
     
    -

    - {{_i}}Heads up!{{/i}} - {{_i}}Horizontal description lists will truncate terms that are too long to fit in the left column fix text-overflow. In narrower viewports, they will change to the default stacked layout.{{/i}} -

    -
    +

    + {{_i}}Heads up!{{/i}} + {{_i}}Horizontal description lists will truncate terms that are too long to fit in the left column fix text-overflow. In narrower viewports, they will change to the default stacked layout.{{/i}} +

    +
    - -
    - + +
    + -

    Inline

    -

    Wrap inline snippets of code with <code>.

    +

    Inline

    +

    Wrap inline snippets of code with <code>.

     {{_i}}For example, <code>section</code> should be wrapped as inline.{{/i}}
     
    -

    Basic block

    -

    {{_i}}Use <pre> for multiple lines of code. Be sure to escape any angle brackets in the code for proper rendering.{{/i}}

    +

    Basic block

    +

    {{_i}}Use <pre> for multiple lines of code. Be sure to escape any angle brackets in the code for proper rendering.{{/i}}

     <p>{{_i}}Sample text here...{{/i}}</p>
     
    @@ -356,53 +358,53 @@ &lt;p&gt;{{_i}}Sample text here...{{/i}}&lt;/p&gt; </pre> -

    {{_i}}Note: Be sure to keep code within <pre> tags as close to the left as possible; it will render all tabs.{{/i}}

    -

    {{_i}}You may optionally add the .pre-scrollable class which will set a max-height of 350px and provide a y-axis scrollbar.{{/i}}

    -
    +

    {{_i}}Note: Be sure to keep code within <pre> tags as close to the left as possible; it will render all tabs.{{/i}}

    +

    {{_i}}You may optionally add the .pre-scrollable class which will set a max-height of 350px and provide a y-axis scrollbar.{{/i}}

    +
    - -
    - + +
    + -

    {{_i}}Default styles{{/i}}

    -

    {{_i}}For basic styling—light padding and only horizontal dividers—add the base class .table to any <table>.{{/i}}

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    #{{_i}}First Name{{/i}}{{_i}}Last Name{{/i}}{{_i}}Username{{/i}}
    1MarkOtto@mdo
    2JacobThornton@fat
    3Larrythe Bird@twitter
    -
    {{! /example }} +

    {{_i}}Default styles{{/i}}

    +

    {{_i}}For basic styling—light padding and only horizontal dividers—add the base class .table to any <table>.{{/i}}

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    #{{_i}}First Name{{/i}}{{_i}}Last Name{{/i}}{{_i}}Username{{/i}}
    1MarkOtto@mdo
    2JacobThornton@fat
    3Larrythe Bird@twitter
    +
    {{! /example }}
     <table class="table">
       …
    @@ -410,168 +412,168 @@
     
    -
    +
    -

    {{_i}}Optional classes{{/i}}

    -

    {{_i}}Add any of the follow classes to the .table base class.{{/i}}

    +

    {{_i}}Optional classes{{/i}}

    +

    {{_i}}Add any of the follow classes to the .table base class.{{/i}}

    -

    {{_i}}.table-striped{{/i}}

    -

    {{_i}}Adds zebra-striping to any table row within the <tbody> via the :nth-child CSS selector (not available in IE7-IE8).{{/i}}

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    #{{_i}}First Name{{/i}}{{_i}}Last Name{{/i}}{{_i}}Username{{/i}}
    1MarkOtto@mdo
    2JacobThornton@fat
    3Larrythe Bird@twitter
    -
    {{! /example }} +

    {{_i}}.table-striped{{/i}}

    +

    {{_i}}Adds zebra-striping to any table row within the <tbody> via the :nth-child CSS selector (not available in IE7-IE8).{{/i}}

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    #{{_i}}First Name{{/i}}{{_i}}Last Name{{/i}}{{_i}}Username{{/i}}
    1MarkOtto@mdo
    2JacobThornton@fat
    3Larrythe Bird@twitter
    +
    {{! /example }}
     <table class="table table-striped">
       …
     </table>
     
    -

    {{_i}}.table-bordered{{/i}}

    -

    {{_i}}Add borders and rounded corners to the table.{{/i}}

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    #{{_i}}First Name{{/i}}{{_i}}Last Name{{/i}}{{_i}}Username{{/i}}
    1MarkOtto@mdo
    MarkOtto@TwBootstrap
    2JacobThornton@fat
    3Larry the Bird@twitter
    -
    {{! /example }} +

    {{_i}}.table-bordered{{/i}}

    +

    {{_i}}Add borders and rounded corners to the table.{{/i}}

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    #{{_i}}First Name{{/i}}{{_i}}Last Name{{/i}}{{_i}}Username{{/i}}
    1MarkOtto@mdo
    MarkOtto@TwBootstrap
    2JacobThornton@fat
    3Larry the Bird@twitter
    +
    {{! /example }}
     <table class="table table-bordered">
       …
     </table>
     
    -

    {{_i}}.table-hover{{/i}}

    -

    {{_i}}Enable a hover state on table rows within a <tbody>.{{/i}}

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    #{{_i}}First Name{{/i}}{{_i}}Last Name{{/i}}{{_i}}Username{{/i}}
    1MarkOtto@mdo
    2JacobThornton@fat
    3Larry the Bird@twitter
    -
    {{! /example }} +

    {{_i}}.table-hover{{/i}}

    +

    {{_i}}Enable a hover state on table rows within a <tbody>.{{/i}}

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    #{{_i}}First Name{{/i}}{{_i}}Last Name{{/i}}{{_i}}Username{{/i}}
    1MarkOtto@mdo
    2JacobThornton@fat
    3Larry the Bird@twitter
    +
    {{! /example }}
     <table class="table table-hover">
       …
     </table>
     
    -

    {{_i}}.table-condensed{{/i}}

    -

    {{_i}}Makes tables more compact by cutting cell padding in half.{{/i}}

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    #{{_i}}First Name{{/i}}{{_i}}Last Name{{/i}}{{_i}}Username{{/i}}
    1MarkOtto@mdo
    2JacobThornton@fat
    3Larry the Bird@twitter
    -
    {{! /example }} +

    {{_i}}.table-condensed{{/i}}

    +

    {{_i}}Makes tables more compact by cutting cell padding in half.{{/i}}

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    #{{_i}}First Name{{/i}}{{_i}}Last Name{{/i}}{{_i}}Username{{/i}}
    1MarkOtto@mdo
    2JacobThornton@fat
    3Larry the Bird@twitter
    +
    {{! /example }}
     <table class="table table-condensed">
       …
    @@ -579,75 +581,75 @@
     
    -
    +
    -

    {{_i}}Optional row classes{{/i}}

    -

    {{_i}}Use contextual classes to color table rows.{{/i}}

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    {{_i}}Class{{/i}}{{_i}}Description{{/i}}
    - .success - {{_i}}Indicates a successful or positive action.{{/i}}
    - .error - {{_i}}Indicates a dangerous or potentially negative action.{{/i}}
    - .info - {{_i}}Used as an alternative to the default styles.{{/i}}
    -
    - +

    {{_i}}Optional row classes{{/i}}

    +

    {{_i}}Use contextual classes to color table rows.{{/i}}

    +
    + + + + - - - - + + - - - - - + + + - - - - - + + + - - - - - + + +
    #{{_i}}Product{{/i}}{{_i}}Payment Taken{{/i}}{{_i}}Status{{/i}}{{_i}}Class{{/i}}{{_i}}Description{{/i}}
    1TB - Monthly01/04/2012Approved
    + .success + {{_i}}Indicates a successful or positive action.{{/i}}
    2TB - Monthly02/04/2012Declined
    + .error + {{_i}}Indicates a dangerous or potentially negative action.{{/i}}
    3TB - Monthly03/04/2012Pending
    + .info + {{_i}}Used as an alternative to the default styles.{{/i}}
    -
    {{! /example }} +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    #{{_i}}Product{{/i}}{{_i}}Payment Taken{{/i}}{{_i}}Status{{/i}}
    1TB - Monthly01/04/2012Approved
    2TB - Monthly02/04/2012Declined
    3TB - Monthly03/04/2012Pending
    +
    {{! /example }}
     ...
       <tr class="success">
    @@ -660,82 +662,82 @@
     
    -
    +
    -

    {{_i}}Supported table markup{{/i}}

    -

    {{_i}}List of supported table HTML elements and how they should be used.{{/i}}

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {{_i}}Tag{{/i}}{{_i}}Description{{/i}}
    - <table> - - {{_i}}Wrapping element for displaying data in a tabular format{{/i}} -
    - <thead> - - {{_i}}Container element for table header rows (<tr>) to label table columns{{/i}} -
    - <tbody> - - {{_i}}Container element for table rows (<tr>) in the body of the table{{/i}} -
    - <tr> - - {{_i}}Container element for a set of table cells (<td> or <th>) that appears on a single row{{/i}} -
    - <td> - - {{_i}}Default table cell{{/i}} -
    - <th> - - {{_i}}Special table cell for column (or row, depending on scope and placement) labels{{/i}}
    - {{_i}}Must be used within a <thead>{{/i}} -
    - <caption> - - {{_i}}Description or summary of what the table holds, especially useful for screen readers{{/i}} -
    +

    {{_i}}Supported table markup{{/i}}

    +

    {{_i}}List of supported table HTML elements and how they should be used.{{/i}}

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{_i}}Tag{{/i}}{{_i}}Description{{/i}}
    + <table> + + {{_i}}Wrapping element for displaying data in a tabular format{{/i}} +
    + <thead> + + {{_i}}Container element for table header rows (<tr>) to label table columns{{/i}} +
    + <tbody> + + {{_i}}Container element for table rows (<tr>) in the body of the table{{/i}} +
    + <tr> + + {{_i}}Container element for a set of table cells (<td> or <th>) that appears on a single row{{/i}} +
    + <td> + + {{_i}}Default table cell{{/i}} +
    + <th> + + {{_i}}Special table cell for column (or row, depending on scope and placement) labels{{/i}}
    + {{_i}}Must be used within a <thead>{{/i}} +
    + <caption> + + {{_i}}Description or summary of what the table holds, especially useful for screen readers{{/i}} +
     <table>
       <thead>
    @@ -753,29 +755,29 @@
     </table>
     
    -
    +
    - -
    - + +
    + -

    {{_i}}Default styles{{/i}}

    -

    {{_i}}Individual form controls receive styling, but without any required base class on the <form> or large changes in markup. Results in stacked, left-aligned labels on top of form controls.{{/i}}

    -
    - Legend - - -

    {{_i}}Example block-level help text here.{{/i}}

    - - -
    {{! /example }} +

    {{_i}}Default styles{{/i}}

    +

    {{_i}}Individual form controls receive styling, but without any required base class on the <form> or large changes in markup. Results in stacked, left-aligned labels on top of form controls.{{/i}}

    +
    + Legend + + +

    {{_i}}Example block-level help text here.{{/i}}

    + + +
    {{! /example }}
     <form class="well">
       <label>{{_i}}Label name{{/i}}</label>
    @@ -789,18 +791,18 @@
     
    -
    +
    -

    {{_i}}Optional layouts{{/i}}

    -

    {{_i}}Included with Bootstrap are three optional form layouts for common use cases.{{/i}}

    +

    {{_i}}Optional layouts{{/i}}

    +

    {{_i}}Included with Bootstrap are three optional form layouts for common use cases.{{/i}}

    -

    {{_i}}Search form{{/i}}

    -

    {{_i}}Add .form-search to the form and .search-query to the <input> for an extra-rounded text input.{{/i}}

    - {{! /example }} +

    {{_i}}Search form{{/i}}

    +

    {{_i}}Add .form-search to the form and .search-query to the <input> for an extra-rounded text input.{{/i}}

    + {{! /example }}
     <form class="form-search">
       <input type="text" class="input-medium search-query">
    @@ -808,16 +810,16 @@
     </form>
     
    -

    {{_i}}Inline form{{/i}}

    -

    {{_i}}Add .form-inline for left-aligned labels and inline-block controls for a compact layout.{{/i}}

    -
    - - - - -
    {{! /example }} +

    {{_i}}Inline form{{/i}}

    +

    {{_i}}Add .form-inline for left-aligned labels and inline-block controls for a compact layout.{{/i}}

    +
    + + + + +
    {{! /example }}
     <form class="form-inline">
       <input type="text" class="input-small" placeholder="{{_i}}Email{{/i}}">
    @@ -829,37 +831,37 @@
     </form>
     
    -

    {{_i}}Horizontal form{{/i}}

    -

    {{_i}}Right align labels and float them to the left to make them appear on the same line as controls. Requires the most markup changes from a default form:{{/i}}

    -
      -
    • {{_i}}Add .form-horizontal to the form{{/i}}
    • -
    • {{_i}}Wrap labels and controls in .control-group{{/i}}
    • -
    • {{_i}}Add .control-label to the label{{/i}}
    • -
    • {{_i}}Wrap any associated controls in .controls for proper alignment{{/i}}
    • -
    -
    - Legend -
    - -
    - +

    {{_i}}Horizontal form{{/i}}

    +

    {{_i}}Right align labels and float them to the left to make them appear on the same line as controls. Requires the most markup changes from a default form:{{/i}}

    +
      +
    • {{_i}}Add .form-horizontal to the form{{/i}}
    • +
    • {{_i}}Wrap labels and controls in .control-group{{/i}}
    • +
    • {{_i}}Add .control-label to the label{{/i}}
    • +
    • {{_i}}Wrap any associated controls in .controls for proper alignment{{/i}}
    • +
    + + Legend +
    + +
    + +
    -
    -
    - -
    - +
    + +
    + +
    -
    -
    -
    - - +
    +
    + + +
    -
    - +
     <form class="form-horizontal">
       <div class="control-group">
    @@ -886,49 +888,49 @@
     
    -
    +
    -

    {{_i}}Supported form controls{{/i}}

    -

    {{_i}}Examples of standard form controls supported in an example form layout.{{/i}}

    +

    {{_i}}Supported form controls{{/i}}

    +

    {{_i}}Examples of standard form controls supported in an example form layout.{{/i}}

    -

    {{_i}}Inputs{{/i}}

    -

    {{_i}}Most common form control, text-based input fields. Includes support for all HTML5 types: text, password, datetime, datetime-local, date, month, time, week, number, email, url, search, tel, and color.{{/i}}

    -

    {{_i}}Requires the use of a specified type at all times.{{/i}}

    -
    - -
    +

    {{_i}}Inputs{{/i}}

    +

    {{_i}}Most common form control, text-based input fields. Includes support for all HTML5 types: text, password, datetime, datetime-local, date, month, time, week, number, email, url, search, tel, and color.{{/i}}

    +

    {{_i}}Requires the use of a specified type at all times.{{/i}}

    +
    + +
     <input type="text" placeholder="Text input">
     
    -

    {{_i}}Textarea{{/i}}

    -

    {{_i}}Form control which supports multiple lines of text. Change row attribute as necessary.{{/i}}

    -
    - -
    +

    {{_i}}Textarea{{/i}}

    +

    {{_i}}Form control which supports multiple lines of text. Change row attribute as necessary.{{/i}}

    +
    + +
     <textarea id="textarea" rows="3"></textarea>
     
    -

    {{_i}}Checkboxes and radios{{/i}}

    -

    {{_i}}Checkboxes are for selecting one or several options in a list while radios are for selecting one option from many.{{/i}}

    -

    {{_i}}Default (stacked){{/i}}

    -
    - -
    - - -
    +

    {{_i}}Checkboxes and radios{{/i}}

    +

    {{_i}}Checkboxes are for selecting one or several options in a list while radios are for selecting one option from many.{{/i}}

    +

    {{_i}}Default (stacked){{/i}}

    +
    + +
    + + +
     <label class="checkbox">
       <input type="checkbox" value="">
    @@ -945,19 +947,19 @@
     </label>
     
    -

    {{_i}}Inline checkboxes{{/i}}

    -

    {{_i}}Add the .inline class to a series of checkboxes or radios for controls appear on the same line.{{/i}}

    -
    - - - -
    +

    {{_i}}Inline checkboxes{{/i}}

    +

    {{_i}}Add the .inline class to a series of checkboxes or radios for controls appear on the same line.{{/i}}

    +
    + + + +
     <label class="checkbox inline">
       <input type="checkbox" id="inlineCheckbox1" value="option1"> 1
    @@ -970,25 +972,25 @@
     </label>
     
    -

    {{_i}}Selects{{/i}}

    -

    {{_i}}Use the default option or specify a multiple="multiple" to show multiple options at once.{{/i}}

    -
    - -
    - -
    +

    {{_i}}Selects{{/i}}

    +

    {{_i}}Use the default option or specify a multiple="multiple" to show multiple options at once.{{/i}}

    +
    + +
    + +
     <select>
       <option>something</option>
    @@ -1008,28 +1010,28 @@
     
    -
    +
    -

    {{_i}}Extending form controls{{/i}}

    -

    {{_i}}Adding on top of existing browser controls, Bootstrap includes other useful form components.{{/i}}

    +

    {{_i}}Extending form controls{{/i}}

    +

    {{_i}}Adding on top of existing browser controls, Bootstrap includes other useful form components.{{/i}}

    -

    {{_i}}Prepended and appended inputs{{/i}}

    -

    {{_i}}Add text or buttons before or after any text-based input. Do note that select elements are not supported here.{{/i}}

    +

    {{_i}}Prepended and appended inputs{{/i}}

    +

    {{_i}}Add text or buttons before or after any text-based input. Do note that select elements are not supported here.{{/i}}

    -

    {{_i}}Default options{{/i}}

    -

    {{_i}}Wrap a .add-on and an input with one of two classes to prepend or append text to an input.{{/i}}

    -
    -
    - @ - -
    -
    -
    - - .00 -
    -
    +

    {{_i}}Default options{{/i}}

    +

    {{_i}}Wrap a .add-on and an input with one of two classes to prepend or append text to an input.{{/i}}

    +
    +
    + @ + +
    +
    +
    + + .00 +
    +
     <div class="input-prepend">
       <span class="add-on">@</span><input class="span2" id="prependedInput" size="16" type="text" placeholder="{{_i}}Username{{/i}}">
    @@ -1039,35 +1041,35 @@
     </div>
     
    -

    {{_i}}Combined{{/i}}

    -

    {{_i}}Use both classes and two instances of .add-on to prepend and append an input.{{/i}}

    -
    -
    - $ - - .00 -
    -
    +

    {{_i}}Combined{{/i}}

    +

    {{_i}}Use both classes and two instances of .add-on to prepend and append an input.{{/i}}

    +
    +
    + $ + + .00 +
    +
     <div class="input-prepend input-append">
       <span class="add-on">$</span><input class="span2" id="appendedPrependedInput" size="16" type="text"><span class="add-on">.00</span>
     </div>
     
    -

    {{_i}}Buttons instead of text{{/i}}

    -

    {{_i}}Instead of a <span> with text, use a .btn to attach a button (or two) to an input.{{/i}}

    -
    -
    - - -
    -
    -
    - - - -
    -
    +

    {{_i}}Buttons instead of text{{/i}}

    +

    {{_i}}Instead of a <span> with text, use a .btn to attach a button (or two) to an input.{{/i}}

    +
    +
    + + +
    +
    +
    + + + +
    +
     <div class="input-append">
       <input class="span2" id="appendedInputButton" size="16" type="text"><button class="btn" type="button">Go!</button>
    @@ -1078,17 +1080,17 @@
     </div>
     
    -

    {{_i}}Search form{{/i}}

    - {{! /example }} +

    {{_i}}Search form{{/i}}

    + {{! /example }}
     <form class="form-search">
       <input type="text" class="span2 search-query">
    @@ -1096,20 +1098,20 @@
     </form>
     
    -

    {{_i}}Control sizing{{/i}}

    -

    {{_i}}Use relative sizing classes like .input-large or match your inputs to the grid column sizes using .span* classes.{{/i}}

    +

    {{_i}}Control sizing{{/i}}

    +

    {{_i}}Use relative sizing classes like .input-large or match your inputs to the grid column sizes using .span* classes.{{/i}}

    -

    {{_i}}Relative sizing{{/i}}

    -
    -
    - - - - - - -
    -
    +

    {{_i}}Relative sizing{{/i}}

    +
    +
    + + + + + + +
    +
     <input class="input-mini" type="text">
     <input class="input-small" type="text">
    @@ -1118,68 +1120,68 @@
     <input class="input-xlarge" type="text">
     <input class="input-xxlarge" type="text">
     
    -

    - {{_i}}Heads up!{{/i}} In future versions, we'll be altering the use of these relative input classes to match our button sizes. For example, .input-large will increase the padding and font-size of an input. -

    +

    + {{_i}}Heads up!{{/i}} In future versions, we'll be altering the use of these relative input classes to match our button sizes. For example, .input-large will increase the padding and font-size of an input. +

    -

    {{_i}}Grid sizing{{/i}}

    -

    {{_i}}Use .span1 to .span12 for inputs that match the same sizes of the grid columns.{{/i}}

    -
    -
    - - - - - - -
    -
    +

    {{_i}}Grid sizing{{/i}}

    +

    {{_i}}Use .span1 to .span12 for inputs that match the same sizes of the grid columns.{{/i}}

    +
    +
    + + + + + + +
    +
     <input class="span1" type="text">
     <input class="span2" type="text">
     <input class="span3" type="text">
     
    -

    {{_i}}For multiple grid inputs per line, use the .controls-row modifier class for proper spacing. It floats the inputs to collapse white-space, sets the proper margins, and the clears the float.{{/i}}

    -
    -
    - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    +

    {{_i}}For multiple grid inputs per line, use the .controls-row modifier class for proper spacing. It floats the inputs to collapse white-space, sets the proper margins, and the clears the float.{{/i}}

    +
    +
    + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
     <div class="controls controls-row">
       <input class="span4" type="text" placeholder=".span4">
    @@ -1187,23 +1189,23 @@
     </div>
     
    -

    {{_i}}Uneditable inputs{{/i}}

    -

    {{_i}}Present data in a form that's not editable without using actual form markup.{{/i}}

    -
    - Some value here -
    +

    {{_i}}Uneditable inputs{{/i}}

    +

    {{_i}}Present data in a form that's not editable without using actual form markup.{{/i}}

    +
    + Some value here +
       <span class="input-xlarge uneditable-input">Some value here</span>
     
    -

    {{_i}}Form actions{{/i}}

    -

    {{_i}}End a form with a group of actions (buttons). When placed within a .form-horizontal, the buttons will automatically indent to line up with the form controls.{{/i}}

    -
    -
    - - -
    -
    +

    {{_i}}Form actions{{/i}}

    +

    {{_i}}End a form with a group of actions (buttons). When placed within a .form-horizontal, the buttons will automatically indent to line up with the form controls.{{/i}}

    +
    +
    + + +
    +
     <div class="form-actions">
       <button type="submit" class="btn btn-primary">{{_i}}Save changes{{/i}}</button>
    @@ -1211,76 +1213,76 @@
     </div>
     
    -

    {{_i}}Help text{{/i}}

    -

    {{_i}}Inline and block level support for help text that appears around form controls.{{/i}}

    -

    {{_i}}Inline help{{/i}}

    -
    - Inline help text -
    +

    {{_i}}Help text{{/i}}

    +

    {{_i}}Inline and block level support for help text that appears around form controls.{{/i}}

    +

    {{_i}}Inline help{{/i}}

    +
    + Inline help text +
     <span class="help-inline">Inline help text</span>
     
    -

    {{_i}}Block help{{/i}}

    -
    - - A longer block of help text that breaks onto a new line and may extend beyond one line. -
    +

    {{_i}}Block help{{/i}}

    +
    + + A longer block of help text that breaks onto a new line and may extend beyond one line. +
     <span class="help-block">A longer block of help text that breaks onto a new line and may extend beyond one line.</span>
     
    -
    +
    -

    {{_i}}Form control states{{/i}}

    -

    {{_i}}Provide feedback to users or visitors with basic feedback states on form controls and labels.{{/i}}

    +

    {{_i}}Form control states{{/i}}

    +

    {{_i}}Provide feedback to users or visitors with basic feedback states on form controls and labels.{{/i}}

    -

    {{_i}}Input focus{{/i}}

    -

    {{_i}}We remove the default outline styles on some form controls and apply a box-shadow in its place for :focus.{{/i}}

    -
    - -
    -
    -<input class="input-xlarge" id="focusedInput" type="text" value="{{_i}}This is focused...{{/i}}">
    -
    +

    {{_i}}Input focus{{/i}}

    +

    {{_i}}We remove the default outline styles on some form controls and apply a box-shadow in its place for :focus.{{/i}}

    +
    + +
    +
    +  <input class="input-xlarge" id="focusedInput" type="text" value="{{_i}}This is focused...{{/i}}">
    +  
    -

    {{_i}}Disabled inputs{{/i}}

    -

    {{_i}}Add the disabled attribute on an input to prevent user input and trigger a slightly different look.{{/i}}

    -
    - -
    +

    {{_i}}Disabled inputs{{/i}}

    +

    {{_i}}Add the disabled attribute on an input to prevent user input and trigger a slightly different look.{{/i}}

    +
    + +
     <input class="input-xlarge" id="disabledInput" type="text" placeholder="{{_i}}Disabled input here...{{/i}}" disabled>
     
    -

    {{_i}}Validation states{{/i}}

    -

    {{_i}}Bootstrap includes validation styles for error, warning, and success messages. To use, add the appropriate class to the surrounding .control-group.{{/i}}

    +

    {{_i}}Validation states{{/i}}

    +

    {{_i}}Bootstrap includes validation styles for error, warning, and success messages. To use, add the appropriate class to the surrounding .control-group.{{/i}}

    -
    -
    - -
    - - {{_i}}Something may have gone wrong{{/i}} + +
    + +
    + + {{_i}}Something may have gone wrong{{/i}} +
    -
    -
    - -
    - - {{_i}}Please correct the error{{/i}} +
    + +
    + + {{_i}}Please correct the error{{/i}} +
    -
    -
    - -
    - - {{_i}}Woohoo!{{/i}} +
    + +
    + + {{_i}}Woohoo!{{/i}} +
    -
    - +
     <div class="control-group warning">
       <label class="control-label" for="inputWarning">{{_i}}Input with warning{{/i}}</label>
    @@ -1305,138 +1307,138 @@
     </div>
     
    -
    +
    - -
    - + +
    + -

    Default buttons

    -

    {{_i}}Button styles can be applied to anything with the .btn class applied. However, typically you'll want to apply these to only <a> and <button> elements for the best rendering.{{/i}}

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {{_i}}Button{{/i}}{{_i}}class=""{{/i}}{{_i}}Description{{/i}}
    btn{{_i}}Standard gray button with gradient{{/i}}
    btn btn-primary{{_i}}Provides extra visual weight and identifies the primary action in a set of buttons{{/i}}
    btn btn-info{{_i}}Used as an alternative to the default styles{{/i}}
    btn btn-success{{_i}}Indicates a successful or positive action{{/i}}
    btn btn-warning{{_i}}Indicates caution should be taken with this action{{/i}}
    btn btn-danger{{_i}}Indicates a dangerous or potentially negative action{{/i}}
    btn btn-inverse{{_i}}Alternate dark gray button, not tied to a semantic action or use{{/i}}
    btn btn-link{{_i}}Deemphasize a button by making it look like a link while maintaining button behavior{{/i}}
    +

    Default buttons

    +

    {{_i}}Button styles can be applied to anything with the .btn class applied. However, typically you'll want to apply these to only <a> and <button> elements for the best rendering.{{/i}}

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{_i}}Button{{/i}}{{_i}}class=""{{/i}}{{_i}}Description{{/i}}
    btn{{_i}}Standard gray button with gradient{{/i}}
    btn btn-primary{{_i}}Provides extra visual weight and identifies the primary action in a set of buttons{{/i}}
    btn btn-info{{_i}}Used as an alternative to the default styles{{/i}}
    btn btn-success{{_i}}Indicates a successful or positive action{{/i}}
    btn btn-warning{{_i}}Indicates caution should be taken with this action{{/i}}
    btn btn-danger{{_i}}Indicates a dangerous or potentially negative action{{/i}}
    btn btn-inverse{{_i}}Alternate dark gray button, not tied to a semantic action or use{{/i}}
    btn btn-link{{_i}}Deemphasize a button by making it look like a link while maintaining button behavior{{/i}}
    -

    {{_i}}Cross browser compatibility{{/i}}

    -

    {{_i}}IE9 doesn't crop background gradients on rounded corners, so we remove it. Related, IE9 jankifies disabled button elements, rendering text gray with a nasty text-shadow that we cannot fix.{{/i}}

    +

    {{_i}}Cross browser compatibility{{/i}}

    +

    {{_i}}IE9 doesn't crop background gradients on rounded corners, so we remove it. Related, IE9 jankifies disabled button elements, rendering text gray with a nasty text-shadow that we cannot fix.{{/i}}

    -
    +
    -

    {{_i}}Button sizes{{/i}}

    -

    {{_i}}Fancy larger or smaller buttons? Add .btn-large, .btn-small, or .btn-mini for two additional sizes.{{/i}}

    -

    - - -

    -

    - - -

    -

    - - -

    +

    {{_i}}Button sizes{{/i}}

    +

    {{_i}}Fancy larger or smaller buttons? Add .btn-large, .btn-small, or .btn-mini for two additional sizes.{{/i}}

    +

    + + +

    +

    + + +

    +

    + + +

    -
    +
    -

    {{_i}}Disabled state{{/i}}

    -

    {{_i}}Make buttons look unclickable by fading them back 50%.{{/i}}

    +

    {{_i}}Disabled state{{/i}}

    +

    {{_i}}Make buttons look unclickable by fading them back 50%.{{/i}}

    -

    Anchor element

    -

    {{_i}}Add the .disabled class to <a> buttons.{{/i}}

    -

    - {{_i}}Primary link{{/i}} - {{_i}}Link{{/i}} -

    +

    Anchor element

    +

    {{_i}}Add the .disabled class to <a> buttons.{{/i}}

    +

    + {{_i}}Primary link{{/i}} + {{_i}}Link{{/i}} +

     <a href="#" class="btn btn-large btn-primary disabled">{{_i}}Primary link{{/i}}</a>
     <a href="#" class="btn btn-large disabled">{{_i}}Link{{/i}}</a>
     
    -

    - {{_i}}Heads up!{{/i}} - {{_i}}We use .disabled as a utility class here, similar to the common .active class, so no prefix is required.{{/i}} -

    +

    + {{_i}}Heads up!{{/i}} + {{_i}}We use .disabled as a utility class here, similar to the common .active class, so no prefix is required.{{/i}} +

    -

    Button element

    -

    {{_i}}Add the disabled attribute to <button> buttons.{{/i}}

    -

    - - -

    +

    Button element

    +

    {{_i}}Add the disabled attribute to <button> buttons.{{/i}}

    +

    + + +

     <button type="button" class="btn btn-large btn-primary disabled" disabled="disabled">{{_i}}Primary button{{/i}}</button>
     <button type="button" class="btn btn-large" disabled>{{_i}}Button{{/i}}</button>
     
    -
    +
    -

    {{_i}}One class, multiple tags{{/i}}

    -

    {{_i}}Use the .btn class on an <a>, <button>, or <input> element.{{/i}}

    -
    - {{_i}}Link{{/i}} - - - -
    +

    {{_i}}One class, multiple tags{{/i}}

    +

    {{_i}}Use the .btn class on an <a>, <button>, or <input> element.{{/i}}

    +
    + {{_i}}Link{{/i}} + + + +
     <a class="btn" href="">{{_i}}Link{{/i}}</a>
     <button class="btn" type="submit">
    @@ -1447,248 +1449,250 @@
     <input class="btn" type="submit"
              value="{{_i}}Submit{{/i}}">
     
    -

    {{_i}}As a best practice, try to match the element for you context to ensure matching cross-browser rendering. If you have an input, use an <input type="submit"> for your button.{{/i}}

    +

    {{_i}}As a best practice, try to match the element for you context to ensure matching cross-browser rendering. If you have an input, use an <input type="submit"> for your button.{{/i}}

    -
    +
    - -
    - + +
    + -

    {{_i}}Icon glyphs{{/i}}

    -

    {{_i}}140 icons in sprite form, available in dark gray (default) and white, provided by Glyphicons.{{/i}}

    -
      -
    • icon-glass
    • -
    • icon-music
    • -
    • icon-search
    • -
    • icon-envelope
    • -
    • icon-heart
    • -
    • icon-star
    • -
    • icon-star-empty
    • -
    • icon-user
    • -
    • icon-film
    • -
    • icon-th-large
    • -
    • icon-th
    • -
    • icon-th-list
    • -
    • icon-ok
    • -
    • icon-remove
    • -
    • icon-zoom-in
    • -
    • icon-zoom-out
    • -
    • icon-off
    • -
    • icon-signal
    • -
    • icon-cog
    • -
    • icon-trash
    • -
    • icon-home
    • -
    • icon-file
    • -
    • icon-time
    • -
    • icon-road
    • -
    • icon-download-alt
    • -
    • icon-download
    • -
    • icon-upload
    • -
    • icon-inbox
    • +

      {{_i}}Icon glyphs{{/i}}

      +

      {{_i}}140 icons in sprite form, available in dark gray (default) and white, provided by Glyphicons.{{/i}}

      +
        +
      • icon-glass
      • +
      • icon-music
      • +
      • icon-search
      • +
      • icon-envelope
      • +
      • icon-heart
      • +
      • icon-star
      • +
      • icon-star-empty
      • +
      • icon-user
      • +
      • icon-film
      • +
      • icon-th-large
      • +
      • icon-th
      • +
      • icon-th-list
      • +
      • icon-ok
      • +
      • icon-remove
      • +
      • icon-zoom-in
      • +
      • icon-zoom-out
      • +
      • icon-off
      • +
      • icon-signal
      • +
      • icon-cog
      • +
      • icon-trash
      • +
      • icon-home
      • +
      • icon-file
      • +
      • icon-time
      • +
      • icon-road
      • +
      • icon-download-alt
      • +
      • icon-download
      • +
      • icon-upload
      • +
      • icon-inbox
      • -
      • icon-play-circle
      • -
      • icon-repeat
      • -
      • icon-refresh
      • -
      • icon-list-alt
      • -
      • icon-lock
      • -
      • icon-flag
      • -
      • icon-headphones
      • -
      • icon-volume-off
      • -
      • icon-volume-down
      • -
      • icon-volume-up
      • -
      • icon-qrcode
      • -
      • icon-barcode
      • -
      • icon-tag
      • -
      • icon-tags
      • -
      • icon-book
      • -
      • icon-bookmark
      • -
      • icon-print
      • -
      • icon-camera
      • -
      • icon-font
      • -
      • icon-bold
      • -
      • icon-italic
      • -
      • icon-text-height
      • -
      • icon-text-width
      • -
      • icon-align-left
      • -
      • icon-align-center
      • -
      • icon-align-right
      • -
      • icon-align-justify
      • -
      • icon-list
      • +
      • icon-play-circle
      • +
      • icon-repeat
      • +
      • icon-refresh
      • +
      • icon-list-alt
      • +
      • icon-lock
      • +
      • icon-flag
      • +
      • icon-headphones
      • +
      • icon-volume-off
      • +
      • icon-volume-down
      • +
      • icon-volume-up
      • +
      • icon-qrcode
      • +
      • icon-barcode
      • +
      • icon-tag
      • +
      • icon-tags
      • +
      • icon-book
      • +
      • icon-bookmark
      • +
      • icon-print
      • +
      • icon-camera
      • +
      • icon-font
      • +
      • icon-bold
      • +
      • icon-italic
      • +
      • icon-text-height
      • +
      • icon-text-width
      • +
      • icon-align-left
      • +
      • icon-align-center
      • +
      • icon-align-right
      • +
      • icon-align-justify
      • +
      • icon-list
      • -
      • icon-indent-left
      • -
      • icon-indent-right
      • -
      • icon-facetime-video
      • -
      • icon-picture
      • -
      • icon-pencil
      • -
      • icon-map-marker
      • -
      • icon-adjust
      • -
      • icon-tint
      • -
      • icon-edit
      • -
      • icon-share
      • -
      • icon-check
      • -
      • icon-move
      • -
      • icon-step-backward
      • -
      • icon-fast-backward
      • -
      • icon-backward
      • -
      • icon-play
      • -
      • icon-pause
      • -
      • icon-stop
      • -
      • icon-forward
      • -
      • icon-fast-forward
      • -
      • icon-step-forward
      • -
      • icon-eject
      • -
      • icon-chevron-left
      • -
      • icon-chevron-right
      • -
      • icon-plus-sign
      • -
      • icon-minus-sign
      • -
      • icon-remove-sign
      • -
      • icon-ok-sign
      • +
      • icon-indent-left
      • +
      • icon-indent-right
      • +
      • icon-facetime-video
      • +
      • icon-picture
      • +
      • icon-pencil
      • +
      • icon-map-marker
      • +
      • icon-adjust
      • +
      • icon-tint
      • +
      • icon-edit
      • +
      • icon-share
      • +
      • icon-check
      • +
      • icon-move
      • +
      • icon-step-backward
      • +
      • icon-fast-backward
      • +
      • icon-backward
      • +
      • icon-play
      • +
      • icon-pause
      • +
      • icon-stop
      • +
      • icon-forward
      • +
      • icon-fast-forward
      • +
      • icon-step-forward
      • +
      • icon-eject
      • +
      • icon-chevron-left
      • +
      • icon-chevron-right
      • +
      • icon-plus-sign
      • +
      • icon-minus-sign
      • +
      • icon-remove-sign
      • +
      • icon-ok-sign
      • -
      • icon-question-sign
      • -
      • icon-info-sign
      • -
      • icon-screenshot
      • -
      • icon-remove-circle
      • -
      • icon-ok-circle
      • -
      • icon-ban-circle
      • -
      • icon-arrow-left
      • -
      • icon-arrow-right
      • -
      • icon-arrow-up
      • -
      • icon-arrow-down
      • -
      • icon-share-alt
      • -
      • icon-resize-full
      • -
      • icon-resize-small
      • -
      • icon-plus
      • -
      • icon-minus
      • -
      • icon-asterisk
      • -
      • icon-exclamation-sign
      • -
      • icon-gift
      • -
      • icon-leaf
      • -
      • icon-fire
      • -
      • icon-eye-open
      • -
      • icon-eye-close
      • -
      • icon-warning-sign
      • -
      • icon-plane
      • -
      • icon-calendar
      • -
      • icon-random
      • -
      • icon-comment
      • -
      • icon-magnet
      • +
      • icon-question-sign
      • +
      • icon-info-sign
      • +
      • icon-screenshot
      • +
      • icon-remove-circle
      • +
      • icon-ok-circle
      • +
      • icon-ban-circle
      • +
      • icon-arrow-left
      • +
      • icon-arrow-right
      • +
      • icon-arrow-up
      • +
      • icon-arrow-down
      • +
      • icon-share-alt
      • +
      • icon-resize-full
      • +
      • icon-resize-small
      • +
      • icon-plus
      • +
      • icon-minus
      • +
      • icon-asterisk
      • +
      • icon-exclamation-sign
      • +
      • icon-gift
      • +
      • icon-leaf
      • +
      • icon-fire
      • +
      • icon-eye-open
      • +
      • icon-eye-close
      • +
      • icon-warning-sign
      • +
      • icon-plane
      • +
      • icon-calendar
      • +
      • icon-random
      • +
      • icon-comment
      • +
      • icon-magnet
      • -
      • icon-chevron-up
      • -
      • icon-chevron-down
      • -
      • icon-retweet
      • -
      • icon-shopping-cart
      • -
      • icon-folder-close
      • -
      • icon-folder-open
      • -
      • icon-resize-vertical
      • -
      • icon-resize-horizontal
      • -
      • icon-hdd
      • -
      • icon-bullhorn
      • -
      • icon-bell
      • -
      • icon-certificate
      • -
      • icon-thumbs-up
      • -
      • icon-thumbs-down
      • -
      • icon-hand-right
      • -
      • icon-hand-left
      • -
      • icon-hand-up
      • -
      • icon-hand-down
      • -
      • icon-circle-arrow-right
      • -
      • icon-circle-arrow-left
      • -
      • icon-circle-arrow-up
      • -
      • icon-circle-arrow-down
      • -
      • icon-globe
      • -
      • icon-wrench
      • -
      • icon-tasks
      • -
      • icon-filter
      • -
      • icon-briefcase
      • -
      • icon-fullscreen
      • -
      +
    • icon-chevron-up
    • +
    • icon-chevron-down
    • +
    • icon-retweet
    • +
    • icon-shopping-cart
    • +
    • icon-folder-close
    • +
    • icon-folder-open
    • +
    • icon-resize-vertical
    • +
    • icon-resize-horizontal
    • +
    • icon-hdd
    • +
    • icon-bullhorn
    • +
    • icon-bell
    • +
    • icon-certificate
    • +
    • icon-thumbs-up
    • +
    • icon-thumbs-down
    • +
    • icon-hand-right
    • +
    • icon-hand-left
    • +
    • icon-hand-up
    • +
    • icon-hand-down
    • +
    • icon-circle-arrow-right
    • +
    • icon-circle-arrow-left
    • +
    • icon-circle-arrow-up
    • +
    • icon-circle-arrow-down
    • +
    • icon-globe
    • +
    • icon-wrench
    • +
    • icon-tasks
    • +
    • icon-filter
    • +
    • icon-briefcase
    • +
    • icon-fullscreen
    • +
    -

    Glyphicons attribution

    -

    {{_i}}Glyphicons Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creators have made this possible at not cost to you as developers. As a thank you, we ask you to include an optional link back to Glyphicons whenever practical.{{/i}}

    +

    Glyphicons attribution

    +

    {{_i}}Glyphicons Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creators have made this possible at not cost to you as developers. As a thank you, we ask you to include an optional link back to Glyphicons whenever practical.{{/i}}

    -
    +
    -

    {{_i}}How to use{{/i}}

    -

    {{_i}}All icons require an <i> tag with a unique class, prefixed with icon-. To use, place the following code just about anywhere:{{/i}}

    +

    {{_i}}How to use{{/i}}

    +

    {{_i}}All icons require an <i> tag with a unique class, prefixed with icon-. To use, place the following code just about anywhere:{{/i}}

     <i class="icon-search"></i>
     
    -

    {{_i}}There are also styles available for inverted (white) icons, made ready with one extra class:{{/i}}

    +

    {{_i}}There are also styles available for inverted (white) icons, made ready with one extra class:{{/i}}

     <i class="icon-search icon-white"></i>
     
    -

    - {{_i}}Heads up!{{/i}} - {{_i}}When using beside strings of text, as in buttons or nav links, be sure to leave a space after the <i> tag for proper spacing.{{/i}} -

    +

    + {{_i}}Heads up!{{/i}} + {{_i}}When using beside strings of text, as in buttons or nav links, be sure to leave a space after the <i> tag for proper spacing.{{/i}} +

    -
    +
    -

    {{_i}}Icon examples{{/i}}

    -

    {{_i}}Use them in buttons, button groups for a toolbar, navigation, or prepended form inputs.{{/i}}

    +

    {{_i}}Icon examples{{/i}}

    +

    {{_i}}Use them in buttons, button groups for a toolbar, navigation, or prepended form inputs.{{/i}}

    -

    {{_i}}Buttons{{/i}}

    - {{! /bs-docs-example }} - -

    {{_i}}Navigation{{/i}}

    - {{! /bs-docs-example }} - -

    {{_i}}Form fields{{/i}}

    -
    -
    - -
    -
    - +

    {{_i}}Buttons{{/i}}

    + - +
    {{! /bs-docs-example }} -
    +

    {{_i}}Navigation{{/i}}

    + {{! /bs-docs-example }} + +

    {{_i}}Form fields{{/i}}

    +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    -
    {{! /span9 }} -
    {{! row}} +
    {{! /span9 }} +
    {{! row}} -
    {{! /container }} +
    {{! /.container }} + +
    {{! /.bs-docs-canvas }} diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 9b1e605210..10dd0901ee 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -7,53 +7,54 @@
    -
    +
    +
    - -
    - -
    + +
    + +
    - - +

    {{_i}}Aligning the menus{{/i}}

    +

    {{_i}}...{{/i}}

    + - -
    - - -

    {{_i}}Examples{{/i}}

    -

    {{_i}}Two basic options, along with two more specific variations.{{/i}}

    - -

    {{_i}}Single button group{{/i}}

    -

    {{_i}}Wrap a series of buttons with .btn in .btn-group.{{/i}}

    -
    -
    - - - + +
    + + +

    {{_i}}Examples{{/i}}

    +

    {{_i}}Two basic options, along with two more specific variations.{{/i}}

    + +

    {{_i}}Single button group{{/i}}

    +

    {{_i}}Wrap a series of buttons with .btn in .btn-group.{{/i}}

    +
    +
    + + + +
    -
     <div class="btn-group">
       <button class="btn">1</button>
    @@ -125,26 +126,26 @@
     </div>
     
    -

    {{_i}}Multiple button groups{{/i}}

    -

    {{_i}}Combine sets of <div class="btn-group"> into a <div class="btn-toolbar"> for more complex components.{{/i}}

    -
    -
    -
    - - - - -
    -
    - - - -
    -
    - +

    {{_i}}Multiple button groups{{/i}}

    +

    {{_i}}Combine sets of <div class="btn-group"> into a <div class="btn-toolbar"> for more complex components.{{/i}}

    +
    +
    +
    + + + + +
    +
    + + + +
    +
    + +
    -
     <div class="btn-toolbar">
       <div class="btn-group">
    @@ -153,16 +154,16 @@
     </div>
     
    -

    {{_i}}Vertical button groups{{/i}}

    -

    {{_i}}Make a set of buttons appear vertically stacked rather than horizontally.{{/i}}

    -
    -
    - - - - +

    {{_i}}Vertical button groups{{/i}}

    +

    {{_i}}Make a set of buttons appear vertically stacked rather than horizontally.{{/i}}

    +
    +
    + + + + +
    -
     <div class="btn-group btn-group-vertical">
       ...
    @@ -170,102 +171,102 @@
     
    -
    +
    -

    {{_i}}Checkbox and radio flavors{{/i}}

    -

    {{_i}}Button groups can also function as radios, where only one button may be active, or checkboxes, where any number of buttons may be active. View the Javascript docs for that.{{/i}}

    +

    {{_i}}Checkbox and radio flavors{{/i}}

    +

    {{_i}}Button groups can also function as radios, where only one button may be active, or checkboxes, where any number of buttons may be active. View the Javascript docs for that.{{/i}}

    -

    {{_i}}Dropdowns in button groups{{/i}}

    -

    {{_i}}Heads up!{{/i}} {{_i}}Buttons with dropdowns must be individually wrapped in their own .btn-group within a .btn-toolbar for proper rendering.{{/i}}

    -
    +

    {{_i}}Dropdowns in button groups{{/i}}

    +

    {{_i}}Heads up!{{/i}} {{_i}}Buttons with dropdowns must be individually wrapped in their own .btn-group within a .btn-toolbar for proper rendering.{{/i}}

    + - -
    - + +
    + -

    {{_i}}Overview and examples{{/i}}

    -

    {{_i}}Use any button to trigger a dropdown menu by placing it within a .btn-group and providing the proper menu markup.{{/i}}

    - {{! /example }} +

    {{_i}}Overview and examples{{/i}}

    +

    {{_i}}Use any button to trigger a dropdown menu by placing it within a .btn-group and providing the proper menu markup.{{/i}}

    + {{! /example }}
     <div class="btn-group">
       <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
    @@ -278,134 +279,134 @@
     </div>
     
    -

    {{_i}}Works with all button sizes{{/i}}

    -

    {{_i}}Button dropdowns work at any size. your button sizes to .btn-large, .btn-small, or .btn-mini.{{/i}}

    - {{! /example }} +

    {{_i}}Works with all button sizes{{/i}}

    +

    {{_i}}Button dropdowns work at any size. your button sizes to .btn-large, .btn-small, or .btn-mini.{{/i}}

    + {{! /example }} -

    {{_i}}Requires javascript{{/i}}

    -

    {{_i}}Button dropdowns require the Bootstrap dropdown plugin to function.{{/i}}

    -

    {{_i}}In some cases—like mobile—dropdown menus will extend outside the viewport. You need to resolve the alignment manually or with custom javascript.{{/i}}

    +

    {{_i}}Requires javascript{{/i}}

    +

    {{_i}}Button dropdowns require the Bootstrap dropdown plugin to function.{{/i}}

    +

    {{_i}}In some cases—like mobile—dropdown menus will extend outside the viewport. You need to resolve the alignment manually or with custom javascript.{{/i}}

    -
    +
    -

    {{_i}}Split button dropdowns{{/i}}

    -

    {{_i}}Building on the button group styles and markup, we can easily create a split button. Split buttons feature a standard action on the left and a dropdown toggle on the right with contextual links.{{/i}}

    - {{! /example }} +

    {{_i}}Split button dropdowns{{/i}}

    +

    {{_i}}Building on the button group styles and markup, we can easily create a split button. Split buttons feature a standard action on the left and a dropdown toggle on the right with contextual links.{{/i}}

    + {{! /example }}
     <div class="btn-group">
       <button class="btn">{{_i}}Action{{/i}}</button>
    @@ -418,49 +419,49 @@
     </div>
     
    -

    {{_i}}Sizes{{/i}}

    -

    {{_i}}Utilize the extra button classes .btn-mini, .btn-small, or .btn-large for sizing.{{/i}}

    - {{! /example }} +

    {{_i}}Sizes{{/i}}

    +

    {{_i}}Utilize the extra button classes .btn-mini, .btn-small, or .btn-large for sizing.{{/i}}

    + {{! /example }}
     <div class="btn-group">
       <button class="btn btn-mini">{{_i}}Action{{/i}}</button>
    @@ -473,34 +474,34 @@
     </div>
     
    -

    {{_i}}Dropup menus{{/i}}

    -

    {{_i}}Dropdown menus can also be toggled from the bottom up by adding a single class to the immediate parent of .dropdown-menu. It will flip the direction of the .caret and reposition the menu itself to move from the bottom up instead of top down.{{/i}}

    - {{! /example }} +

    {{_i}}Dropup menus{{/i}}

    +

    {{_i}}Dropdown menus can also be toggled from the bottom up by adding a single class to the immediate parent of .dropdown-menu. It will flip the direction of the .caret and reposition the menu itself to move from the bottom up instead of top down.{{/i}}

    + {{! /example }}
     <div class="btn-group dropup">
       <button class="btn">{{_i}}Dropup{{/i}}</button>
    @@ -513,29 +514,29 @@
     </div>
     
    -
    +
    - - - - + - - - -
    - - -

    {{_i}}Standard pagination{{/i}}

    -

    {{_i}}Simple pagination inspired by Rdio, great for apps and search results. The large block is hard to miss, easily scalable, and provides large click areas.{{/i}}

    -
    -
     <div class="pagination">
       <ul>
    @@ -1274,26 +1275,26 @@
     
    -
    +
    -

    {{_i}}Options{{/i}}

    +

    {{_i}}Options{{/i}}

    -

    {{_i}}Disabled and active states{{/i}}

    -

    {{_i}}Links are customizable for different circumstances. Use .disabled for unclickable links and .active to indicate the current page.{{/i}}

    -
    -
     <div class="pagination ">
       <ul>
    @@ -1304,39 +1305,39 @@
     </div>
     
    -

    {{_i}}Alignment{{/i}}

    -

    {{_i}}Add one of two optional classes to change the alignment of pagination links: .pagination-centered and .pagination-right.{{/i}}

    -
    -
     <div class="pagination pagination-centered">
       ...
     </div>
     
    -
    -
     <div class="pagination pagination-right">
       ...
    @@ -1344,20 +1345,20 @@
     
    -
    +
    -

    {{_i}}Pager{{/i}}

    -

    {{_i}}Quick previous and next links for simple pagination implementations with light markup and styles. It's great for simple sites like blogs or magazines.{{/i}}

    +

    {{_i}}Pager{{/i}}

    +

    {{_i}}Quick previous and next links for simple pagination implementations with light markup and styles. It's great for simple sites like blogs or magazines.{{/i}}

    -

    {{_i}}Default example{{/i}}

    -

    {{_i}}By default, the pager centers links.{{/i}}

    - +

    {{_i}}Default example{{/i}}

    +

    {{_i}}By default, the pager centers links.{{/i}}

    +
     <ul class="pager">
       <li><a href="#">{{_i}}Previous{{/i}}</a></li>
    @@ -1365,14 +1366,14 @@
     </ul>
     
    -

    {{_i}}Aligned links{{/i}}

    -

    {{_i}}Alternatively, you can align each link to the sides:{{/i}}

    - +

    {{_i}}Aligned links{{/i}}

    +

    {{_i}}Alternatively, you can align each link to the sides:{{/i}}

    +
     <ul class="pager">
       <li class="previous">
    @@ -1384,14 +1385,14 @@
     </ul>
     
    -

    {{_i}}Optional disabled state{{/i}}

    -

    {{_i}}Pager links also use the general .disabled utility class from the pagination.{{/i}}

    - +

    {{_i}}Optional disabled state{{/i}}

    +

    {{_i}}Pager links also use the general .disabled utility class from the pagination.{{/i}}

    +
     <ul class="pager">
       <li class="previous disabled">
    @@ -1401,175 +1402,175 @@
     </ul>
     
    -
    + - -
    - -

    {{_i}}Labels{{/i}}

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {{_i}}Labels{{/i}}{{_i}}Markup{{/i}}
    - {{_i}}Default{{/i}} - - <span class="label">{{_i}}Default{{/i}}</span> -
    - {{_i}}Success{{/i}} - - <span class="label label-success">{{_i}}Success{{/i}}</span> -
    - {{_i}}Warning{{/i}} - - <span class="label label-warning">{{_i}}Warning{{/i}}</span> -
    - {{_i}}Important{{/i}} - - <span class="label label-important">{{_i}}Important{{/i}}</span> -
    - {{_i}}Info{{/i}} - - <span class="label label-info">{{_i}}Info{{/i}}</span> -
    - {{_i}}Inverse{{/i}} - - <span class="label label-inverse">{{_i}}Inverse{{/i}}</span> -
    - -

    {{_i}}Badges{{/i}}

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {{_i}}Name{{/i}}{{_i}}Example{{/i}}{{_i}}Markup{{/i}}
    - {{_i}}Default{{/i}} - - 1 - - <span class="badge">1</span> -
    - {{_i}}Success{{/i}} - - 2 - - <span class="badge badge-success">2</span> -
    - {{_i}}Warning{{/i}} - - 4 - - <span class="badge badge-warning">4</span> -
    - {{_i}}Important{{/i}} - - 6 - - <span class="badge badge-important">6</span> -
    - {{_i}}Info{{/i}} - - 8 - - <span class="badge badge-info">8</span> -
    - {{_i}}Inverse{{/i}} - - 10 - - <span class="badge badge-inverse">10</span> -
    - -
    - - - - -
    - - -

    {{_i}}Hero unit{{/i}}

    -

    {{_i}}A lightweight, flexible component to showcase key content on your site. It works well on marketing and content-heavy sites.{{/i}}

    -
    -
    -

    {{_i}}Hello, world!{{/i}}

    -

    {{_i}}This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.{{/i}}

    -

    {{_i}}Learn more{{/i}}

    + +
    + +

    {{_i}}Labels{{/i}}

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{_i}}Labels{{/i}}{{_i}}Markup{{/i}}
    + {{_i}}Default{{/i}} + + <span class="label">{{_i}}Default{{/i}}</span> +
    + {{_i}}Success{{/i}} + + <span class="label label-success">{{_i}}Success{{/i}}</span> +
    + {{_i}}Warning{{/i}} + + <span class="label label-warning">{{_i}}Warning{{/i}}</span> +
    + {{_i}}Important{{/i}} + + <span class="label label-important">{{_i}}Important{{/i}}</span> +
    + {{_i}}Info{{/i}} + + <span class="label label-info">{{_i}}Info{{/i}}</span> +
    + {{_i}}Inverse{{/i}} + + <span class="label label-inverse">{{_i}}Inverse{{/i}}</span> +
    + +

    {{_i}}Badges{{/i}}

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{_i}}Name{{/i}}{{_i}}Example{{/i}}{{_i}}Markup{{/i}}
    + {{_i}}Default{{/i}} + + 1 + + <span class="badge">1</span> +
    + {{_i}}Success{{/i}} + + 2 + + <span class="badge badge-success">2</span> +
    + {{_i}}Warning{{/i}} + + 4 + + <span class="badge badge-warning">4</span> +
    + {{_i}}Important{{/i}} + + 6 + + <span class="badge badge-important">6</span> +
    + {{_i}}Info{{/i}} + + 8 + + <span class="badge badge-info">8</span> +
    + {{_i}}Inverse{{/i}} + + 10 + + <span class="badge badge-inverse">10</span> +
    + +
    + + + + +
    + + +

    {{_i}}Hero unit{{/i}}

    +

    {{_i}}A lightweight, flexible component to showcase key content on your site. It works well on marketing and content-heavy sites.{{/i}}

    +
    +
    +

    {{_i}}Hello, world!{{/i}}

    +

    {{_i}}This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.{{/i}}

    +

    {{_i}}Learn more{{/i}}

    +
    -
     <div class="hero-unit">
       <h1>{{_i}}Heading{{/i}}</h1>
    @@ -1582,105 +1583,105 @@
     </div>
     
    -

    {{_i}}Page header{{/i}}

    -

    {{_i}}A simple shell for an h1 to appropriately space out and segment sections of content on a page. It can utilize the h1's default small, element as well most other components (with additional styles).{{/i}}

    -
    -
     <div class="page-header">
       <h1>{{_i}}Example page header{{/i}}</h1>
     </div>
     
    -
    + - -
    - + +
    + -

    {{_i}}Default thumbnails{{/i}}

    -

    {{_i}}By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.{{/i}}

    -
    - -
    +

    {{_i}}Default thumbnails{{/i}}

    +

    {{_i}}By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.{{/i}}

    +
    + +
    -

    {{_i}}Highly customizable{{/i}}

    -

    {{_i}}With a bit of extra markup, it's possible to add any kind of HTML content like headings, paragraphs, or buttons into thumbnails.{{/i}}

    -
    -
      -
    • -
      - -
      -

      {{_i}}Thumbnail label{{/i}}

      -

      Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

      -

      {{_i}}Action{{/i}} {{_i}}Action{{/i}}

      +

      {{_i}}Highly customizable{{/i}}

      +

      {{_i}}With a bit of extra markup, it's possible to add any kind of HTML content like headings, paragraphs, or buttons into thumbnails.{{/i}}

      +
      +
        +
      • +
        + +
        +

        {{_i}}Thumbnail label{{/i}}

        +

        Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

        +

        {{_i}}Action{{/i}} {{_i}}Action{{/i}}

        +
        -
      -
    • -
    • -
      - -
      -

      {{_i}}Thumbnail label{{/i}}

      -

      Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

      -

      {{_i}}Action{{/i}} {{_i}}Action{{/i}}

      +
    • +
    • +
      + +
      +

      {{_i}}Thumbnail label{{/i}}

      +

      Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

      +

      {{_i}}Action{{/i}} {{_i}}Action{{/i}}

      +
      -
    - -
  • -
    - -
    -

    {{_i}}Thumbnail label{{/i}}

    -

    Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

    -

    {{_i}}Action{{/i}} {{_i}}Action{{/i}}

    +
  • +
  • +
    + +
    +

    {{_i}}Thumbnail label{{/i}}

    +

    Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

    +

    {{_i}}Action{{/i}} {{_i}}Action{{/i}}

    +
    -
  • - - -
    + + +
    -

    {{_i}}Why use thumbnails{{/i}}

    -

    {{_i}}Thumbnails (previously .media-grid up until v1.4) are great for grids of photos or videos, image search results, retail products, portfolios, and much more. They can be links or static content.{{/i}}

    +

    {{_i}}Why use thumbnails{{/i}}

    +

    {{_i}}Thumbnails (previously .media-grid up until v1.4) are great for grids of photos or videos, image search results, retail products, portfolios, and much more. They can be links or static content.{{/i}}

    -

    {{_i}}Simple, flexible markup{{/i}}

    -

    {{_i}}Thumbnail markup is simple—a ul with any number of li elements is all that is required. It's also super flexible, allowing for any type of content with just a bit more markup to wrap your contents.{{/i}}

    +

    {{_i}}Simple, flexible markup{{/i}}

    +

    {{_i}}Thumbnail markup is simple—a ul with any number of li elements is all that is required. It's also super flexible, allowing for any type of content with just a bit more markup to wrap your contents.{{/i}}

    -

    {{_i}}Uses grid column sizes{{/i}}

    -

    {{_i}}Lastly, the thumbnails component uses existing grid system classes—like .span2 or .span3—for control of thumbnail dimensions.{{/i}}

    +

    {{_i}}Uses grid column sizes{{/i}}

    +

    {{_i}}Lastly, the thumbnails component uses existing grid system classes—like .span2 or .span3—for control of thumbnail dimensions.{{/i}}

    -

    {{_i}}Markup{{/i}}

    -

    {{_i}}As mentioned previously, the required markup for thumbnails is light and straightforward. Here's a look at the default setup for linked images:{{/i}}

    +

    {{_i}}Markup{{/i}}

    +

    {{_i}}As mentioned previously, the required markup for thumbnails is light and straightforward. Here's a look at the default setup for linked images:{{/i}}

     <ul class="thumbnails">
       <li class="span4">
    @@ -1691,7 +1692,7 @@
       ...
     </ul>
     
    -

    {{_i}}For custom HTML content in thumbnails, the markup changes slightly. To allow block level content anywhere, we swap the <a> for a <div> like so:{{/i}}

    +

    {{_i}}For custom HTML content in thumbnails, the markup changes slightly. To allow block level content anywhere, we swap the <a> for a <div> like so:{{/i}}

     <ul class="thumbnails">
       <li class="span4">
    @@ -1705,55 +1706,55 @@
     </ul>
     
    -

    {{_i}}More examples{{/i}}

    -

    {{_i}}Explore all your options with the various grid classes available to you. You can also mix and match different sizes.{{/i}}

    - +

    {{_i}}More examples{{/i}}

    +

    {{_i}}Explore all your options with the various grid classes available to you. You can also mix and match different sizes.{{/i}}

    + - + - -
    - - -

    {{_i}}Default alert{{/i}}

    -

    {{_i}}Wrap any text and an optional dismiss button in .alert for a basic warning alert message.{{/i}}

    -
    -
    - - {{_i}}Warning!{{/i}} {{_i}}Best check yo self, you're not looking too good.{{/i}} + +
    + + +

    {{_i}}Default alert{{/i}}

    +

    {{_i}}Wrap any text and an optional dismiss button in .alert for a basic warning alert message.{{/i}}

    +
    +
    + + {{_i}}Warning!{{/i}} {{_i}}Best check yo self, you're not looking too good.{{/i}} +
    -
     <div class="alert">
       <button type="button" class="close" data-dismiss="alert">×</button>
    @@ -1761,32 +1762,28 @@
     </div>
     
    -

    {{_i}}Dismiss buttons{{/i}}

    -

    {{_i}}Mobile Safari and Mobile Opera browsers, in addition to the data-dismiss="alert" attribute, require an href="#" for the dismissal of alerts when using an <a> tag.{{/i}}

    -
    -<a href="#" class="close" data-dismiss="alert">×</button>
    -
    -

    {{_i}}Alternatively, you may use a <button> element with the data attribute, which we have opted to do for our docs. When using <button>, you must include type="button" or your forms may not submit.{{/i}}

    -
    -<button type="button" class="close" data-dismiss="alert">×</button>
    -
    +

    {{_i}}Dismiss buttons{{/i}}

    +

    {{_i}}Mobile Safari and Mobile Opera browsers, in addition to the data-dismiss="alert" attribute, require an href="#" for the dismissal of alerts when using an <a> tag.{{/i}}

    +
    <a href="#" class="close" data-dismiss="alert">×</button>
    +

    {{_i}}Alternatively, you may use a <button> element with the data attribute, which we have opted to do for our docs. When using <button>, you must include type="button" or your forms may not submit.{{/i}}

    +
    <button type="button" class="close" data-dismiss="alert">×</button>
    -

    {{_i}}Dismiss alerts via javascript{{/i}}

    -

    {{_i}}Use the alerts jQuery plugin for quick and easy dismissal of alerts.{{/i}}

    +

    {{_i}}Dismiss alerts via javascript{{/i}}

    +

    {{_i}}Use the alerts jQuery plugin for quick and easy dismissal of alerts.{{/i}}

    -
    +
    -

    {{_i}}Options{{/i}}

    -

    {{_i}}For longer messages, increase the padding on the top and bottom of the alert wrapper by adding .alert-block.{{/i}}

    -
    -
    - -

    {{_i}}Warning!{{/i}}

    -

    {{_i}}Best check yo self, you're not looking too good.{{/i}} Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

    +

    {{_i}}Options{{/i}}

    +

    {{_i}}For longer messages, increase the padding on the top and bottom of the alert wrapper by adding .alert-block.{{/i}}

    +
    +
    + +

    {{_i}}Warning!{{/i}}

    +

    {{_i}}Best check yo self, you're not looking too good.{{/i}} Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

    +
    -
     <div class="alert alert-block">
       <a class="close" data-dismiss="alert" href="#">&times;</a>
    @@ -1796,97 +1793,97 @@
     
    -
    +
    -

    {{_i}}Contextual alternatives{{/i}}

    -

    {{_i}}Add optional classes to change an alert's connotation.{{/i}}

    +

    {{_i}}Contextual alternatives{{/i}}

    +

    {{_i}}Add optional classes to change an alert's connotation.{{/i}}

    -

    {{_i}}Error or danger{{/i}}

    -
    -
    - - {{_i}}Oh snap!{{/i}} {{_i}}Change a few things up and try submitting again.{{/i}} +

    {{_i}}Error or danger{{/i}}

    +
    +
    + + {{_i}}Oh snap!{{/i}} {{_i}}Change a few things up and try submitting again.{{/i}} +
    -
     <div class="alert alert-error">
       ...
     </div>
     
    -

    {{_i}}Success{{/i}}

    -
    -
    - - {{_i}}Well done!{{/i}} {{_i}}You successfully read this important alert message.{{/i}} +

    {{_i}}Success{{/i}}

    +
    +
    + + {{_i}}Well done!{{/i}} {{_i}}You successfully read this important alert message.{{/i}} +
    -
     <div class="alert alert-success">
       ...
     </div>
     
    -

    {{_i}}Information{{/i}}

    -
    -
    - - {{_i}}Heads up!{{/i}} {{_i}}This alert needs your attention, but it's not super important.{{/i}} +

    {{_i}}Information{{/i}}

    +
    +
    + + {{_i}}Heads up!{{/i}} {{_i}}This alert needs your attention, but it's not super important.{{/i}} +
    -
     <div class="alert alert-info">
       ...
     </div>
     
    -
    + - -
    - - -

    {{_i}}Examples and markup{{/i}}

    - -

    {{_i}}Basic{{/i}}

    -

    {{_i}}Default progress bar with a vertical gradient.{{/i}}

    -
    -
    -
    + +
    + + +

    {{_i}}Examples and markup{{/i}}

    + +

    {{_i}}Basic{{/i}}

    +

    {{_i}}Default progress bar with a vertical gradient.{{/i}}

    +
    +
    +
    +
    -
     <div class="progress">
       <div class="bar" style="width: 60%;"></div>
     </div>
     
    -

    {{_i}}Striped{{/i}}

    -

    {{_i}}Uses a gradient to create a striped effect. Not available in IE7-8.{{/i}}

    -
    -
    -
    +

    {{_i}}Striped{{/i}}

    +

    {{_i}}Uses a gradient to create a striped effect. Not available in IE7-8.{{/i}}

    +
    +
    +
    +
    -
     <div class="progress progress-striped">
       <div class="bar" style="width: 20%;"></div>
     </div>
     
    -

    {{_i}}Animated{{/i}}

    -

    {{_i}}Add .active to .progress-striped to animate the stripes right to left. Not available in all versions of IE.{{/i}}

    -
    -
    -
    +

    {{_i}}Animated{{/i}}

    +

    {{_i}}Add .active to .progress-striped to animate the stripes right to left. Not available in all versions of IE.{{/i}}

    +
    +
    +
    +
    -
     <div class="progress progress-striped active">
       <div class="bar" style="width: 40%;"></div>
    @@ -1894,27 +1891,27 @@
     
    -
    +
    -

    {{_i}}Options{{/i}}

    +

    {{_i}}Options{{/i}}

    -

    {{_i}}Additional colors{{/i}}

    -

    {{_i}}Progress bars use some of the same button and alert classes for consistent styles.{{/i}}

    -
    -
    -
    +

    {{_i}}Additional colors{{/i}}

    +

    {{_i}}Progress bars use some of the same button and alert classes for consistent styles.{{/i}}

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
     <div class="progress progress-info">
       <div class="bar" style="width: 20%"></div>
    @@ -1930,22 +1927,22 @@
     </div>
     
    -

    {{_i}}Striped bars{{/i}}

    -

    {{_i}}Similar to the solid colors, we have varied striped progress bars.{{/i}}

    -
    -
    -
    +

    {{_i}}Striped bars{{/i}}

    +

    {{_i}}Similar to the solid colors, we have varied striped progress bars.{{/i}}

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
     <div class="progress progress-info progress-striped">
       <div class="bar" style="width: 20%"></div>
    @@ -1962,74 +1959,75 @@
     
    -
    +
    -

    {{_i}}Browser support{{/i}}

    -

    {{_i}}Progress bars use CSS3 gradients, transitions, and animations to achieve all their effects. These features are not supported in IE7-9 or older versions of Firefox.{{/i}}

    -

    {{_i}}Opera and IE do not support animations at this time.{{/i}}

    +

    {{_i}}Browser support{{/i}}

    +

    {{_i}}Progress bars use CSS3 gradients, transitions, and animations to achieve all their effects. These features are not supported in IE7-9 or older versions of Firefox.{{/i}}

    +

    {{_i}}Opera and IE do not support animations at this time.{{/i}}

    -
    + - -
    - - -

    {{_i}}Wells{{/i}}

    -

    {{_i}}Use the well as a simple effect on an element to give it an inset effect.{{/i}}

    -
    -
    - {{_i}}Look, I'm in a well!{{/i}} + +
    + + +

    {{_i}}Wells{{/i}}

    +

    {{_i}}Use the well as a simple effect on an element to give it an inset effect.{{/i}}

    +
    +
    + {{_i}}Look, I'm in a well!{{/i}} +
    -
     <div class="well">
       ...
     </div>
     
    -

    {{_i}}Optional classes{{/i}}

    -

    {{_i}}Control padding and rounded corners with two optional modifier classes.{{/i}}

    -
    -
    - {{_i}}Look, I'm in a well!{{/i}} +

    {{_i}}Optional classes{{/i}}

    +

    {{_i}}Control padding and rounded corners with two optional modifier classes.{{/i}}

    +
    +
    + {{_i}}Look, I'm in a well!{{/i}} +
    -
     <div class="well well-large">
       ...
     </div>
     
    -
    -
    - {{_i}}Look, I'm in a well!{{/i}} +
    +
    + {{_i}}Look, I'm in a well!{{/i}} +
    -
     <div class="well well-small">
       ...
     </div>
     
    -

    {{_i}}Close icon{{/i}}

    -

    {{_i}}Use the generic close icon for dismissing content like modals and alerts.{{/i}}

    -
    -

    -
    -
    <button class="close">&times;</button>
    -

    {{_i}}iOS devices require an href="#" for click events if you rather use an anchor.{{/i}}

    -
    <a class="close" href="#">&times;</a>
    -

    {{_i}}Helper classes{{/i}}

    -

    {{_i}}Simple, focused classes for small display or behavior tweaks.{{/i}}

    +

    {{_i}}Close icon{{/i}}

    +

    {{_i}}Use the generic close icon for dismissing content like modals and alerts.{{/i}}

    +
    +

    +
    +
    <button class="close">&times;</button>
    +

    {{_i}}iOS devices require an href="#" for click events if you rather use an anchor.{{/i}}

    +
    <a class="close" href="#">&times;</a>
    -

    {{_i}}.pull-left{{/i}}

    -

    {{_i}}Float an element left{{/i}}

    +

    {{_i}}Helper classes{{/i}}

    +

    {{_i}}Simple, focused classes for small display or behavior tweaks.{{/i}}

    + +

    {{_i}}.pull-left{{/i}}

    +

    {{_i}}Float an element left{{/i}}

     class="pull-left"
     
    @@ -2039,8 +2037,8 @@ class="pull-left" } -

    {{_i}}.pull-right{{/i}}

    -

    {{_i}}Float an element right{{/i}}

    +

    {{_i}}.pull-right{{/i}}

    +

    {{_i}}Float an element right{{/i}}

     class="pull-right"
     
    @@ -2050,8 +2048,8 @@ class="pull-right" } -

    {{_i}}.muted{{/i}}

    -

    {{_i}}Change an element's color to #999{{/i}}

    +

    {{_i}}.muted{{/i}}

    +

    {{_i}}Change an element's color to #999{{/i}}

     class="muted"
     
    @@ -2061,8 +2059,8 @@ class="muted" } -

    {{_i}}.clearfix{{/i}}

    -

    {{_i}}Clear the float on any element{{/i}}

    +

    {{_i}}.clearfix{{/i}}

    +

    {{_i}}Clear the float on any element{{/i}}

     class="clearfix"
     
    @@ -2080,11 +2078,13 @@ class="clearfix" } -
    + -
    {{! /span9 }} -
    {{! row}} +
    {{! /span9 }} +
    {{! row}} -
    {{! /container }} +
    {{! /.container }} + +
    {{! /.bs-docs-canvas }} diff --git a/docs/templates/pages/customize.mustache b/docs/templates/pages/customize.mustache index 1e56eb3ba0..28d8a3169e 100644 --- a/docs/templates/pages/customize.mustache +++ b/docs/templates/pages/customize.mustache @@ -3,357 +3,360 @@

    {{_i}}Customize and download{{/i}}

    -

    {{_i}}Download the full repository or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.{{/i}}

    +

    {{_i}}Download Bootstrap or customize variables, components, javascript plugins, and more.{{/i}}

    -
    +
    +
    - -
    - -
    + +
    + +
    - -
    -
    - -
    -
    -

    {{_i}}Scaffolding{{/i}}

    - - - - -

    {{_i}}Base CSS{{/i}}

    - - - - - - - -
    -
    -

    {{_i}}Components{{/i}}

    - - - - - - - - - - -

    {{_i}}JS Components{{/i}}

    - - - - - - -
    -
    -

    {{_i}}Miscellaneous{{/i}}

    - - - - -

    {{_i}}Responsive{{/i}}

    - - - - - -
    -
    -
    + + +
    + +
    +
    +

    {{_i}}Scaffolding{{/i}}

    + + + + +

    {{_i}}Base CSS{{/i}}

    + + + + + + + +
    +
    +

    {{_i}}Components{{/i}}

    + + + + + + + + + + +

    {{_i}}JS Components{{/i}}

    + + + + + + +
    +
    +

    {{_i}}Miscellaneous{{/i}}

    + + + + +

    {{_i}}Responsive{{/i}}

    + + + + + +
    +
    +
    -
    - -
    -
    - - - - - - -
    -
    - - - - - - -
    -
    -

    {{_i}}Heads up!{{/i}}

    -

    {{_i}}All checked plugins will be compiled into a single file, bootstrap.js. All plugins require the latest version of jQuery to be included.{{/i}}

    -
    -
    -
    +
    + +
    +
    + + + + + + +
    +
    + + + + + + +
    +
    +

    {{_i}}Heads up!{{/i}}

    +

    {{_i}}All checked plugins will be compiled into a single file, bootstrap.js. All plugins require the latest version of jQuery to be included.{{/i}}

    +
    +
    +
    -
    - -
    -
    -

    {{_i}}Scaffolding{{/i}}

    - - - - +
    + +
    +
    +

    {{_i}}Scaffolding{{/i}}

    + + + + -

    {{_i}}Links{{/i}}

    - - - - -

    {{_i}}Colors{{/i}}

    - - - - - - - - - - - - - - +

    {{_i}}Links{{/i}}

    + + + + +

    {{_i}}Colors{{/i}}

    + + + + + + + + + + + + + + -

    {{_i}}Sprites{{/i}}

    - - - - +

    {{_i}}Sprites{{/i}}

    + + + + -
    -
    -

    {{_i}}Grid system{{/i}}

    - - - - - - - - - - - - - - +
    +
    +

    {{_i}}Grid system{{/i}}

    + + + + + + + + + + + + + + -

    {{_i}}Typography{{/i}}

    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    -

    {{_i}}Tables{{/i}}

    - - - - - - - - +

    {{_i}}Typography{{/i}}

    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    +

    {{_i}}Tables{{/i}}

    + + + + + + + + -

    {{_i}}Navbar{{/i}}

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - +

    {{_i}}Navbar{{/i}}

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + -

    {{_i}}Dropdowns{{/i}}

    - - - - - - - - - - -
    -
    -

    {{_i}}Forms{{/i}}

    - - - - - - - - - - - - +

    {{_i}}Dropdowns{{/i}}

    + + + + + + + + + + +
    +
    +

    {{_i}}Forms{{/i}}

    + + + + + + + + + + + + - - - - + + + + -

    {{_i}}Form states & alerts{{/i}}

    - - - - - - - - - - - - - - - - -
    -
    -
    +

    {{_i}}Form states & alerts{{/i}}

    + + + + + + + + + + + + + + + + +
    +
    +
    -
    - -
    - Customize and Download -

    {{_i}}What's included?{{/i}}

    -

    {{_i}}Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.{{/i}}

    -
    -
    -
    +
    + +
    + Customize and Download +

    {{_i}}What's included?{{/i}}

    +

    {{_i}}Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.{{/i}}

    +
    +
    + -
    {{! /span9 }} -
    {{! row}} +
    {{! /span9 }} +
    {{! row}} -
    {{! /container }} +
    {{! /.container }} + +
    {{! /.bs-docs-canvas }} diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache index e3f2c7ae7c..fbe4b365f3 100644 --- a/docs/templates/pages/getting-started.mustache +++ b/docs/templates/pages/getting-started.mustache @@ -7,55 +7,58 @@
    -
    +
    +
    -
    - -
    + +
    + +
    - -
    - -

    {{_i}}Before downloading, be sure to have a code editor (we recommend Sublime Text 2) and some working knowledge of HTML and CSS. We won't walk through the source files here, but they are available for download. We'll focus on getting started with our the compiled Bootstrap files.{{/i}}

    - -
    -
    -

    Download compiled

    -

    Fastest way to get started: get the compiled and minified versions of our CSS, JS, and images. No docs or original source files.

    -

    Download Bootstrap

    + +
    + -
    -

    Download source

    -

    Get the original files for all CSS and Javasript, along with a local copy of the docs by downloading the latest version directly from GitHub.

    -

    Download Bootstrap source

    +

    {{_i}}Before downloading, be sure to have a code editor (we recommend Sublime Text 2) and some working knowledge of HTML and CSS. We won't walk through the source files here, but they are available for download. We'll focus on getting started with our the compiled Bootstrap files.{{/i}}

    + +
    +
    +

    Download compiled

    +

    Fastest way to get started: get the compiled and minified versions of our CSS, JS, and images. No docs or original source files.

    +

    Download Bootstrap

    +
    +
    +

    Download source

    +

    Get the original files for all CSS and Javasript, along with a local copy of the docs by downloading the latest version directly from GitHub.

    +

    Download Bootstrap source

    +
    -
    -
    +
    - -
    - -

    {{_i}}Once downloaded, unzip the compressed folder to see the structure of (the compiled) Bootstrap. You'll see something like this:{{/i}}

    + +
    + +

    {{_i}}Once downloaded, unzip the compressed folder to see the structure of (the compiled) Bootstrap. You'll see something like this:{{/i}}

       bootstrap/
       ├── css/
    @@ -69,67 +72,67 @@
       │   ├── glyphicons-halflings-white.png
       └── README.md
     
    -

    {{_i}}This is the most basic form of Bootstrap: compiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (bootstrap.*), as well as compiled and minified CSS and JS (bootstrap.min.*). The image files are compressed using ImageOptim, a Mac app for compressing PNGs.{{/i}}

    -
    +

    {{_i}}This is the most basic form of Bootstrap: compiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (bootstrap.*), as well as compiled and minified CSS and JS (bootstrap.min.*). The image files are compressed using ImageOptim, a Mac app for compressing PNGs.{{/i}}

    +
    - -
    - -

    {{_i}}Bootstrap comes equipped with HTML, CSS, and JS for all sorts of things, but they can be summarized with a handful of categories visible at the top of the Bootstrap documentation.{{/i}}

    + +
    + +

    {{_i}}Bootstrap comes equipped with HTML, CSS, and JS for all sorts of things, but they can be summarized with a handful of categories visible at the top of the Bootstrap documentation.{{/i}}

    -

    Scaffolding

    -

    Global styles for the body to reset type and background, link styles, grid system, and two simple layouts.

    +

    Scaffolding

    +

    Global styles for the body to reset type and background, link styles, grid system, and two simple layouts.

    -

    Base CSS

    -

    Styles for common HTML elements like typography, code, tables, forms, and buttons. Also includes Glyphicons, a great little icon set.

    +

    Base CSS

    +

    Styles for common HTML elements like typography, code, tables, forms, and buttons. Also includes Glyphicons, a great little icon set.

    -

    Components

    -

    Basic styles for common interface components like tabs and pills, navbar, alerts, page headers, and more.

    +

    Components

    +

    Basic styles for common interface components like tabs and pills, navbar, alerts, page headers, and more.

    -

    Javascript plugins

    -

    Similar to Components, these Javascript plugins are interactive components for things like tooltips, popovers, modals, and more.

    +

    Javascript plugins

    +

    Similar to Components, these Javascript plugins are interactive components for things like tooltips, popovers, modals, and more.

    -
    +
    -

    List of components

    -

    Together, the Components and Javascript plugins sections provide the following interface elements:

    -
      -
    • Button groups
    • -
    • Button dropdowns
    • -
    • Navigational tabs, pills, and lists
    • -
    • Navbar
    • -
    • Labels
    • -
    • Badges
    • -
    • Page headers and hero unit
    • -
    • Thumbnails
    • -
    • Alerts
    • -
    • Progress bars
    • -
    • Modals
    • -
    • Dropdowns
    • -
    • Tooltips
    • -
    • Popovers
    • -
    • Accordion
    • -
    • Carousel
    • -
    • Typeahead
    • -
    -

    {{_i}}In future guides, we may walk through these components individually in more detail. Until then, look for each of these in the documentation for information on how to utilize and customize them.{{/i}}

    -
    +

    List of components

    +

    Together, the Components and Javascript plugins sections provide the following interface elements:

    +
      +
    • Button groups
    • +
    • Button dropdowns
    • +
    • Navigational tabs, pills, and lists
    • +
    • Navbar
    • +
    • Labels
    • +
    • Badges
    • +
    • Page headers and hero unit
    • +
    • Thumbnails
    • +
    • Alerts
    • +
    • Progress bars
    • +
    • Modals
    • +
    • Dropdowns
    • +
    • Tooltips
    • +
    • Popovers
    • +
    • Accordion
    • +
    • Carousel
    • +
    • Typeahead
    • +
    +

    {{_i}}In future guides, we may walk through these components individually in more detail. Until then, look for each of these in the documentation for information on how to utilize and customize them.{{/i}}

    +
    - -
    - -

    {{_i}}With a brief intro into the contents out of the way, we can focus putting Bootstrap to use. To do that, we'll utilize a basic HTML template that includes everything we mentioned in the File structure.{{/i}}

    -

    {{_i}}Now, here's a look at a typical HTML file:{{/i}}

    + +
    + +

    {{_i}}With a brief intro into the contents out of the way, we can focus putting Bootstrap to use. To do that, we'll utilize a basic HTML template that includes everything we mentioned in the File structure.{{/i}}

    +

    {{_i}}Now, here's a look at a typical HTML file:{{/i}}

     <html>
       <head>
    @@ -140,7 +143,7 @@
       </body>
     </html>
     
    -

    {{_i}}To make this a Bootstrapped template, just include the appropriate CSS and JS files:{{/i}}

    +

    {{_i}}To make this a Bootstrapped template, just include the appropriate CSS and JS files:{{/i}}

     <html>
       <head>
    @@ -154,61 +157,63 @@
       </body>
     </html>
     
    -

    {{_i}}And you're set! With those two files added, you can begin to develop any site or application with Bootstrap.{{/i}}

    -
    +

    {{_i}}And you're set! With those two files added, you can begin to develop any site or application with Bootstrap.{{/i}}

    +
    - -
    - -

    {{_i}}Move beyond the base template with a few example layouts. We encourage folks to iterate on these examples and not simply use them as an end result.{{/i}}

    -
      -
    • - - - -

      {{_i}}Basic marketing site{{/i}}

      -

      {{_i}}Featuring a hero unit for a primary message and three supporting elements.{{/i}}

      -
    • -
    • - - - -

      {{_i}}Fluid layout{{/i}}

      -

      {{_i}}Uses our new responsive, fluid grid system to create a seamless liquid layout.{{/i}}

      -
    • -
    • - - - -

      {{_i}}Starter template{{/i}}

      -

      {{_i}}A barebones HTML document with all the Bootstrap CSS and javascript included.{{/i}}

      -
    • -
    -
    + +
    + +

    {{_i}}Move beyond the base template with a few example layouts. We encourage folks to iterate on these examples and not simply use them as an end result.{{/i}}

    +
      +
    • + + + +

      {{_i}}Basic marketing site{{/i}}

      +

      {{_i}}Featuring a hero unit for a primary message and three supporting elements.{{/i}}

      +
    • +
    • + + + +

      {{_i}}Fluid layout{{/i}}

      +

      {{_i}}Uses our new responsive, fluid grid system to create a seamless liquid layout.{{/i}}

      +
    • +
    • + + + +

      {{_i}}Starter template{{/i}}

      +

      {{_i}}A barebones HTML document with all the Bootstrap CSS and javascript included.{{/i}}

      +
    • +
    +
    - -
    - -

    Head to the docs for information, examples, and code snippets, or take the next leap and customize Bootstrap for any upcoming project.

    - Visit the Bootstrap docs - Customize Bootstrap -
    + +
    + +

    Head to the docs for information, examples, and code snippets, or take the next leap and customize Bootstrap for any upcoming project.

    + Visit the Bootstrap docs + Customize Bootstrap +
    -
    {{! /span9 }} -
    {{! row}} +
    {{! /span9 }} +
    {{! row}} -
    {{! /container }} +
    {{! /.container }} + +
    {{! /.bs-docs-canvas }} diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index a943b09bfa..acb3f4c6f8 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -11,79 +11,83 @@
    -
    -
    - -
    -
    +
    -
    - -
    - -

    {{_i}}Introducing Bootstrap.{{/i}}

    - - -
    -
    - -

    {{_i}}By nerds, for nerds.{{/i}}

    -

    {{_i}}Built at Twitter by @mdo and @fat, Bootstrap utilizes LESS CSS, is compiled via Node, and is managed through GitHub to help nerds do awesome stuff on the web.{{/i}}

    -
    -
    - -

    {{_i}}Made for everyone.{{/i}}

    -

    {{_i}}Bootstrap was made to not only look and behave great in the latest desktop browsers (as well as IE7!), but in tablet and smartphone browsers via responsive CSS as well.{{/i}}

    -
    -
    - -

    {{_i}}Packed with features.{{/i}}

    -

    {{_i}}A 12-column responsive grid, dozens of components, javascript plugins, typography, form controls, and even a web-based Customizer to make Bootstrap your own.{{/i}}

    -
    -
    - -
    - -

    {{_i}}Built with Bootstrap.{{/i}}

    - -
    -
    -
    +
    -
    {{! /container }} +
    + +

    {{_i}}Introducing Bootstrap.{{/i}}

    + + +
    +
    + +

    {{_i}}By nerds, for nerds.{{/i}}

    +

    {{_i}}Built at Twitter by @mdo and @fat, Bootstrap utilizes LESS CSS, is compiled via Node, and is managed through GitHub to help nerds do awesome stuff on the web.{{/i}}

    +
    +
    + +

    {{_i}}Made for everyone.{{/i}}

    +

    {{_i}}Bootstrap was made to not only look and behave great in the latest desktop browsers (as well as IE7!), but in tablet and smartphone browsers via responsive CSS as well.{{/i}}

    +
    +
    + +

    {{_i}}Packed with features.{{/i}}

    +

    {{_i}}A 12-column responsive grid, dozens of components, javascript plugins, typography, form controls, and even a web-based Customizer to make Bootstrap your own.{{/i}}

    +
    +
    + +
    + +

    {{_i}}Built with Bootstrap.{{/i}}

    + +
    + +
    + +
    {{! /.marketing }} + +
    {{! /.container }} + +
    {{! /.bs-docs-canvas }} diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 81ef75209d..78c138a44b 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -7,106 +7,107 @@
    -
    +
    +
    - -
    - -
    - - - - -
    - - -

    {{_i}}Individual or compiled{{/i}}

    -

    {{_i}}If you have downloaded the latest version of Bootstrap, both bootstrap.js and bootstrap.min.js contain all of these plugins.{{/i}}

    - -

    {{_i}}Data attributes{{/i}}

    -

    {{_i}}...{{/i}}

    - -

    {{_i}}Programmatic API{{/i}}

    -

    {{_i}}...{{/i}}

    - - - {{! Thought: consider porting much of the JS readme here? }} - -
    - - - - -
    - -

    {{_i}}About transitions{{/i}}

    -

    {{_i}}For simple transition effects, include bootstrap-transition.js once alongside the other JS files. If you're using the compiled (or minified) bootstrap.js, there is no need to include this—it's already there.{{/i}}

    -

    {{_i}}Use cases{{/i}}

    -

    {{_i}}A few examples of the transition plugin:{{/i}}

    -
    +
    +
    - -
    - - - -

    {{_i}}Examples{{/i}}

    -

    {{_i}}Modals are streamlined, but flexible, dialog prompts with the minimum required functionality and smart defaults.{{/i}}

    - -

    {{_i}}Static example{{/i}}

    -

    {{_i}}A rendered modal with header, body, and set of actions in the footer.{{/i}}

    -
    - {{! /example }} + +

    {{_i}}Individual or compiled{{/i}}

    +

    {{_i}}If you have downloaded the latest version of Bootstrap, both bootstrap.js and bootstrap.min.js contain all of these plugins.{{/i}}

    + +

    {{_i}}Data attributes{{/i}}

    +

    {{_i}}...{{/i}}

    + +

    {{_i}}Programmatic API{{/i}}

    +

    {{_i}}...{{/i}}

    + + + {{! Thought: consider porting much of the JS readme here? }} + +
    + + + + +
    + +

    {{_i}}About transitions{{/i}}

    +

    {{_i}}For simple transition effects, include bootstrap-transition.js once alongside the other JS files. If you're using the compiled (or minified) bootstrap.js, there is no need to include this—it's already there.{{/i}}

    +

    {{_i}}Use cases{{/i}}

    +

    {{_i}}A few examples of the transition plugin:{{/i}}

    +
      +
    • {{_i}}Sliding or fading in modals{{/i}}
    • +
    • {{_i}}Fading out tabs{{/i}}
    • +
    • {{_i}}Fading out alerts{{/i}}
    • +
    • {{_i}}Sliding carousel panes{{/i}}
    • +
    + + {{! Ideas: include docs for .fade.in, .slide.in, etc }} +
    + + + + +
    + + + +

    {{_i}}Examples{{/i}}

    +

    {{_i}}Modals are streamlined, but flexible, dialog prompts with the minimum required functionality and smart defaults.{{/i}}

    + +

    {{_i}}Static example{{/i}}

    +

    {{_i}}A rendered modal with header, body, and set of actions in the footer.{{/i}}

    +
    + +
    {{! /example }}
     <div class="modal hide fade">
       <div class="modal-header">
    @@ -123,43 +124,43 @@
     </div>
     
    -

    {{_i}}Live demo{{/i}}

    -

    {{_i}}Toggle a modal via javascript by clicking the button below. It will slide down and fade in from the top of the page.{{/i}}

    - -
    + - - - -
    - + +
    + -

    {{_i}}Example in navbar{{/i}}

    -

    {{_i}}The ScrollSpy plugin is for automatically updating nav targets based on scroll position. Scroll the area below the navbar and watch the active class change. The dropdown sub items will be highlighted as well.{{/i}}

    -
    -
    +

    {{_i}}Events{{/i}}

    + + + + + + + + + + + + + +
    {{_i}}Event{{/i}}{{_i}}Description{{/i}}
    {{_i}}activate{{/i}}{{_i}}This event fires whenever a new item becomes activated by the scrollspy.{{/i}}
    +
    - -
    - - - -

    {{_i}}Example tabs{{/i}}

    -

    {{_i}}Add quick, dynamic tab functionality to transiton through panes of local content, even via dropdown menus.{{/i}}

    -
    - -
    -
    -

    Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.

    -
    -
    -

    Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente accusamus tattooed echo park.

    -
    - - + +
    + -
    {{! /example }} -
    +

    {{_i}}Example tabs{{/i}}

    +

    {{_i}}Add quick, dynamic tab functionality to transiton through panes of local content, even via dropdown menus.{{/i}}

    +
    + +
    +
    +

    Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.

    +
    +
    +

    Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente accusamus tattooed echo park.

    +
    + + +
    +
    {{! /example }} -

    {{_i}}Usage{{/i}}

    -

    {{_i}}Enable tabbable tabs via javascript (each tab needs to be activated individually):{{/i}}

    +
    + + +

    {{_i}}Usage{{/i}}

    +

    {{_i}}Enable tabbable tabs via javascript (each tab needs to be activated individually):{{/i}}

     $('#myTab a').click(function (e) {
       e.preventDefault();
       $(this).tab('show');
     })
    -

    {{_i}}You can activate individual tabs in several ways:{{/i}}

    +

    {{_i}}You can activate individual tabs in several ways:{{/i}}

     $('#myTab a[href="#profile"]').tab('show'); // Select tab by name
     $('#myTab a:first').tab('show'); // Select first tab
    @@ -597,8 +597,8 @@ $('#myTab a:last').tab('show'); // Select last tab
     $('#myTab li:eq(2) a').tab('show'); // Select third tab (0-indexed)
     
    -

    {{_i}}Markup{{/i}}

    -

    {{_i}}You can activate a tab or pill navigation without writing any javascript by simply specifying data-toggle="tab" or data-toggle="pill" on an element. Adding the nav and nav-tabs classes to the tab ul will apply the bootstrap tab styling.{{/i}}

    +

    {{_i}}Markup{{/i}}

    +

    {{_i}}You can activate a tab or pill navigation without writing any javascript by simply specifying data-toggle="tab" or data-toggle="pill" on an element. Adding the nav and nav-tabs classes to the tab ul will apply the bootstrap tab styling.{{/i}}

     <ul class="nav nav-tabs">
       <li><a href="#home" data-toggle="tab">{{_i}}Home{{/i}}</a></li>
    @@ -607,11 +607,11 @@ $('#myTab li:eq(2) a').tab('show'); // Select third tab (0-indexed)
       <li><a href="#settings" data-toggle="tab">{{_i}}Settings{{/i}}</a></li>
     </ul>
    -

    {{_i}}Methods{{/i}}

    -

    $().tab

    -

    - {{_i}}Activates a tab element and content container. Tab should have either a data-target or an href targeting a container node in the DOM.{{/i}} -

    +

    {{_i}}Methods{{/i}}

    +

    $().tab

    +

    + {{_i}}Activates a tab element and content container. Tab should have either a data-target or an href targeting a container node in the DOM.{{/i}} +

     <ul class="nav nav-tabs" id="myTab">
       <li class="active"><a href="#home">{{_i}}Home{{/i}}</a></li>
    @@ -634,429 +634,425 @@ $('#myTab li:eq(2) a').tab('show'); // Select third tab (0-indexed)
     </script>
     
    -

    {{_i}}Events{{/i}}

    - - - - - - - - - - - - - - - - - -
    {{_i}}Event{{/i}}{{_i}}Description{{/i}}
    {{_i}}show{{/i}}{{_i}}This event fires on tab show, but before the new tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively.{{/i}}
    {{_i}}shown{{/i}}{{_i}}This event fires on tab show after a tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively.{{/i}}
    +

    {{_i}}Events{{/i}}

    + + + + + + + + + + + + + + + + + +
    {{_i}}Event{{/i}}{{_i}}Description{{/i}}
    {{_i}}show{{/i}}{{_i}}This event fires on tab show, but before the new tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively.{{/i}}
    {{_i}}shown{{/i}}{{_i}}This event fires on tab show after a tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively.{{/i}}
     $('a[data-toggle="tab"]').on('shown', function (e) {
       e.target // activated tab
       e.relatedTarget // previous tab
     })
     
    -
    + - -
    - + +
    + -

    {{_i}}Examples{{/i}}

    -

    {{_i}}Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, use CSS3 for animations, and data-attributes for local title storage.{{/i}}

    -

    {{_i}}Hover over the links below to see tooltips:{{/i}}

    -
    -

    {{_i}}Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.{{/i}} -

    -
    {{! /example }} +

    {{_i}}Examples{{/i}}

    +

    {{_i}}Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, use CSS3 for animations, and data-attributes for local title storage.{{/i}}

    +

    {{_i}}Hover over the links below to see tooltips:{{/i}}

    +
    +

    {{_i}}Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.{{/i}} +

    +
    {{! /example }} -

    {{_i}}Four directions{{/i}}

    - {{! /example }} +

    {{_i}}Four directions{{/i}}

    + {{! /example }} -
    +
    -

    {{_i}}Usage{{/i}}

    -

    {{_i}}Trigger the tooltip via javascript:{{/i}}

    -
    $('#example').tooltip({{_i}}options{{/i}})
    +

    {{_i}}Usage{{/i}}

    +

    {{_i}}Trigger the tooltip via javascript:{{/i}}

    +
    $('#example').tooltip({{_i}}options{{/i}})
    -

    {{_i}}Options{{/i}}

    -

    {{_i}}Options can be passed via data attributes or javascript. For data attributes, append the option name to data-, as in data-animation="".{{/i}}

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {{_i}}Name{{/i}}{{_i}}type{{/i}}{{_i}}default{{/i}}{{_i}}description{{/i}}
    {{_i}}animation{{/i}}{{_i}}boolean{{/i}}true{{_i}}apply a css fade transition to the tooltip{{/i}}
    {{_i}}html{{/i}}{{_i}}boolean{{/i}}true{{_i}}Insert html into the tooltip. If false, jquery's text method will be used to insert content into the dom. Use text if you're worried about XSS attacks.{{/i}}
    {{_i}}placement{{/i}}{{_i}}string|function{{/i}}'top'{{_i}}how to position the tooltip{{/i}} - top | bottom | left | right
    {{_i}}selector{{/i}}{{_i}}string{{/i}}false{{_i}}If a selector is provided, tooltip objects will be delegated to the specified targets.{{/i}}
    {{_i}}title{{/i}}{{_i}}string | function{{/i}}''{{_i}}default title value if `title` tag isn't present{{/i}}
    {{_i}}trigger{{/i}}{{_i}}string{{/i}}'hover'{{_i}}how tooltip is triggered{{/i}} - hover | focus | manual
    {{_i}}delay{{/i}}{{_i}}number | object{{/i}}0 -

    {{_i}}delay showing and hiding the tooltip (ms) - does not apply to manual trigger type{{/i}}

    -

    {{_i}}If a number is supplied, delay is applied to both hide/show{{/i}}

    -

    {{_i}}Object structure is: delay: { show: 500, hide: 100 }{{/i}}

    -
    -
    - {{_i}}Heads up!{{/i}} - {{_i}}Options for individual tooltips can alternatively be specified through the use of data attributes.{{/i}} -
    +

    {{_i}}Options{{/i}}

    +

    {{_i}}Options can be passed via data attributes or javascript. For data attributes, append the option name to data-, as in data-animation="".{{/i}}

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{_i}}Name{{/i}}{{_i}}type{{/i}}{{_i}}default{{/i}}{{_i}}description{{/i}}
    {{_i}}animation{{/i}}{{_i}}boolean{{/i}}true{{_i}}apply a css fade transition to the tooltip{{/i}}
    {{_i}}html{{/i}}{{_i}}boolean{{/i}}true{{_i}}Insert html into the tooltip. If false, jquery's text method will be used to insert content into the dom. Use text if you're worried about XSS attacks.{{/i}}
    {{_i}}placement{{/i}}{{_i}}string|function{{/i}}'top'{{_i}}how to position the tooltip{{/i}} - top | bottom | left | right
    {{_i}}selector{{/i}}{{_i}}string{{/i}}false{{_i}}If a selector is provided, tooltip objects will be delegated to the specified targets.{{/i}}
    {{_i}}title{{/i}}{{_i}}string | function{{/i}}''{{_i}}default title value if `title` tag isn't present{{/i}}
    {{_i}}trigger{{/i}}{{_i}}string{{/i}}'hover'{{_i}}how tooltip is triggered{{/i}} - hover | focus | manual
    {{_i}}delay{{/i}}{{_i}}number | object{{/i}}0 +

    {{_i}}delay showing and hiding the tooltip (ms) - does not apply to manual trigger type{{/i}}

    +

    {{_i}}If a number is supplied, delay is applied to both hide/show{{/i}}

    +

    {{_i}}Object structure is: delay: { show: 500, hide: 100 }{{/i}}

    +
    +
    + {{_i}}Heads up!{{/i}} + {{_i}}Options for individual tooltips can alternatively be specified through the use of data attributes.{{/i}} +
    -

    {{_i}}Markup{{/i}}

    -

    {{_i}}For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.{{/i}}

    +

    {{_i}}Markup{{/i}}

    +

    {{_i}}For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.{{/i}}

     <a href="#" rel="tooltip" title="{{_i}}first tooltip{{/i}}">{{_i}}hover over me{{/i}}</a>
     
    -

    {{_i}}Methods{{/i}}

    -

    $().tooltip({{_i}}options{{/i}})

    -

    {{_i}}Attaches a tooltip handler to an element collection.{{/i}}

    -

    .tooltip('show')

    -

    {{_i}}Reveals an element's tooltip.{{/i}}

    -
    $('#element').tooltip('show')
    -

    .tooltip('hide')

    -

    {{_i}}Hides an element's tooltip.{{/i}}

    -
    $('#element').tooltip('hide')
    -

    .tooltip('toggle')

    -

    {{_i}}Toggles an element's tooltip.{{/i}}

    -
    $('#element').tooltip('toggle')
    -

    .tooltip('destroy')

    -

    {{_i}}Destroys an element's tooltip.{{/i}}

    -
    $('#element').tooltip('destroy')
    -
    +

    {{_i}}Methods{{/i}}

    +

    $().tooltip({{_i}}options{{/i}})

    +

    {{_i}}Attaches a tooltip handler to an element collection.{{/i}}

    +

    .tooltip('show')

    +

    {{_i}}Reveals an element's tooltip.{{/i}}

    +
    $('#element').tooltip('show')
    +

    .tooltip('hide')

    +

    {{_i}}Hides an element's tooltip.{{/i}}

    +
    $('#element').tooltip('hide')
    +

    .tooltip('toggle')

    +

    {{_i}}Toggles an element's tooltip.{{/i}}

    +
    $('#element').tooltip('toggle')
    +

    .tooltip('destroy')

    +

    {{_i}}Destroys an element's tooltip.{{/i}}

    +
    $('#element').tooltip('destroy')
    +
    - -
    - + +
    + -

    {{_i}}Examples{{/i}}

    -

    {{_i}}Add small overlays of content, like those on the iPad, to any element for housing secondary information. Hover over the button to trigger the popover. Requires Tooltip to be included.{{/i}}

    +

    {{_i}}Examples{{/i}}

    +

    {{_i}}Add small overlays of content, like those on the iPad, to any element for housing secondary information. Hover over the button to trigger the popover. Requires Tooltip to be included.{{/i}}

    -

    {{_i}}Static popover{{/i}}

    -

    {{_i}}Four options are available: top, right, bottom, and left aligned.{{/i}}

    -
    -
    -
    -

    Popover top

    -
    -

    Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.

    +

    {{_i}}Static popover{{/i}}

    +

    {{_i}}Four options are available: top, right, bottom, and left aligned.{{/i}}

    +
    +
    +
    +

    Popover top

    +
    +

    Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.

    +
    -
    -
    -
    -

    Popover right

    -
    -

    Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.

    +
    +
    +

    Popover right

    +
    +

    Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.

    +
    -
    -
    -
    -

    Popover bottom

    -
    -

    Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.

    +
    +
    +

    Popover bottom

    +
    +

    Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.

    +
    -
    -
    -
    -

    Popover left

    -
    -

    Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.

    +
    +
    +

    Popover left

    +
    +

    Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.

    +
    + +
    +
    +

    {{_i}}No markup shown as popovers are generated from javascript and content within a data attribute.{{/i}}

    + +

    Live demo

    + -
    -
    -

    {{_i}}No markup shown as popovers are generated from javascript and content within a data attribute.{{/i}}

    -

    Live demo

    - +
    -
    +

    {{_i}}Usage{{/i}}

    +

    {{_i}}Enable popovers via javascript:{{/i}}

    +
    $('#example').popover({{_i}}options{{/i}})
    - -

    {{_i}}Usage{{/i}}

    -

    {{_i}}Enable popovers via javascript:{{/i}}

    -
    $('#example').popover({{_i}}options{{/i}})
    - -

    {{_i}}Options{{/i}}

    -

    {{_i}}Options can be passed via data attributes or javascript. For data attributes, append the option name to data-, as in data-animation="".{{/i}}

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {{_i}}Name{{/i}}{{_i}}type{{/i}}{{_i}}default{{/i}}{{_i}}description{{/i}}
    {{_i}}animation{{/i}}{{_i}}boolean{{/i}}true{{_i}}apply a css fade transition to the tooltip{{/i}}
    {{_i}}html{{/i}}{{_i}}boolean{{/i}}true{{_i}}Insert html into the popover. If false, jquery's text method will be used to insert content into the dom. Use text if you're worried about XSS attacks.{{/i}}
    {{_i}}placement{{/i}}{{_i}}string|function{{/i}}'right'{{_i}}how to position the popover{{/i}} - top | bottom | left | right
    {{_i}}selector{{/i}}{{_i}}string{{/i}}false{{_i}}if a selector is provided, tooltip objects will be delegated to the specified targets{{/i}}
    {{_i}}trigger{{/i}}{{_i}}string{{/i}}'hover'{{_i}}how popover is triggered{{/i}} - hover | focus | manual
    {{_i}}title{{/i}}{{_i}}string | function{{/i}}''{{_i}}default title value if `title` attribute isn't present{{/i}}
    {{_i}}content{{/i}}{{_i}}string | function{{/i}}''{{_i}}default content value if `data-content` attribute isn't present{{/i}}
    {{_i}}delay{{/i}}{{_i}}number | object{{/i}}0 -

    {{_i}}delay showing and hiding the popover (ms) - does not apply to manual trigger type{{/i}}

    -

    {{_i}}If a number is supplied, delay is applied to both hide/show{{/i}}

    -

    {{_i}}Object structure is: delay: { show: 500, hide: 100 }{{/i}}

    -
    -
    - {{_i}}Heads up!{{/i}} - {{_i}}Options for individual popovers can alternatively be specified through the use of data attributes.{{/i}} -
    - -

    {{_i}}Markup{{/i}}

    -

    {{_i}}For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.{{/i}}

    - -

    {{_i}}Methods{{/i}}

    -

    $().popover({{_i}}options{{/i}})

    -

    {{_i}}Initializes popovers for an element collection.{{/i}}

    -

    .popover('show')

    -

    {{_i}}Reveals an elements popover.{{/i}}

    -
    $('#element').popover('show')
    -

    .popover('hide')

    -

    {{_i}}Hides an elements popover.{{/i}}

    -
    $('#element').popover('hide')
    -

    .popover('toggle')

    -

    {{_i}}Toggles an elements popover.{{/i}}

    -
    $('#element').popover('toggle')
    -

    .popover('destroy')

    -

    {{_i}}Destroys an element's popover.{{/i}}

    -
    $('#element').popover('destroy')
    -
    - - - - -
    - - - -

    {{_i}}Example alerts{{/i}}

    -

    {{_i}}Add dismiss functionality to all alerge messages with this plugin.{{/i}}

    -
    -
    - - {{_i}}Holy guacamole!{{/i}} {{_i}}Best check yo self, you're not looking too good.{{/i}} +

    {{_i}}Options{{/i}}

    +

    {{_i}}Options can be passed via data attributes or javascript. For data attributes, append the option name to data-, as in data-animation="".{{/i}}

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{_i}}Name{{/i}}{{_i}}type{{/i}}{{_i}}default{{/i}}{{_i}}description{{/i}}
    {{_i}}animation{{/i}}{{_i}}boolean{{/i}}true{{_i}}apply a css fade transition to the tooltip{{/i}}
    {{_i}}html{{/i}}{{_i}}boolean{{/i}}true{{_i}}Insert html into the popover. If false, jquery's text method will be used to insert content into the dom. Use text if you're worried about XSS attacks.{{/i}}
    {{_i}}placement{{/i}}{{_i}}string|function{{/i}}'right'{{_i}}how to position the popover{{/i}} - top | bottom | left | right
    {{_i}}selector{{/i}}{{_i}}string{{/i}}false{{_i}}if a selector is provided, tooltip objects will be delegated to the specified targets{{/i}}
    {{_i}}trigger{{/i}}{{_i}}string{{/i}}'hover'{{_i}}how popover is triggered{{/i}} - hover | focus | manual
    {{_i}}title{{/i}}{{_i}}string | function{{/i}}''{{_i}}default title value if `title` attribute isn't present{{/i}}
    {{_i}}content{{/i}}{{_i}}string | function{{/i}}''{{_i}}default content value if `data-content` attribute isn't present{{/i}}
    {{_i}}delay{{/i}}{{_i}}number | object{{/i}}0 +

    {{_i}}delay showing and hiding the popover (ms) - does not apply to manual trigger type{{/i}}

    +

    {{_i}}If a number is supplied, delay is applied to both hide/show{{/i}}

    +

    {{_i}}Object structure is: delay: { show: 500, hide: 100 }{{/i}}

    +
    +
    + {{_i}}Heads up!{{/i}} + {{_i}}Options for individual popovers can alternatively be specified through the use of data attributes.{{/i}}
    -
    {{! /example }} -
    -
    - -

    {{_i}}Oh snap! You got an error!{{/i}}

    -

    {{_i}}Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.{{/i}}

    -

    - {{_i}}Take this action{{/i}} {{_i}}Or do this{{/i}} -

    +

    {{_i}}Markup{{/i}}

    +

    {{_i}}For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.{{/i}}

    + +

    {{_i}}Methods{{/i}}

    +

    $().popover({{_i}}options{{/i}})

    +

    {{_i}}Initializes popovers for an element collection.{{/i}}

    +

    .popover('show')

    +

    {{_i}}Reveals an elements popover.{{/i}}

    +
    $('#element').popover('show')
    +

    .popover('hide')

    +

    {{_i}}Hides an elements popover.{{/i}}

    +
    $('#element').popover('hide')
    +

    .popover('toggle')

    +

    {{_i}}Toggles an elements popover.{{/i}}

    +
    $('#element').popover('toggle')
    +

    .popover('destroy')

    +

    {{_i}}Destroys an element's popover.{{/i}}

    +
    $('#element').popover('destroy')
    +
    + + + + +
    + -
    {{! /example }} -
    +

    {{_i}}Example alerts{{/i}}

    +

    {{_i}}Add dismiss functionality to all alerge messages with this plugin.{{/i}}

    +
    +
    + + {{_i}}Holy guacamole!{{/i}} {{_i}}Best check yo self, you're not looking too good.{{/i}} +
    +
    {{! /example }} + +
    +
    + +

    {{_i}}Oh snap! You got an error!{{/i}}

    +

    {{_i}}Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.{{/i}}

    +

    + {{_i}}Take this action{{/i}} {{_i}}Or do this{{/i}} +

    +
    +
    {{! /example }} -

    {{_i}}Usage{{/i}}

    -

    {{_i}}Enable dismissal of an alert via javascript:{{/i}}

    -
    $(".alert").alert()
    - -

    {{_i}}Markup{{/i}}

    -

    {{_i}}Just add data-dismiss="alert" to your close button to automatically give an alert close functionality.{{/i}}

    -
    <a class="close" data-dismiss="alert" href="#">&times;</a>
    - -

    {{_i}}Methods{{/i}}

    -

    $().alert()

    -

    {{_i}}Wraps all alerts with close functionality. To have your alerts animate out when closed, make sure they have the .fade and .in class already applied to them.{{/i}}

    -

    .alert('close')

    -

    {{_i}}Closes an alert.{{/i}}

    -
    $(".alert").alert('close')
    +
    -

    {{_i}}Events{{/i}}

    -

    {{_i}}Bootstrap's alert class exposes a few events for hooking into alert functionality.{{/i}}

    - - - - - - - - - - - - - - - - - -
    {{_i}}Event{{/i}}{{_i}}Description{{/i}}
    {{_i}}close{{/i}}{{_i}}This event fires immediately when the close instance method is called.{{/i}}
    {{_i}}closed{{/i}}{{_i}}This event is fired when the alert has been closed (will wait for css transitions to complete).{{/i}}
    +

    {{_i}}Usage{{/i}}

    +

    {{_i}}Enable dismissal of an alert via javascript:{{/i}}

    +
    $(".alert").alert()
    + +

    {{_i}}Markup{{/i}}

    +

    {{_i}}Just add data-dismiss="alert" to your close button to automatically give an alert close functionality.{{/i}}

    +
    <a class="close" data-dismiss="alert" href="#">&times;</a>
    + +

    {{_i}}Methods{{/i}}

    +

    $().alert()

    +

    {{_i}}Wraps all alerts with close functionality. To have your alerts animate out when closed, make sure they have the .fade and .in class already applied to them.{{/i}}

    +

    .alert('close')

    +

    {{_i}}Closes an alert.{{/i}}

    +
    $(".alert").alert('close')
    + + +

    {{_i}}Events{{/i}}

    +

    {{_i}}Bootstrap's alert class exposes a few events for hooking into alert functionality.{{/i}}

    + + + + + + + + + + + + + + + + + +
    {{_i}}Event{{/i}}{{_i}}Description{{/i}}
    {{_i}}close{{/i}}{{_i}}This event fires immediately when the close instance method is called.{{/i}}
    {{_i}}closed{{/i}}{{_i}}This event is fired when the alert has been closed (will wait for css transitions to complete).{{/i}}
     $('#my-alert').bind('closed', function () {
       // {{_i}}do something…{{/i}}
     })
     
    - + - -
    - - -

    {{_i}}Example uses{{/i}}

    -

    {{_i}}Do more with buttons. Control button states or create groups of buttons for more components like toolbars.{{/i}}

    - -

    {{_i}}Stateful{{/i}}

    -

    {{_i}}Add data-loading-text="Loading..." to use a loading state on a button.{{/i}}

    -
    - -
    {{! /example }} -
    -<button type="button" class="btn btn-primary" data-loading-text="Loading...">Loading state</button>
    -
    - -

    {{_i}}Single toggle{{/i}}

    -

    {{_i}}Add data-toggle="button" to activate toggling on a single button.{{/i}}

    -
    - -
    {{! /example }} -
    -<button type="button" class="btn" data-toggle="button">Single Toggle</button>
    -
    - -

    {{_i}}Checkbox{{/i}}

    -

    {{_i}}Add data-toggle="buttons-checkbox" for checkbox style toggling on btn-group.{{/i}}

    -
    -
    - - - + +
    + -
    {{! /example }} + +

    {{_i}}Example uses{{/i}}

    +

    {{_i}}Do more with buttons. Control button states or create groups of buttons for more components like toolbars.{{/i}}

    + +

    {{_i}}Stateful{{/i}}

    +

    {{_i}}Add data-loading-text="Loading..." to use a loading state on a button.{{/i}}

    +
    + +
    {{! /example }} +
    <button type="button" class="btn btn-primary" data-loading-text="Loading...">Loading state</button>
    + +

    {{_i}}Single toggle{{/i}}

    +

    {{_i}}Add data-toggle="button" to activate toggling on a single button.{{/i}}

    +
    + +
    {{! /example }} +
    <button type="button" class="btn" data-toggle="button">Single Toggle</button>
    + +

    {{_i}}Checkbox{{/i}}

    +

    {{_i}}Add data-toggle="buttons-checkbox" for checkbox style toggling on btn-group.{{/i}}

    +
    +
    + + + +
    +
    {{! /example }}
     <div class="btn-group" data-toggle="buttons-checkbox">
       <button type="button" class="btn">Left</button>
    @@ -1065,15 +1061,15 @@ $('#my-alert').bind('closed', function () {
     </div>
     
    -

    {{_i}}Radio{{/i}}

    -

    {{_i}}Add data-toggle="buttons-radio" for radio style toggling on btn-group.{{/i}}

    -
    -
    - - - -
    -
    {{! /example }} +

    {{_i}}Radio{{/i}}

    +

    {{_i}}Add data-toggle="buttons-radio" for radio style toggling on btn-group.{{/i}}

    +
    +
    + + + +
    +
    {{! /example }}
     <div class="btn-group" data-toggle="buttons-radio">
       <button type="button" class="btn">Left</button>
    @@ -1083,101 +1079,102 @@ $('#my-alert').bind('closed', function () {
     
    -
    +
    -

    {{_i}}Usage{{/i}}

    -

    {{_i}}Enable buttons via javascript:{{/i}}

    -
    $('.nav-tabs').button()
    +

    {{_i}}Usage{{/i}}

    +

    {{_i}}Enable buttons via javascript:{{/i}}

    +
    $('.nav-tabs').button()
    -

    {{_i}}Markup{{/i}}

    -

    {{_i}}Data attributes are integral to the button plugin. Check out the example code below for the various markup types.{{/i}}

    +

    {{_i}}Markup{{/i}}

    +

    {{_i}}Data attributes are integral to the button plugin. Check out the example code below for the various markup types.{{/i}}

    -

    {{_i}}Options{{/i}}

    -

    {{_i}}None{{/i}}

    +

    {{_i}}Options{{/i}}

    +

    {{_i}}None{{/i}}

    -

    {{_i}}Methods{{/i}}

    -

    $().button('toggle')

    -

    {{_i}}Toggles push state. Gives the button the appearance that it has been activated.{{/i}}

    -
    - {{_i}}Heads up!{{/i}} - {{_i}}You can enable auto toggling of a button by using the data-toggle attribute.{{/i}} -
    -
    <button type="button" class="btn" data-toggle="button" >…</button>
    -

    $().button('loading')

    -

    {{_i}}Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute data-loading-text.{{/i}} -

    -
    <button type="button" class="btn" data-loading-text="loading stuff..." >...</button>
    -
    - {{_i}}Heads up!{{/i}} - {{_i}}Firefox persists the disabled state across page loads. A workaround for this is to use autocomplete="off".{{/i}} -
    -

    $().button('reset')

    -

    {{_i}}Resets button state - swaps text to original text.{{/i}}

    -

    $().button(string)

    -

    {{_i}}Resets button state - swaps text to any data defined text state.{{/i}}

    +

    {{_i}}Methods{{/i}}

    +

    $().button('toggle')

    +

    {{_i}}Toggles push state. Gives the button the appearance that it has been activated.{{/i}}

    +
    + {{_i}}Heads up!{{/i}} + {{_i}}You can enable auto toggling of a button by using the data-toggle attribute.{{/i}} +
    +
    <button type="button" class="btn" data-toggle="button" >…</button>
    +

    $().button('loading')

    +

    {{_i}}Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute data-loading-text.{{/i}} +

    +
    <button type="button" class="btn" data-loading-text="loading stuff..." >...</button>
    +
    + {{_i}}Heads up!{{/i}} + {{_i}}Firefox persists the disabled state across page loads. A workaround for this is to use autocomplete="off".{{/i}} +
    +

    $().button('reset')

    +

    {{_i}}Resets button state - swaps text to original text.{{/i}}

    +

    $().button(string)

    +

    {{_i}}Resets button state - swaps text to any data defined text state.{{/i}}

    <button type="button" class="btn" data-complete-text="finished!" >...</button>
     <script>
       $('.btn').button('complete')
    -</script>
    -
    +</script> + + - -
    - - -

    {{_i}}About{{/i}}

    -

    {{_i}}Get base styles and flexible support for collapsible components like accordions and navigation.{{/i}}

    -

    * {{_i}}Requires the Transitions plugin to be included.{{/i}}

    - -

    {{_i}}Example accordion{{/i}}

    -

    {{_i}}Using the collapse plugin, we built a simple accordion style widget:{{/i}}

    - -
    -
    -
    - -
    -
    - Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS. -
    -
    -
    -
    - -
    -
    - Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS. -
    -
    -
    -
    - -
    -
    - Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS. -
    -
    -
    + +
    + -
    {{! /example }} + +

    {{_i}}About{{/i}}

    +

    {{_i}}Get base styles and flexible support for collapsible components like accordions and navigation.{{/i}}

    +

    * {{_i}}Requires the Transitions plugin to be included.{{/i}}

    + +

    {{_i}}Example accordion{{/i}}

    +

    {{_i}}Using the collapse plugin, we built a simple accordion style widget:{{/i}}

    + +
    +
    +
    + +
    +
    + Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS. +
    +
    +
    +
    + +
    +
    + Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS. +
    +
    +
    +
    + +
    +
    + Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS. +
    +
    +
    +
    +
    {{! /example }}
     <button type="button" class="btn btn-danger" data-toggle="collapse" data-target="#demo">
       {{_i}}simple collapsible{{/i}}
    @@ -1187,137 +1184,138 @@ $('#my-alert').bind('closed', function () {
     
    -
    +
    -

    {{_i}}Usage{{/i}}

    +

    {{_i}}Usage{{/i}}

    -

    {{_i}}Via data attributes{{/i}}

    -

    {{_i}}Just add data-toggle="collapse" and a data-target to element to automatically assign control of a collapsible element. The data-target attribute accepts a css selector to apply the collapse to. Be sure to add the class collapse to the collapsible element. If you'd like it to default open, add the additional class in.{{/i}}

    -

    {{_i}}To add accordion-like group management to a collapsible control, add the data attribute data-parent="#selector". Refer to the demo to see this in action.{{/i}}

    +

    {{_i}}Via data attributes{{/i}}

    +

    {{_i}}Just add data-toggle="collapse" and a data-target to element to automatically assign control of a collapsible element. The data-target attribute accepts a css selector to apply the collapse to. Be sure to add the class collapse to the collapsible element. If you'd like it to default open, add the additional class in.{{/i}}

    +

    {{_i}}To add accordion-like group management to a collapsible control, add the data attribute data-parent="#selector". Refer to the demo to see this in action.{{/i}}

    -

    {{_i}}Via javascript{{/i}}

    -

    {{_i}}Enable manually with:{{/i}}

    -
    $(".collapse").collapse()
    +

    {{_i}}Via javascript{{/i}}

    +

    {{_i}}Enable manually with:{{/i}}

    +
    $(".collapse").collapse()
    -

    {{_i}}Options{{/i}}

    -

    {{_i}}Options can be passed via data attributes or javascript. For data attributes, append the option name to data-, as in data-parent="".{{/i}}

    - - - - - - - - - - - - - - - - - - - - - - - -
    {{_i}}Name{{/i}}{{_i}}type{{/i}}{{_i}}default{{/i}}{{_i}}description{{/i}}
    {{_i}}parent{{/i}}{{_i}}selector{{/i}}false{{_i}}If selector then all collapsible elements under the specified parent will be closed when this collapsible item is shown. (similar to traditional accordion behavior){{/i}}
    {{_i}}toggle{{/i}}{{_i}}boolean{{/i}}true{{_i}}Toggles the collapsible element on invocation{{/i}}
    +

    {{_i}}Options{{/i}}

    +

    {{_i}}Options can be passed via data attributes or javascript. For data attributes, append the option name to data-, as in data-parent="".{{/i}}

    + + + + + + + + + + + + + + + + + + + + + + + +
    {{_i}}Name{{/i}}{{_i}}type{{/i}}{{_i}}default{{/i}}{{_i}}description{{/i}}
    {{_i}}parent{{/i}}{{_i}}selector{{/i}}false{{_i}}If selector then all collapsible elements under the specified parent will be closed when this collapsible item is shown. (similar to traditional accordion behavior){{/i}}
    {{_i}}toggle{{/i}}{{_i}}boolean{{/i}}true{{_i}}Toggles the collapsible element on invocation{{/i}}
    -

    {{_i}}Methods{{/i}}

    -

    .collapse({{_i}}options{{/i}})

    -

    {{_i}}Activates your content as a collapsible element. Accepts an optional options object.{{/i}} +

    {{_i}}Methods{{/i}}

    +

    .collapse({{_i}}options{{/i}})

    +

    {{_i}}Activates your content as a collapsible element. Accepts an optional options object.{{/i}}

     $('#myCollapsible').collapse({
       toggle: false
    -})
    -

    .collapse('toggle')

    -

    {{_i}}Toggles a collapsible element to shown or hidden.{{/i}}

    -

    .collapse('show')

    -

    {{_i}}Shows a collapsible element.{{/i}}

    -

    .collapse('hide')

    -

    {{_i}}Hides a collapsible element.{{/i}}

    +}) + +

    .collapse('toggle')

    +

    {{_i}}Toggles a collapsible element to shown or hidden.{{/i}}

    +

    .collapse('show')

    +

    {{_i}}Shows a collapsible element.{{/i}}

    +

    .collapse('hide')

    +

    {{_i}}Hides a collapsible element.{{/i}}

    -

    {{_i}}Events{{/i}}

    -

    {{_i}}Bootstrap's collapse class exposes a few events for hooking into collapse functionality.{{/i}}

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    {{_i}}Event{{/i}}{{_i}}Description{{/i}}
    {{_i}}show{{/i}}{{_i}}This event fires immediately when the show instance method is called.{{/i}}
    {{_i}}shown{{/i}}{{_i}}This event is fired when a collapse element has been made visible to the user (will wait for css transitions to complete).{{/i}}
    {{_i}}hide{{/i}} - {{_i}}This event is fired immediately when the hide method has been called.{{/i}} -
    {{_i}}hidden{{/i}}{{_i}}This event is fired when a collapse element has been hidden from the user (will wait for css transitions to complete).{{/i}}
    +

    {{_i}}Events{{/i}}

    +

    {{_i}}Bootstrap's collapse class exposes a few events for hooking into collapse functionality.{{/i}}

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{_i}}Event{{/i}}{{_i}}Description{{/i}}
    {{_i}}show{{/i}}{{_i}}This event fires immediately when the show instance method is called.{{/i}}
    {{_i}}shown{{/i}}{{_i}}This event is fired when a collapse element has been made visible to the user (will wait for css transitions to complete).{{/i}}
    {{_i}}hide{{/i}} + {{_i}}This event is fired immediately when the hide method has been called.{{/i}} +
    {{_i}}hidden{{/i}}{{_i}}This event is fired when a collapse element has been hidden from the user (will wait for css transitions to complete).{{/i}}
     $('#myCollapsible').on('hidden', function () {
       // {{_i}}do something…{{/i}}
     })
    -
    + - - +

    {{_i}}Events{{/i}}

    +

    {{_i}}Bootstrap's carousel class exposes two events for hooking into carousel functionality.{{/i}}

    + + + + + + + + + + + + + + + + + +
    {{_i}}Event{{/i}}{{_i}}Description{{/i}}
    {{_i}}slide{{/i}}{{_i}}This event fires immediately when the slide instance method is invoked.{{/i}}
    {{_i}}slid{{/i}}{{_i}}This event is fired when the carousel has completed its slide transition.{{/i}}
    + - -
    - + +
    + -

    {{_i}}Example{{/i}}

    -

    {{_i}}A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.{{/i}}

    -
    - -
    {{! /example }} -
    -<input type="text" data-provide="typeahead">
    -
    +

    {{_i}}Example{{/i}}

    +

    {{_i}}A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.{{/i}}

    +
    + +
    {{! /example }} +
    <input type="text" data-provide="typeahead">
    -
    +
    -

    {{_i}}Usage{{/i}}

    +

    {{_i}}Usage{{/i}}

    -

    {{_i}}Via data attributes{{/i}}

    -

    {{_i}}Add data attributes to register an element with typeahead functionality as shown in the example above.{{/i}}

    +

    {{_i}}Via data attributes{{/i}}

    +

    {{_i}}Add data attributes to register an element with typeahead functionality as shown in the example above.{{/i}}

    -

    {{_i}}Via javascript{{/i}}

    -

    {{_i}}Call the typeahead manually with:{{/i}}

    -
    $('.typeahead').typeahead()
    +

    {{_i}}Via javascript{{/i}}

    +

    {{_i}}Call the typeahead manually with:{{/i}}

    +
    $('.typeahead').typeahead()
    -

    {{_i}}Options{{/i}}

    -

    {{_i}}Options can be passed via data attributes or javascript. For data attributes, append the option name to data-, as in data-source="".{{/i}}

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {{_i}}Name{{/i}}{{_i}}type{{/i}}{{_i}}default{{/i}}{{_i}}description{{/i}}
    {{_i}}source{{/i}}{{_i}}array, function{{/i}}[ ]{{_i}}The data source to query against. May be an array of strings or a function. The function is passed two arguments, the query value in the input field and the process callback. The function may be used synchronously by returning the data source directly or asynchronously via the process callback's single argument.{{/i}}
    {{_i}}items{{/i}}{{_i}}number{{/i}}8{{_i}}The max number of items to display in the dropdown.{{/i}}
    {{_i}}matcher{{/i}}{{_i}}function{{/i}}{{_i}}case insensitive{{/i}}{{_i}}The method used to determine if a query matches an item. Accepts a single argument, the item against which to test the query. Access the current query with this.query. Return a boolean true if query is a match.{{/i}}
    {{_i}}sorter{{/i}}{{_i}}function{{/i}}{{_i}}exact match,
    case sensitive,
    case insensitive{{/i}}
    {{_i}}Method used to sort autocomplete results. Accepts a single argument items and has the scope of the typeahead instance. Reference the current query with this.query.{{/i}}
    {{_i}}highlighter{{/i}}{{_i}}function{{/i}}{{_i}}highlights all default matches{{/i}}{{_i}}Method used to highlight autocomplete results. Accepts a single argument item and has the scope of the typeahead instance. Should return html.{{/i}}
    +

    {{_i}}Options{{/i}}

    +

    {{_i}}Options can be passed via data attributes or javascript. For data attributes, append the option name to data-, as in data-source="".{{/i}}

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{_i}}Name{{/i}}{{_i}}type{{/i}}{{_i}}default{{/i}}{{_i}}description{{/i}}
    {{_i}}source{{/i}}{{_i}}array, function{{/i}}[ ]{{_i}}The data source to query against. May be an array of strings or a function. The function is passed two arguments, the query value in the input field and the process callback. The function may be used synchronously by returning the data source directly or asynchronously via the process callback's single argument.{{/i}}
    {{_i}}items{{/i}}{{_i}}number{{/i}}8{{_i}}The max number of items to display in the dropdown.{{/i}}
    {{_i}}matcher{{/i}}{{_i}}function{{/i}}{{_i}}case insensitive{{/i}}{{_i}}The method used to determine if a query matches an item. Accepts a single argument, the item against which to test the query. Access the current query with this.query. Return a boolean true if query is a match.{{/i}}
    {{_i}}sorter{{/i}}{{_i}}function{{/i}}{{_i}}exact match,
    case sensitive,
    case insensitive{{/i}}
    {{_i}}Method used to sort autocomplete results. Accepts a single argument items and has the scope of the typeahead instance. Reference the current query with this.query.{{/i}}
    {{_i}}highlighter{{/i}}{{_i}}function{{/i}}{{_i}}highlights all default matches{{/i}}{{_i}}Method used to highlight autocomplete results. Accepts a single argument item and has the scope of the typeahead instance. Should return html.{{/i}}
    -

    {{_i}}Methods{{/i}}

    -

    .typeahead({{_i}}options{{/i}})

    -

    {{_i}}Initializes an input with a typeahead.{{/i}}

    -
    +

    {{_i}}Methods{{/i}}

    +

    .typeahead({{_i}}options{{/i}})

    +

    {{_i}}Initializes an input with a typeahead.{{/i}}

    +
    - -
    - + +
    + -

    {{_i}}...{{/i}}

    -

    {{_i}}...{{/i}}

    -
    +

    {{_i}}...{{/i}}

    +

    {{_i}}...{{/i}}

    +
    -
    -
    -...
    -
    -
    +
    +
    ...
    + -
    {{! /span9 }} -
    {{! row}} +
    {{! /span9 }} +
    {{! row}} -
    {{! /container }} +
    {{! /.container }} + +
    {{! /.bs-docs-canvas }} diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 4b9d4c5b25..5a613a45fa 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -7,35 +7,35 @@
    +
    -
    +
    - - -
    - -
    + +
    + +
    - -
    - + +
    + -

    {{_i}}Requires HTML5 doctype{{/i}}

    -

    {{_i}}Bootstrap makes use of certain HTML elements and CSS properties that require the use of the HTML5 doctype. Include it at the beginning of all your projects.{{/i}}

    +

    {{_i}}Requires HTML5 doctype{{/i}}

    +

    {{_i}}Bootstrap makes use of certain HTML elements and CSS properties that require the use of the HTML5 doctype. Include it at the beginning of all your projects.{{/i}}

     <!DOCTYPE html>
     <html lang="en">
    @@ -43,84 +43,84 @@
     </html>
     
    -

    {{_i}}Typography and links{{/i}}

    -

    {{_i}}Bootstrap sets basic global display, typography, and link styles. Specifically, we:{{/i}}

    -
      -
    • {{_i}}Remove margin on the body{{/i}}
    • -
    • {{_i}}Set background-color: white; on the body{{/i}}
    • -
    • {{_i}}Use the @baseFontFamily, @baseFontSize, and @baseLineHeight attributes as our typographyic base{{/i}}
    • -
    • {{_i}}Set the global link color via @linkColor and apply link underlines only on :hover{{/i}}
    • -
    -

    {{_i}}These styles can be found within scaffolding.less.{{/i}}

    +

    {{_i}}Typography and links{{/i}}

    +

    {{_i}}Bootstrap sets basic global display, typography, and link styles. Specifically, we:{{/i}}

    +
      +
    • {{_i}}Remove margin on the body{{/i}}
    • +
    • {{_i}}Set background-color: white; on the body{{/i}}
    • +
    • {{_i}}Use the @baseFontFamily, @baseFontSize, and @baseLineHeight attributes as our typographyic base{{/i}}
    • +
    • {{_i}}Set the global link color via @linkColor and apply link underlines only on :hover{{/i}}
    • +
    +

    {{_i}}These styles can be found within scaffolding.less.{{/i}}

    -

    {{_i}}Reset via Normalize{{/i}}

    -

    {{_i}}With Bootstrap 2, the old reset block has been dropped in favor of Normalize.css, a project by Nicolas Gallagher that also powers the HTML5 Boilerplate. While we use much of Normalize within our reset.less, we have removed some elements specifically for Bootstrap.{{/i}}

    +

    {{_i}}Reset via Normalize{{/i}}

    +

    {{_i}}With Bootstrap 2, the old reset block has been dropped in favor of Normalize.css, a project by Nicolas Gallagher that also powers the HTML5 Boilerplate. While we use much of Normalize within our reset.less, we have removed some elements specifically for Bootstrap.{{/i}}

    -
    +
    - -
    - - -

    {{_i}}Live grid example{{/i}}

    -

    {{_i}}The default Bootstrap grid system utilizes 12 columns, making for a 940px wide container without responsive features enabled. With the responsive CSS file added, the grid adapts to be 724px and 1170px wide depending on your viewport. Below 767px viewports, the columns become fluid and stack vertically.{{/i}}

    -
    -
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    + +
    + -
    -
    2
    -
    3
    -
    4
    -
    -
    -
    4
    -
    5
    -
    -
    -
    9
    -
    -
    -

    {{_i}}Basic grid HTML{{/i}}

    -

    {{_i}}For a simple two column layout, create a .row and add the appropriate number of .span* columns. As this is a 12-column grid, each .span* spans a number of those 12 columns, and should always add up to 12 for each row (or the number of columns in the parent).{{/i}}

    +

    {{_i}}Live grid example{{/i}}

    +

    {{_i}}The default Bootstrap grid system utilizes 12 columns, making for a 940px wide container without responsive features enabled. With the responsive CSS file added, the grid adapts to be 724px and 1170px wide depending on your viewport. Below 767px viewports, the columns become fluid and stack vertically.{{/i}}

    +
    +
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    +
    +
    2
    +
    3
    +
    4
    +
    +
    +
    4
    +
    5
    +
    +
    +
    9
    +
    +
    + +

    {{_i}}Basic grid HTML{{/i}}

    +

    {{_i}}For a simple two column layout, create a .row and add the appropriate number of .span* columns. As this is a 12-column grid, each .span* spans a number of those 12 columns, and should always add up to 12 for each row (or the number of columns in the parent).{{/i}}

     <div class="row">
       <div class="span4">...</div>
       <div class="span8">...</div>
     </div>
     
    -

    {{_i}}Given this example, we have .span4 and .span8, making for 12 total columns and a complete row.{{/i}}

    +

    {{_i}}Given this example, we have .span4 and .span8, making for 12 total columns and a complete row.{{/i}}

    -

    {{_i}}Offsetting columns{{/i}}

    -

    {{_i}}Move columns to the left using .offset* classes. Each class increases the left margin of a column by a whole column. For example, .offset4 moves .span4 over four columns.{{/i}}

    -
    -
    -
    4
    -
    3 offset 2
    -
    -
    -
    3 offset 1
    -
    3 offset 2
    -
    -
    -
    6 offset 3
    -
    -
    +

    {{_i}}Offsetting columns{{/i}}

    +

    {{_i}}Move columns to the left using .offset* classes. Each class increases the left margin of a column by a whole column. For example, .offset4 moves .span4 over four columns.{{/i}}

    +
    +
    +
    4
    +
    3 offset 2
    +
    +
    +
    3 offset 1
    +
    3 offset 2
    +
    +
    +
    6 offset 3
    +
    +
     <div class="row">
       <div class="span4">...</div>
    @@ -128,7 +128,7 @@
     </div>
     
    -

    {{_i}}Nesting columns{{/i}}

    +

    {{_i}}Nesting columns{{/i}}

    {{_i}}To nest your content with the default grid, add a new .row and set of .span* columns within an existing .span* column. Nested rows should include a set of columns that add up to the number of columns of its parent.{{/i}}

    {{_i}}Example{{/i}}

    {{_i}}Here two nested .span4 columns are placed within a .span8.{{/i}}

    @@ -156,54 +156,54 @@ </div> </div> -
    + - -
    - + +
    + -

    {{_i}}Live fluid grid example{{/i}}

    -

    {{_i}}The fluid grid system uses percents instead of pixels for column widths. It has the same responsive capabilities as our fixed grid system, ensuring proper proportions for key screen resolutions and devices.{{/i}}

    -
    -
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    +

    {{_i}}Live fluid grid example{{/i}}

    +

    {{_i}}The fluid grid system uses percents instead of pixels for column widths. It has the same responsive capabilities as our fixed grid system, ensuring proper proportions for key screen resolutions and devices.{{/i}}

    +
    +
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    +
    +
    4
    +
    4
    +
    4
    +
    +
    +
    4
    +
    8
    +
    +
    +
    6
    +
    6
    +
    +
    +
    12
    +
    -
    -
    4
    -
    4
    -
    4
    -
    -
    -
    4
    -
    8
    -
    -
    -
    6
    -
    6
    -
    -
    -
    12
    -
    -
    -

    {{_i}}Basic fluid grid HTML{{/i}}

    -

    {{_i}}Make any row "fluid" by changing .row to .row-fluid. The column classes stay the exact same, making it easy to flip between fixed and fluid grids.{{/i}}

    +

    {{_i}}Basic fluid grid HTML{{/i}}

    +

    {{_i}}Make any row "fluid" by changing .row to .row-fluid. The column classes stay the exact same, making it easy to flip between fixed and fluid grids.{{/i}}

     <div class="row-fluid">
       <div class="span4">...</div>
    @@ -211,21 +211,21 @@
     </div>
     
    -

    {{_i}}Fluid offsetting{{/i}}

    -

    {{_i}}Operates the same way as the fixed grid system offsetting: add .offset* to any column to offset by that many columns.{{/i}}

    -
    -
    -
    4
    -
    4 offset 4
    -
    -
    -
    3 offset 3
    -
    3 offset 3
    -
    -
    -
    6 offset 6
    -
    -
    +

    {{_i}}Fluid offsetting{{/i}}

    +

    {{_i}}Operates the same way as the fixed grid system offsetting: add .offset* to any column to offset by that many columns.{{/i}}

    +
    +
    +
    4
    +
    4 offset 4
    +
    +
    +
    3 offset 3
    +
    3 offset 3
    +
    +
    +
    6 offset 6
    +
    +
     <div class="row-fluid">
       <div class="span4">...</div>
    @@ -233,21 +233,21 @@
     </div>
     
    -

    {{_i}}Fluid nesting{{/i}}

    -

    {{_i}}Nesting with fluid grids is a bit different: the number of nested columns should not match the parent's number of columns. Instead, each level of nested columns are reset because each row takes up 100% of the parent column.{{/i}}

    -
    -
    - {{_i}}Fluid 12{{/i}} -
    -
    - {{_i}}Fluid 6{{/i}} -
    -
    - {{_i}}Fluid 6{{/i}} +

    {{_i}}Fluid nesting{{/i}}

    +

    {{_i}}Nesting with fluid grids is a bit different: the number of nested columns should not match the parent's number of columns. Instead, each level of nested columns are reset because each row takes up 100% of the parent column.{{/i}}

    +
    +
    + {{_i}}Fluid 12{{/i}} +
    +
    + {{_i}}Fluid 6{{/i}} +
    +
    + {{_i}}Fluid 6{{/i}} +
    -
     <div class="row-fluid">
       <div class="span12">
    @@ -260,23 +260,23 @@
     </div>
     
    -
    +
    - -
    - + +
    + -

    {{_i}}Fixed layout{{/i}}

    -

    {{_i}}Provides a common fixed-width (and optionally responsive) layout with only <div class="container"> required.{{/i}}

    -
    -
    -
    +

    {{_i}}Fixed layout{{/i}}

    +

    {{_i}}Provides a common fixed-width (and optionally responsive) layout with only <div class="container"> required.{{/i}}

    +
    +
    +
     <body>
       <div class="container">
    @@ -285,12 +285,12 @@
     </body>
     
    -

    {{_i}}Fluid layout{{/i}}

    -

    {{_i}}Create a fluid, two-column page with <div class="container-fluid">—great for applications and docs.{{/i}}

    -
    -
    -
    -
    +

    {{_i}}Fluid layout{{/i}}

    +

    {{_i}}Create a fluid, two-column page with <div class="container-fluid">—great for applications and docs.{{/i}}

    +
    +
    +
    +
     <div class="container-fluid">
       <div class="row-fluid">
    @@ -303,81 +303,81 @@
       </div>
     </div>
     
    -
    +
    - -
    - + +
    + - {{! Enabling }} -

    {{_i}}Enabling responsive features{{/i}}

    -

    {{_i}}Turn on responsive CSS in your project by including the proper meta tag and additional stylesheet within the <head> of your document. If you've compiled Bootstrap from the Customize page, you need only include the meta tag.{{/i}}

    + {{! Enabling }} +

    {{_i}}Enabling responsive features{{/i}}

    +

    {{_i}}Turn on responsive CSS in your project by including the proper meta tag and additional stylesheet within the <head> of your document. If you've compiled Bootstrap from the Customize page, you need only include the meta tag.{{/i}}

     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link href="assets/css/bootstrap-responsive.css" rel="stylesheet">
     
    -

    {{_i}}Heads up!{{/i}} {{_i}} Bootstrap doesn't include responsive features by default at this time as not everything needs to be responsive. Instead of encouraging developers to remove this feature, we figure it best to enable it as needed.{{/i}}

    +

    {{_i}}Heads up!{{/i}} {{_i}} Bootstrap doesn't include responsive features by default at this time as not everything needs to be responsive. Instead of encouraging developers to remove this feature, we figure it best to enable it as needed.{{/i}}

    - {{! About }} -

    {{_i}}About responsive Bootstrap{{/i}}

    - Responsive devices -

    {{_i}}Media queries allow for custom CSS based on a number of conditions—ratios, widths, display type, etc—but usually focuses around min-width and max-width.{{/i}}

    -
      -
    • {{_i}}Modify the width of column in our grid{{/i}}
    • -
    • {{_i}}Stack elements instead of float wherever necessary{{/i}}
    • -
    • {{_i}}Resize headings and text to be more appropriate for devices{{/i}}
    • -
    -

    {{_i}}Use media queries responsibly and only as a start to your mobile audiences. For larger projects, do consider dedicated code bases and not layers of media queries.{{/i}}

    + {{! About }} +

    {{_i}}About responsive Bootstrap{{/i}}

    + Responsive devices +

    {{_i}}Media queries allow for custom CSS based on a number of conditions—ratios, widths, display type, etc—but usually focuses around min-width and max-width.{{/i}}

    +
      +
    • {{_i}}Modify the width of column in our grid{{/i}}
    • +
    • {{_i}}Stack elements instead of float wherever necessary{{/i}}
    • +
    • {{_i}}Resize headings and text to be more appropriate for devices{{/i}}
    • +
    +

    {{_i}}Use media queries responsibly and only as a start to your mobile audiences. For larger projects, do consider dedicated code bases and not layers of media queries.{{/i}}

    - {{! Supported }} -

    {{_i}}Supported devices{{/i}}

    -

    {{_i}}Bootstrap supports a handful of media queries in a single file to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:{{/i}}

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {{_i}}Label{{/i}}{{_i}}Layout width{{/i}}{{_i}}Column width{{/i}}{{_i}}Gutter width{{/i}}
    {{_i}}Phones{{/i}}480px and below{{_i}}Fluid columns, no fixed widths{{/i}}
    {{_i}}Phones to tablets{{/i}}767px and below{{_i}}Fluid columns, no fixed widths{{/i}}
    {{_i}}Portrait tablets{{/i}}768px and above42px20px
    {{_i}}Default{{/i}}980px and up60px20px
    {{_i}}Large display{{/i}}1200px and up70px30px
    + {{! Supported }} +

    {{_i}}Supported devices{{/i}}

    +

    {{_i}}Bootstrap supports a handful of media queries in a single file to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:{{/i}}

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{_i}}Label{{/i}}{{_i}}Layout width{{/i}}{{_i}}Column width{{/i}}{{_i}}Gutter width{{/i}}
    {{_i}}Phones{{/i}}480px and below{{_i}}Fluid columns, no fixed widths{{/i}}
    {{_i}}Phones to tablets{{/i}}767px and below{{_i}}Fluid columns, no fixed widths{{/i}}
    {{_i}}Portrait tablets{{/i}}768px and above42px20px
    {{_i}}Default{{/i}}980px and up60px20px
    {{_i}}Large display{{/i}}1200px and up70px30px
     /* {{_i}}Landscape phones and down{{/i}} */
     @media (max-width: 480px) { ... }
    @@ -393,83 +393,85 @@
     
    - {{! Responsive utility classes }} -

    {{_i}}Responsive utility classes{{/i}}

    -

    {{_i}}For faster mobile-friendly development, use these utility classes for showing and hiding content by device. Below is a table of the available classes and their effect on a given media query layout (labeled by device). They can be found in responsive.less.{{/i}}

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {{_i}}Class{{/i}}{{_i}}Phones 767px and below{{/i}}{{_i}}Tablets 979px to 768px{{/i}}{{_i}}Desktops Default{{/i}}
    .visible-phone{{_i}}Visible{{/i}}
    .visible-tablet{{_i}}Visible{{/i}}
    .visible-desktop{{_i}}Visible{{/i}}
    .hidden-phone{{_i}}Visible{{/i}}{{_i}}Visible{{/i}}
    .hidden-tablet{{_i}}Visible{{/i}}{{_i}}Visible{{/i}}
    .hidden-desktop{{_i}}Visible{{/i}}{{_i}}Visible{{/i}}
    + {{! Responsive utility classes }} +

    {{_i}}Responsive utility classes{{/i}}

    +

    {{_i}}For faster mobile-friendly development, use these utility classes for showing and hiding content by device. Below is a table of the available classes and their effect on a given media query layout (labeled by device). They can be found in responsive.less.{{/i}}

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{_i}}Class{{/i}}{{_i}}Phones 767px and below{{/i}}{{_i}}Tablets 979px to 768px{{/i}}{{_i}}Desktops Default{{/i}}
    .visible-phone{{_i}}Visible{{/i}}
    .visible-tablet{{_i}}Visible{{/i}}
    .visible-desktop{{_i}}Visible{{/i}}
    .hidden-phone{{_i}}Visible{{/i}}{{_i}}Visible{{/i}}
    .hidden-tablet{{_i}}Visible{{/i}}{{_i}}Visible{{/i}}
    .hidden-desktop{{_i}}Visible{{/i}}{{_i}}Visible{{/i}}
    -

    {{_i}}When to use{{/i}}

    -

    {{_i}}Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation.{{/i}}

    +

    {{_i}}When to use{{/i}}

    +

    {{_i}}Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation.{{/i}}

    -

    {{_i}}Responsive utilities test case{{/i}}

    -

    {{_i}}Resize your browser or load on different devices to test the above classes.{{/i}}

    -

    {{_i}}Visible on...{{/i}}

    -

    {{_i}}Green checkmarks indicate that class is visible in your current viewport.{{/i}}

    -
      -
    • {{_i}}Phone{{/i}}✔ {{_i}}Phone{{/i}}
    • -
    • {{_i}}Tablet{{/i}}✔ {{_i}}Tablet{{/i}}
    • -
    • {{_i}}Desktop{{/i}}✔ {{_i}}Desktop{{/i}}
    • -
    -

    {{_i}}Hidden on...{{/i}}

    -

    {{_i}}Here, green checkmarks indicate that class is hidden in your current viewport.{{/i}}

    -
      -
    • {{_i}}Phone{{/i}}✔ {{_i}}Phone{{/i}}
    • -
    • {{_i}}Tablet{{/i}}✔ {{_i}}Tablet{{/i}}
    • -
    • {{_i}}Desktop{{/i}}✔ {{_i}}Desktop{{/i}}
    • -
    +

    {{_i}}Responsive utilities test case{{/i}}

    +

    {{_i}}Resize your browser or load on different devices to test the above classes.{{/i}}

    +

    {{_i}}Visible on...{{/i}}

    +

    {{_i}}Green checkmarks indicate that class is visible in your current viewport.{{/i}}

    +
      +
    • {{_i}}Phone{{/i}}✔ {{_i}}Phone{{/i}}
    • +
    • {{_i}}Tablet{{/i}}✔ {{_i}}Tablet{{/i}}
    • +
    • {{_i}}Desktop{{/i}}✔ {{_i}}Desktop{{/i}}
    • +
    +

    {{_i}}Hidden on...{{/i}}

    +

    {{_i}}Here, green checkmarks indicate that class is hidden in your current viewport.{{/i}}

    +
      +
    • {{_i}}Phone{{/i}}✔ {{_i}}Phone{{/i}}
    • +
    • {{_i}}Tablet{{/i}}✔ {{_i}}Tablet{{/i}}
    • +
    • {{_i}}Desktop{{/i}}✔ {{_i}}Desktop{{/i}}
    • +
    -
    +
    -
    {{! /span9 }} -
    {{! row}} +
    {{! /span9 }} +
    {{! row}} -
    {{! /container }} +
    {{! /.container }} + +
    {{! /.bs-docs-canvas }} From 2a0cf0f1312ff9edf96bed047758eb6e295b18ff Mon Sep 17 00:00:00 2001 From: Jonathan Sampson Date: Tue, 24 Jul 2012 01:50:38 -0400 Subject: [PATCH 7/9] IE10 uses 'transition' and 'transitionend' msTransition, while supported in IE, should be ignored in favor of the unprefixed property. Additionally, MSTransitionEnd should also be ignored in favor of the unprefixed event transitionend. Current unit test requires no attention in light of this change. MSDN: http://msdn.microsoft.com/en-us/library/ie/hh673535(v=vs.85).aspx#transitions_dom_events --- js/bootstrap-transition.js | 1 - 1 file changed, 1 deletion(-) diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index 0c37ebb187..c5b2674f37 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -37,7 +37,6 @@ 'WebkitTransition' : 'webkitTransitionEnd' , 'MozTransition' : 'transitionend' , 'OTransition' : 'oTransitionEnd otransitionend' - , 'msTransition' : 'MSTransitionEnd' , 'transition' : 'transitionend' } , name From 6245886b269cdba7e8006ebf59165d7558492ec3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 23 Jul 2012 23:54:26 -0700 Subject: [PATCH 8/9] tweak docs shadows --- docs/assets/css/docs.css | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 657bcd8a92..fa487e001a 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -29,6 +29,9 @@ h3 code { body > .navbar-fixed-top { font-size: 13px; + -webkit-box-shadow: 0 5px 15px rgba(0,0,0,.15); + -moz-box-shadow: 0 5px 15px rgba(0,0,0,.15); + box-shadow: 0 5px 15px rgba(0,0,0,.15); } /* Change the docs' brand */ @@ -960,25 +963,25 @@ form.bs-docs-example { left: 0; } .masthead { - height: 400px; + height: 380px; } .subhead { - height: 120px; /* +80px pdding */ + height: 130px; /* +80px pdding */ } .bs-docs-canvas { position: absolute; width: 100%; z-index: 10; background-color: #fff; - -webkit-box-shadow: 0 1px 5px rgba(0,0,0,.5); - -moz-box-shadow: 0 1px 5px rgba(0,0,0,.5); - box-shadow: 0 1px 5px rgba(0,0,0,.5); + -webkit-box-shadow: 0 -5px 15px rgba(0,0,0,.15); + -moz-box-shadow: 0 -5px 15px rgba(0,0,0,.15); + box-shadow: 0 -5px 15px rgba(0,0,0,.15); } .masthead + .bs-docs-canvas { - top: 550px; + top: 530px; } .subhead + .bs-docs-canvas { - top: 240px; + top: 250px; } } From cd441e082f25836be85ecc14f0bed4d8e74965b2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 23 Jul 2012 23:56:13 -0700 Subject: [PATCH 9/9] fixes #4156: don't override border radius if stacked nav has one child --- docs/assets/css/bootstrap.css | 18 ++++++++++++------ less/navs.less | 4 ++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index df389af9cc..5525614d60 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3686,15 +3686,21 @@ input[type="submit"].btn.btn-mini { } .nav-tabs.nav-stacked > li:first-child > a { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; + -webkit-border-top-right-radius: 4px; + border-top-right-radius: 4px; + -webkit-border-top-left-radius: 4px; + border-top-left-radius: 4px; + -moz-border-radius-topright: 4px; + -moz-border-radius-topleft: 4px; } .nav-tabs.nav-stacked > li:last-child > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; + -webkit-border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; + -moz-border-radius-bottomright: 4px; + -moz-border-radius-bottomleft: 4px; } .nav-tabs.nav-stacked > li > a:hover { diff --git a/less/navs.less b/less/navs.less index 96723ffc93..4c38f7dbf2 100644 --- a/less/navs.less +++ b/less/navs.less @@ -171,10 +171,10 @@ .border-radius(0); } .nav-tabs.nav-stacked > li:first-child > a { - .border-radius(4px 4px 0 0); + .border-top-radius(4px); } .nav-tabs.nav-stacked > li:last-child > a { - .border-radius(0 0 4px 4px); + .border-bottom-radius(4px); } .nav-tabs.nav-stacked > li > a:hover { border-color: #ddd;