From de53f62a0464f92fe0c175478dc38696eebbda99 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 4 Jun 2012 23:57:48 -0700 Subject: [PATCH] more changes to js and components, playing with new docs subnav --- docs/assets/css/docs.css | 10 +- docs/components.html | 937 ++++++++++------------ docs/javascript.html | 172 ++-- docs/scaffolding.html | 17 +- docs/templates/pages/components.mustache | 937 ++++++++++------------ docs/templates/pages/javascript.mustache | 172 ++-- docs/templates/pages/scaffolding.mustache | 17 +- 7 files changed, 1077 insertions(+), 1185 deletions(-) diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 9fdfec0dcf..dcf65ad981 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -11,12 +11,18 @@ body { position: relative; padding-top: 90px; + font-size: 14px; background-color: #fff; background-image: url(../img/grid-18px-masked.png); background-repeat: repeat-x; background-position: 0 40px; } +body, +li { + line-height: 20px; +} + .bs-docs-container { max-width: 780px; margin: 0 auto; @@ -24,6 +30,9 @@ body { /* Tweak navbar brand link to be super sleek -------------------------------------------------- */ +.navbar { + font-size: 13px; +} .navbar-fixed-top .brand { padding-right: 0; padding-left: 0; @@ -603,7 +612,6 @@ form.well { .bs-docs-example > p { font-size: 13px; line-height: 18px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } .bs-docs-example p:last-child { margin-bottom: 0; diff --git a/docs/components.html b/docs/components.html index 281cea9647..72b86200f8 100644 --- a/docs/components.html +++ b/docs/components.html @@ -908,13 +908,12 @@ - Project name + Title
-
-
-

Navbar scaffolding

-

The navbar requires only a few divs to structure it well for static or fixed display.

+ +

Navbar scaffolding

+

The navbar requires only a few divs to structure it well for static or fixed display.

 <div class="navbar">
   <div class="navbar-inner">
@@ -963,47 +961,42 @@
   </div>
 </div>
-

Fixed navbar

-

Fix the navbar to the top or bottom of the viewport with an additional class on the outermost div, .navbar.

-
-
+

Fixed navbar

+

Fix the navbar to the top or bottom of the viewport with an additional class on the outermost div, .navbar.

 <div class="navbar navbar-fixed-top">
   ...
 </div>
-
- 
 <div class="navbar navbar-fixed-bottom">
   ...
 </div>
-
-
-

When you affix the navbar, remember to account for the hidden area underneath. Add 40px or more of padding to the <body>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.

-

Brand name

-

A simple link to show your brand or project name only requires an anchor tag.

+ +

When you affix the navbar, remember to account for the hidden area underneath. Add 40px or more of padding to the <body>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.

+

Brand name

+

A simple link to show your brand or project name only requires an anchor tag.

 <a class="brand" href="#">
   Project name
 </a>
-

Forms in navbar

-

To properly style and position a form within the navbar, add the appropriate classes as shown below. For a default form, include .navbar-form and either .pull-left or .pull-right to properly align it.

+

Forms in navbar

+

To properly style and position a form within the navbar, add the appropriate classes as shown below. For a default form, include .navbar-form and either .pull-left or .pull-right to properly align it.

 <form class="navbar-form pull-left">
   <input type="text" class="span2">
 </form>
-

For a more customized search form, add .navbar-search to the form and .search-query to the input for specialized styles in the navbar.

+

For a more customized search form, add .navbar-search to the form and .search-query to the input for specialized styles in the navbar.

 <form class="navbar-search pull-left">
   <input type="text" class="search-query" placeholder="Search">
 </form>
-

Optional responsive variation

-

Depending on the amount of content in your topbar, you might want to implement the responsive options. To do so, wrap your nav content in a containing div, .nav-collapse.collapse, and add the navbar toggle button, .btn-navbar.

+

Optional responsive variation

+

Depending on the amount of content in your topbar, you might want to implement the responsive options. To do so, wrap your nav content in a containing div, .nav-collapse.collapse, and add the navbar toggle button, .btn-navbar.

 <div class="navbar">
   <div class="navbar-inner">
@@ -1028,14 +1021,12 @@
   </div>
 </div>
-
- Heads up! The responsive navbar requires the collapse plugin and responsive Bootstrap CSS file. -
+
+ Heads up! The responsive navbar requires the collapse plugin and responsive Bootstrap CSS file. +
-
-
-

Nav links

-

Nav items are simple to add via unordered lists.

+

Nav links

+

Nav items are simple to add via unordered lists.

 <ul class="nav">
   <li class="active">
@@ -1045,7 +1036,7 @@
   <li><a href="#">Link</a></li>
 </ul>
-

You can easily add dividers to your nav links with an empty list item and a simple class. Just add this between links:

+

You can easily add dividers to your nav links with an empty list item and a simple class. Just add this between links:

 <ul class="nav">
   ...
@@ -1053,10 +1044,10 @@
   ...
 </ul>
-

Component alignment

-

To align a nav, search form, or text, use the .pull-left or .pull-right utility classes. Both classes will add a CSS float in the specified direction.

-

Adding dropdown menus

-

Adding dropdowns and dropups to the nav is super simple, but does require the use of our javascript plugin.

+

Component alignment

+

To align a nav, search form, or text, use the .pull-left or .pull-right utility classes. Both classes will add a CSS float in the specified direction.

+

Adding dropdown menus

+

Adding dropdowns and dropups to the nav is super simple, but does require the use of our javascript plugin.

 <ul class="nav">
   <li class="dropdown">
@@ -1072,12 +1063,10 @@
   </li>
 </ul>
-

Get the javascript →

-
-

Text in the navbar

-

Wrap strings of text in a <.navbar-text>, usually on a <p> tag for proper leading and color.

-
-
+

Get the javascript →

+
+

Text in the navbar

+

Wrap strings of text in a <.navbar-text>, usually on a <p> tag for proper leading and color.

@@ -1090,29 +1079,26 @@

Breadcrumbs

-
-
-

Why use them

-

Breadcrumb navigation is used as a way to show users where they are within an app or a site, but not for primary navigation. Keep their use sparse and succinct to be most effective.

+

Why use them

+

Breadcrumb navigation is used as a way to show users where they are within an app or a site, but not for primary navigation. Keep their use sparse and succinct to be most effective.

-

Examples

-

A single example shown as it might be displayed across multiple pages.

-
    -
  • Home
    • -
-
    -
  • Home /
    • -
  • Library
    • -
- -
-
-

Markup

-

HTML is your standard unordered list with links.

+

Examples

+

A single example shown as it might be displayed across multiple pages.

+
    +
  • Home
    • +
+
    +
  • Home /
    • +
  • Library
    • +
+ + +

Markup

+

HTML is your standard unordered list with links.

 <ul class="breadcrumb">
   <li>
@@ -1124,8 +1110,6 @@
   <li class="active">Data</li>
 </ul>
-
-
@@ -1139,59 +1123,56 @@

Multicon-page pagination

-
-
-

When to use

-

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

-

Stateful page links

-

Links are customizable and work in a number of circumstances with the right class. .disabled for unclickable links and .active for current page.

-

Flexible alignment

-

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

-
-
-

Examples

-

The default pagination component is flexible and works in a number of variations.

- - - - -
-
-

Markup

-

Wrapped in a <div>, pagination is just a <ul>.

+ +

When to use

+

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

+

Stateful page links

+

Links are customizable and work in a number of circumstances with the right class. .disabled for unclickable links and .active for current page.

+

Flexible alignment

+

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

+ +

Examples

+

The default pagination component is flexible and works in a number of variations.

+ + + + + +

Markup

+

Wrapped in a <div>, pagination is just a <ul>.

 <div class="pagination">
   <ul>
@@ -1206,24 +1187,20 @@
   </ul>
 </div>
-
-

Pager For quick previous and next links

-
-
-

About pager

-

The pager component is a set of links for simple pagination implementations with light markup and even lighter styles. It's great for simple sites like blogs or magazines.

-

Optional disabled state

-

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

-
-
-

Default example

-

By default, the pager centers links.

- + +

About pager

+

The pager component is a set of links for simple pagination implementations with light markup and even lighter styles. It's great for simple sites like blogs or magazines.

+

Optional disabled state

+

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

+ +

Default example

+

By default, the pager centers links.

+ 
 <ul class="pager">
   <li>
@@ -1234,14 +1211,13 @@
   </li>
 </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">
@@ -1252,8 +1228,7 @@
   </li>
 </ul>
-
-
+ @@ -1332,92 +1307,89 @@

Badges Indicators and unread counts

-
-
-

About

-

Badges are small, simple components for displaying an indicator or count of some sort. They're commonly found in email clients like Mail.app or on mobile apps for push notifications.

-
-
-

Available classes

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
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> -
-
-
+ +

About

+

Badges are small, simple components for displaying an indicator or count of some sort. They're commonly found in email clients like Mail.app or on mobile apps for push notifications.

+ +

Available classes

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
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> +
+ @@ -1429,11 +1401,10 @@

Typographic components Page header and hero unit for segmenting content

Hero unit

-
-
-

Bootstrap provides a lightweight, flexible component called a hero unit to showcase content on your site. It works well on marketing and content-heavy sites.

-

Markup

-

Wrap your content in a div like so:

+ +

Bootstrap provides a lightweight, flexible component called a hero unit to showcase content on your site. It works well on marketing and content-heavy sites.

+

Markup

+

Wrap your content in a div like so:

 <div class="hero-unit">
   <h1>Heading</h1>
@@ -1445,31 +1416,29 @@
   </p>
 </div>
+ +
+
+

Hello, world!

+

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

+

Learn more

-
-
-

Hello, world!

-

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

-

Learn more

-
-
-
+
+

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).

+ +

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).

+
+
+

Example page header Subtext for header

-
-
-

Example page header Subtext for header

-
+ 
 <div class="page-header">
   <h1>Example page header</h1>
 </div>
-
-
+ @@ -1481,80 +1450,67 @@

Thumbnails Grids of images, videos, text, and more

-
-
-

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

    -
    -
    -
    • -
  • -
    - -
    -
    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

    -
    -
    -
    • -
-
-
+

Default thumbnails

+

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

+ -
-
-

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.

-
-
-

Uses grid column sizes

-

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

-
-
+

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.

+ -
-
-

The markup

-

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

+

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.

+ +

Uses grid column sizes

+

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

+ +

The 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="span3">
@@ -1565,7 +1521,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="span3">
@@ -1578,44 +1534,41 @@
   ...
 </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.

+ @@ -1629,37 +1582,35 @@

Lightweight defaults

-
-
-

Rewritten base class

-

With Bootstrap 2, we've simplified the base class: .alert instead of .alert-message. We've also reduced the minimum required markup—no <p> is required by default, just the outer <div>.

-

Single alert message

-

For a more durable component with less code, we've removed the differentiating look for block alerts, messages that come with more padding and typically more text. The class also has changed to .alert-block.

-
-

Goes great with javascript

-

Bootstrap comes with a great jQuery plugin that supports alert messages, making dismissing them quick and easy.

-

Get the plugin »

-
-
-

Example alerts

-

Wrap your message and an optional close icon in a div with simple class.

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

Rewritten base class

+

With Bootstrap 2, we've simplified the base class: .alert instead of .alert-message. We've also reduced the minimum required markup—no <p> is required by default, just the outer <div>.

+

Single alert message

+

For a more durable component with less code, we've removed the differentiating look for block alerts, messages that come with more padding and typically more text. The class also has changed to .alert-block.

+
+

Goes great with javascript

+

Bootstrap comes with a great jQuery plugin that supports alert messages, making dismissing them quick and easy.

+

Get the plugin »

+ +

Example alerts

+

Wrap your message and an optional close icon in a div with simple class.

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

Heads up! iOS devices require an href="#" for the dismissal of alerts. Be sure to include it and the data attribute for anchor close icons. 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.

-

Easily extend the standard alert message with two optional classes: .alert-block for more padding and text controls and .alert-heading for a matching heading.

-
- -

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.

-
+

Heads up! iOS devices require an href="#" for the dismissal of alerts. Be sure to include it and the data attribute for anchor close icons. 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.

+

Easily extend the standard alert message with two optional classes: .alert-block for more padding and text controls and .alert-heading for a matching heading.

+
+ +

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="#">×</a>
@@ -1667,48 +1618,41 @@
   Best check yo self, you're not...
 </div>
-
-

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>
-
-
@@ -1722,39 +1666,36 @@

Examples and markup

-
-
-

Basic

-

Default progress bar with a vertical gradient.

-
-
-
+ +

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 (no IE).

-
-
-
+ +

Striped

+

Uses a gradient to create a striped effect (no IE).

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

Animated

-

Takes the striped example and animates it (no IE).

-
-
-
+ +

Animated

+

Takes the striped example and animates it (no IE).

+
+
+ 
 <div class="progress progress-striped
      active">
@@ -1762,54 +1703,46 @@
        style="width: 40%;"></div>
 </div>
-
-

Options and browser support

-
-
-

Additional colors

-

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

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

Striped bars

-

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

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

Behavior

-

Progress bars use CSS3 transitions, so if you dynamically adjust the width via javascript, it will smoothly resize.

-

If you use the .active class, your .progress-striped progress bars will animate the stripes left to right.

-
-
-

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.

-
+ +

Additional colors

+

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

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

Striped bars

+

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

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

Behavior

+

Progress bars use CSS3 transitions, so if you dynamically adjust the width via javascript, it will smoothly resize.

+

If you use the .active class, your .progress-striped progress bars will animate the stripes left to right.

+ +

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.

@@ -1823,20 +1756,19 @@

Miscellaneous Lightweight utility components

-
-
-

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.

+

Optional classes

+

Control padding and rounded corners with two optional modifier classes.

 <div class="well well-large">
   ...
@@ -1847,18 +1779,18 @@
   ...
 </div>
-

Close icon

-

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

-

+

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.

+

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.

+

Helper classes

+

Simple, focused classes for small display or behavior tweaks.

-

.pull-left

-

Float an element left

+

.pull-left

+

Float an element left

 class="pull-left"
@@ -1868,9 +1800,8 @@ class="pull-left" } - -

.pull-right

-

Float an element right

+

.pull-right

+

Float an element right

 class="pull-right"
@@ -1880,8 +1811,8 @@ class="pull-right" } -

.muted

-

Change an element's color to #999

+

.muted

+

Change an element's color to #999

 class="muted"
@@ -1891,8 +1822,8 @@ class="muted" } -

.clearfix

-

Clear the float on any element

+

.clearfix

+

Clear the float on any element

 class="clearfix"
@@ -1910,8 +1841,6 @@ class="clearfix" } -
-
diff --git a/docs/javascript.html b/docs/javascript.html index f1ca221a59..7e604a37b9 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -76,94 +76,94 @@
- -
-

Javascript for Bootstrap

-

Bring Bootstrap's components to life—now with 12 custom jQuery plugins. -

- -
-
+ +
+

Javascript for Bootstrap

+

Bring Bootstrap's components to life—now with 12 custom jQuery plugins. +

+ +
+
- -
-
-

jQuery plugins A dozen Bootstrap plugins to get you started

-
-
-
-

Modals

-

A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.

-
-
-

Dropdowns

-

Add dropdown menus to nearly anything in Bootstrap with this simple plugin. Bootstrap features full dropdown menu support on in the navbar, tabs, and pills.

-
-
-

Scrollspy

-

Use scrollspy to automatically update the links in your navbar to show the current active link based on scroll position.

-
-
-

Togglable tabs

-

Use this plugin to make tabs and pills more useful by allowing them to toggle through tabbable panes of local content.

-
-
-
-
-

Tooltips

-

A new take on the jQuery Tipsy plugin, Tooltips don't rely on images—they use CSS3 for animations and data-attributes for local title storage.

-
-
-

Popovers *

-

Add small overlays of content, like those on the iPad, to any element for housing secondary information.

-

* Requires Tooltips to be included

-
-
-

Alert messages

-

The alert plugin is a tiny class for adding close functionality to alerts.

-
-
-

Buttons

-

Do more with buttons. Control button states or create groups of buttons for more components like toolbars.

-
-
-
-
-

Collapse

-

Get base styles and flexible support for collapsible components like accordions and navigation.

-
-
-

Carousel

-

Create a merry-go-round of any content you wish to provide an interactive slideshow of content.

-
-
-

Typeahead

-

A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.

-
-
-

Transitions *

-

For simple transition effects, include bootstrap-transition.js once to slide in modals or fade out alerts.

-

* Required for animation in plugins

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

jQuery plugins A dozen Bootstrap plugins to get you started

+
+
+
+

Modals

+

A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.

+
+
+

Dropdowns

+

Add dropdown menus to nearly anything in Bootstrap with this simple plugin. Bootstrap features full dropdown menu support on in the navbar, tabs, and pills.

+
+
+

Scrollspy

+

Use scrollspy to automatically update the links in your navbar to show the current active link based on scroll position.

+
+
+

Togglable tabs

+

Use this plugin to make tabs and pills more useful by allowing them to toggle through tabbable panes of local content.

+
+
+
+
+

Tooltips

+

A new take on the jQuery Tipsy plugin, Tooltips don't rely on images—they use CSS3 for animations and data-attributes for local title storage.

+
+
+

Popovers *

+

Add small overlays of content, like those on the iPad, to any element for housing secondary information.

+

* Requires Tooltips to be included

+
+
+

Alert messages

+

The alert plugin is a tiny class for adding close functionality to alerts.

+
+
+

Buttons

+

Do more with buttons. Control button states or create groups of buttons for more components like toolbars.

+
+
+
+
+

Collapse

+

Get base styles and flexible support for collapsible components like accordions and navigation.

+
+
+

Carousel

+

Create a merry-go-round of any content you wish to provide an interactive slideshow of content.

+
+
+

Typeahead

+

A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.

+
+
+

Transitions *

+

For simple transition effects, include bootstrap-transition.js once to slide in modals or fade out alerts.

+

* Required for animation in plugins

+
+
+
Heads up! If you have downloaded the latest version of Bootstrap, both bootstrap.js and bootstrap.min.js contain all of these plugins.
+
diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 5bd5dcef74..cd80fc80ac 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -81,7 +81,20 @@

Scaffolding

Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.

-
+ +
+

Contents

+ +
+ +
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 99d98dab70..ad452fe9c3 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -830,13 +830,12 @@ - {{_i}}Project name{{/i}} + {{_i}}Title{{/i}}
-
-
-

{{_i}}Navbar scaffolding{{/i}}

-

{{_i}}The navbar requires only a few divs to structure it well for static or fixed display.{{/i}}

+ +

{{_i}}Navbar scaffolding{{/i}}

+

{{_i}}The navbar requires only a few divs to structure it well for static or fixed display.{{/i}}

 <div class="navbar">
   <div class="navbar-inner">
@@ -885,47 +883,42 @@
   </div>
 </div>
-

{{_i}}Fixed navbar{{/i}}

-

{{_i}}Fix the navbar to the top or bottom of the viewport with an additional class on the outermost div, .navbar.{{/i}}

-
-
+

{{_i}}Fixed navbar{{/i}}

+

{{_i}}Fix the navbar to the top or bottom of the viewport with an additional class on the outermost div, .navbar.{{/i}}

 <div class="navbar navbar-fixed-top">
   ...
 </div>
-
- 
 <div class="navbar navbar-fixed-bottom">
   ...
 </div>
-
-
-

{{_i}}When you affix the navbar, remember to account for the hidden area underneath. Add 40px or more of padding to the <body>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.{{/i}}

-

{{_i}}Brand name{{/i}}

-

{{_i}}A simple link to show your brand or project name only requires an anchor tag.{{/i}}

+ +

{{_i}}When you affix the navbar, remember to account for the hidden area underneath. Add 40px or more of padding to the <body>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.{{/i}}

+

{{_i}}Brand name{{/i}}

+

{{_i}}A simple link to show your brand or project name only requires an anchor tag.{{/i}}

 <a class="brand" href="#">
   {{_i}}Project name{{/i}}
 </a>
-

{{_i}}Forms in navbar{{/i}}

-

{{_i}}To properly style and position a form within the navbar, add the appropriate classes as shown below. For a default form, include .navbar-form and either .pull-left or .pull-right to properly align it.{{/i}}

+

{{_i}}Forms in navbar{{/i}}

+

{{_i}}To properly style and position a form within the navbar, add the appropriate classes as shown below. For a default form, include .navbar-form and either .pull-left or .pull-right to properly align it.{{/i}}

 <form class="navbar-form pull-left">
   <input type="text" class="span2">
 </form>
-

{{_i}}For a more customized search form, add .navbar-search to the form and .search-query to the input for specialized styles in the navbar.{{/i}}

+

{{_i}}For a more customized search form, add .navbar-search to the form and .search-query to the input for specialized styles in the navbar.{{/i}}

 <form class="navbar-search pull-left">
   <input type="text" class="search-query" placeholder="{{_i}}Search{{/i}}">
 </form>
-

{{_i}}Optional responsive variation{{/i}}

-

{{_i}}Depending on the amount of content in your topbar, you might want to implement the responsive options. To do so, wrap your nav content in a containing div, .nav-collapse.collapse, and add the navbar toggle button, .btn-navbar.{{/i}}

+

{{_i}}Optional responsive variation{{/i}}

+

{{_i}}Depending on the amount of content in your topbar, you might want to implement the responsive options. To do so, wrap your nav content in a containing div, .nav-collapse.collapse, and add the navbar toggle button, .btn-navbar.{{/i}}

 <div class="navbar">
   <div class="navbar-inner">
@@ -950,14 +943,12 @@
   </div>
 </div>
-
- {{_i}}Heads up!{{/i}} The responsive navbar requires the collapse plugin and responsive Bootstrap CSS file. -
+
+ {{_i}}Heads up!{{/i}} The responsive navbar requires the collapse plugin and responsive Bootstrap CSS file. +
-
-
-

{{_i}}Nav links{{/i}}

-

{{_i}}Nav items are simple to add via unordered lists.{{/i}}

+

{{_i}}Nav links{{/i}}

+

{{_i}}Nav items are simple to add via unordered lists.{{/i}}

 <ul class="nav">
   <li class="active">
@@ -967,7 +958,7 @@
   <li><a href="#">{{_i}}Link{{/i}}</a></li>
 </ul>
-

{{_i}}You can easily add dividers to your nav links with an empty list item and a simple class. Just add this between links:{{/i}}

+

{{_i}}You can easily add dividers to your nav links with an empty list item and a simple class. Just add this between links:{{/i}}

 <ul class="nav">
   ...
@@ -975,10 +966,10 @@
   ...
 </ul>
-

{{_i}}Component alignment{{/i}}

-

{{_i}}To align a nav, search form, or text, use the .pull-left or .pull-right utility classes. Both classes will add a CSS float in the specified direction.{{/i}}

-

{{_i}}Adding dropdown menus{{/i}}

-

{{_i}}Adding dropdowns and dropups to the nav is super simple, but does require the use of our javascript plugin.{{/i}}

+

{{_i}}Component alignment{{/i}}

+

{{_i}}To align a nav, search form, or text, use the .pull-left or .pull-right utility classes. Both classes will add a CSS float in the specified direction.{{/i}}

+

{{_i}}Adding dropdown menus{{/i}}

+

{{_i}}Adding dropdowns and dropups to the nav is super simple, but does require the use of our javascript plugin.{{/i}}

 <ul class="nav">
   <li class="dropdown">
@@ -994,12 +985,10 @@
   </li>
 </ul>
-

{{_i}}Get the javascript →{{/i}}

-
-

{{_i}}Text in the navbar{{/i}}

-

{{_i}}Wrap strings of text in a <.navbar-text>, usually on a <p> tag for proper leading and color.{{/i}}

-
-
+

{{_i}}Get the javascript →{{/i}}

+
+

{{_i}}Text in the navbar{{/i}}

+

{{_i}}Wrap strings of text in a <.navbar-text>, usually on a <p> tag for proper leading and color.{{/i}}

@@ -1012,29 +1001,26 @@

{{_i}}Breadcrumbs{{/i}}

-
-
-

{{_i}}Why use them{{/i}}

-

{{_i}}Breadcrumb navigation is used as a way to show users where they are within an app or a site, but not for primary navigation. Keep their use sparse and succinct to be most effective.{{/i}}

+

{{_i}}Why use them{{/i}}

+

{{_i}}Breadcrumb navigation is used as a way to show users where they are within an app or a site, but not for primary navigation. Keep their use sparse and succinct to be most effective.{{/i}}

-

{{_i}}Examples{{/i}}

-

{{_i}}A single example shown as it might be displayed across multiple pages.{{/i}}

-
    -
  • {{_i}}Home{{/i}}
    • -
- - -
-
-

{{_i}}Markup{{/i}}

-

{{_i}}HTML is your standard unordered list with links.{{/i}}

+

{{_i}}Examples{{/i}}

+

{{_i}}A single example shown as it might be displayed across multiple pages.{{/i}}

+
    +
  • {{_i}}Home{{/i}}
    • +
+ + + +

{{_i}}Markup{{/i}}

+

{{_i}}HTML is your standard unordered list with links.{{/i}}

 <ul class="breadcrumb">
   <li>
@@ -1046,8 +1032,6 @@
   <li class="active">{{_i}}Data{{/i}}</li>
 </ul>
-
-
@@ -1061,59 +1045,56 @@

{{_i}}Multicon-page pagination{{/i}}

-
-
-

{{_i}}When to use{{/i}}

-

{{_i}}Ultra simplistic and minimally styled 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}}

-

{{_i}}Stateful page links{{/i}}

-

{{_i}}Links are customizable and work in a number of circumstances with the right class. .disabled for unclickable links and .active for current page.{{/i}}

-

{{_i}}Flexible alignment{{/i}}

-

{{_i}}Add either of two optional classes to change the alignment of pagination links: .pagination-centered and .pagination-right.{{/i}}

-
-
-

{{_i}}Examples{{/i}}

-

{{_i}}The default pagination component is flexible and works in a number of variations.{{/i}}

- - - - -
-
-

{{_i}}Markup{{/i}}

-

{{_i}}Wrapped in a <div>, pagination is just a <ul>.{{/i}}

+ +

{{_i}}When to use{{/i}}

+

{{_i}}Ultra simplistic and minimally styled 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}}

+

{{_i}}Stateful page links{{/i}}

+

{{_i}}Links are customizable and work in a number of circumstances with the right class. .disabled for unclickable links and .active for current page.{{/i}}

+

{{_i}}Flexible alignment{{/i}}

+

{{_i}}Add either of two optional classes to change the alignment of pagination links: .pagination-centered and .pagination-right.{{/i}}

+ +

{{_i}}Examples{{/i}}

+

{{_i}}The default pagination component is flexible and works in a number of variations.{{/i}}

+ + + + + +

{{_i}}Markup{{/i}}

+

{{_i}}Wrapped in a <div>, pagination is just a <ul>.{{/i}}

 <div class="pagination">
   <ul>
@@ -1128,24 +1109,20 @@
   </ul>
 </div>
-
-

{{_i}}Pager{{/i}} {{_i}}For quick previous and next links{{/i}}

-
-
-

{{_i}}About pager{{/i}}

-

{{_i}}The pager component is a set of links for simple pagination implementations with light markup and even lighter styles. It's great for simple sites like blogs or magazines.{{/i}}

-

{{_i}}Optional disabled state{{/i}}

-

{{_i}}Pager links also use the general .disabled class from the pagination.{{/i}}

-
-
-

{{_i}}Default example{{/i}}

-

{{_i}}By default, the pager centers links.{{/i}}

- + +

{{_i}}About pager{{/i}}

+

{{_i}}The pager component is a set of links for simple pagination implementations with light markup and even lighter styles. It's great for simple sites like blogs or magazines.{{/i}}

+

{{_i}}Optional disabled state{{/i}}

+

{{_i}}Pager links also use the general .disabled class from the pagination.{{/i}}

+ +

{{_i}}Default example{{/i}}

+

{{_i}}By default, the pager centers links.{{/i}}

+ 
 <ul class="pager">
   <li>
@@ -1156,14 +1133,13 @@
   </li>
 </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">
@@ -1174,8 +1150,7 @@
   </li>
 </ul>
-
-
+ @@ -1254,92 +1229,89 @@

{{_i}}Badges{{/i}} {{_i}}Indicators and unread counts{{/i}}

-
-
-

About

-

{{_i}}Badges are small, simple components for displaying an indicator or count of some sort. They're commonly found in email clients like Mail.app or on mobile apps for push notifications.{{/i}}

-
-
-

Available classes

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{_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> -
-
-
+ +

About

+

{{_i}}Badges are small, simple components for displaying an indicator or count of some sort. They're commonly found in email clients like Mail.app or on mobile apps for push notifications.{{/i}}

+ +

Available classes

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{_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> +
+ @@ -1351,11 +1323,10 @@

{{_i}}Typographic components{{/i}} {{_i}}Page header and hero unit for segmenting content{{/i}}

{{_i}}Hero unit{{/i}}

-
-
-

{{_i}}Bootstrap provides a lightweight, flexible component called a hero unit to showcase content on your site. It works well on marketing and content-heavy sites.{{/i}}

-

{{_i}}Markup{{/i}}

-

{{_i}}Wrap your content in a div like so:{{/i}}

+ +

{{_i}}Bootstrap provides a lightweight, flexible component called a hero unit to showcase content on your site. It works well on marketing and content-heavy sites.{{/i}}

+

{{_i}}Markup{{/i}}

+

{{_i}}Wrap your content in a div like so:{{/i}}

 <div class="hero-unit">
   <h1>{{_i}}Heading{{/i}}</h1>
@@ -1367,31 +1338,29 @@
   </p>
 </div>
+ +
+
+

{{_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}}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}}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}}

+ +

{{_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}}

+
+
+

{{_i}}Example page header{{/i}} {{_i}}Subtext for header{{/i}}

-
-
-

{{_i}}Example page header{{/i}} {{_i}}Subtext for header{{/i}}

-
+ 
 <div class="page-header">
   <h1>{{_i}}Example page header{{/i}}</h1>
 </div>
-
-
+ @@ -1403,80 +1372,67 @@

{{_i}}Thumbnails{{/i}} {{_i}}Grids of images, videos, text, and more{{/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}}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}}Default thumbnails{{/i}}

+

{{_i}}By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.{{/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}}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}}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}}The 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}}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}}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}}The 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="span3">
@@ -1487,7 +1443,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="span3">
@@ -1500,44 +1456,41 @@
   ...
 </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}}

+ @@ -1551,37 +1504,35 @@

{{_i}}Lightweight defaults{{/i}}

-
-
-

{{_i}}Rewritten base class{{/i}}

-

{{_i}}With Bootstrap 2, we've simplified the base class: .alert instead of .alert-message. We've also reduced the minimum required markup—no <p> is required by default, just the outer <div>.{{/i}}

-

{{_i}}Single alert message{{/i}}

-

{{_i}}For a more durable component with less code, we've removed the differentiating look for block alerts, messages that come with more padding and typically more text. The class also has changed to .alert-block.{{/i}}

-
-

{{_i}}Goes great with javascript{{/i}}

-

{{_i}}Bootstrap comes with a great jQuery plugin that supports alert messages, making dismissing them quick and easy.{{/i}}

-

{{_i}}Get the plugin »{{/i}}

-
-
-

{{_i}}Example alerts{{/i}}

-

{{_i}}Wrap your message and an optional close icon in a div with simple class.{{/i}}

-
- - {{_i}}Warning!{{/i}} {{_i}}Best check yo self, you're not looking too good.{{/i}} -
+ +

{{_i}}Rewritten base class{{/i}}

+

{{_i}}With Bootstrap 2, we've simplified the base class: .alert instead of .alert-message. We've also reduced the minimum required markup—no <p> is required by default, just the outer <div>.{{/i}}

+

{{_i}}Single alert message{{/i}}

+

{{_i}}For a more durable component with less code, we've removed the differentiating look for block alerts, messages that come with more padding and typically more text. The class also has changed to .alert-block.{{/i}}

+
+

{{_i}}Goes great with javascript{{/i}}

+

{{_i}}Bootstrap comes with a great jQuery plugin that supports alert messages, making dismissing them quick and easy.{{/i}}

+

{{_i}}Get the plugin »{{/i}}

+ +

{{_i}}Example alerts{{/i}}

+

{{_i}}Wrap your message and an optional close icon in a div with simple class.{{/i}}

+
+ + {{_i}}Warning!{{/i}} {{_i}}Best check yo self, you're not looking too good.{{/i}} + 
 <div class="alert">
   <button class="close" data-dismiss="alert">×</button>
   <strong>{{_i}}Warning!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}}
 </div>
-

{{_i}}Heads up!{{/i}} {{_i}}iOS devices require an href="#" for the dismissal of alerts. Be sure to include it and the data attribute for anchor close icons. 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}}

-

{{_i}}Easily extend the standard alert message with two optional classes: .alert-block for more padding and text controls and .alert-heading for a matching heading.{{/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}}Heads up!{{/i}} {{_i}}iOS devices require an href="#" for the dismissal of alerts. Be sure to include it and the data attribute for anchor close icons. 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}}

+

{{_i}}Easily extend the standard alert message with two optional classes: .alert-block for more padding and text controls and .alert-heading for a matching heading.{{/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="#">×</a>
@@ -1589,48 +1540,41 @@
   {{_i}}Best check yo self, you're not...{{/i}}
 </div>
-
-

{{_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>
-
-
@@ -1644,39 +1588,36 @@

{{_i}}Examples and markup{{/i}}

-
-
-

{{_i}}Basic{{/i}}

-

{{_i}}Default progress bar with a vertical gradient.{{/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 (no IE).{{/i}}

-
-
-
+ +

{{_i}}Striped{{/i}}

+

{{_i}}Uses a gradient to create a striped effect (no IE).{{/i}}

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

{{_i}}Animated{{/i}}

-

{{_i}}Takes the striped example and animates it (no IE).{{/i}}

-
-
-
+ +

{{_i}}Animated{{/i}}

+

{{_i}}Takes the striped example and animates it (no IE).{{/i}}

+
+
+ 
 <div class="progress progress-striped
      active">
@@ -1684,54 +1625,46 @@
        style="width: 40%;"></div>
 </div>
-
-

{{_i}}Options and browser support{{/i}}

-
-
-

{{_i}}Additional colors{{/i}}

-

{{_i}}Progress bars use some of the same button and alert classes for consistent styles.{{/i}}

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

{{_i}}Striped bars{{/i}}

-

{{_i}}Similar to the solid colors, we have varied striped progress bars.{{/i}}

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

{{_i}}Behavior{{/i}}

-

{{_i}}Progress bars use CSS3 transitions, so if you dynamically adjust the width via javascript, it will smoothly resize.{{/i}}

-

{{_i}}If you use the .active class, your .progress-striped progress bars will animate the stripes left to right.{{/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}}Additional colors{{/i}}

+

{{_i}}Progress bars use some of the same button and alert classes for consistent styles.{{/i}}

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

{{_i}}Striped bars{{/i}}

+

{{_i}}Similar to the solid colors, we have varied striped progress bars.{{/i}}

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

{{_i}}Behavior{{/i}}

+

{{_i}}Progress bars use CSS3 transitions, so if you dynamically adjust the width via javascript, it will smoothly resize.{{/i}}

+

{{_i}}If you use the .active class, your .progress-striped progress bars will animate the stripes left to right.{{/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}}

@@ -1745,20 +1678,19 @@

{{_i}}Miscellaneous{{/i}} {{_i}}Lightweight utility components{{/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}}Optional classes{{/i}}

+

{{_i}}Control padding and rounded corners with two optional modifier classes.{{/i}}

 <div class="well well-large">
   ...
@@ -1769,18 +1701,18 @@
   ...
 </div>
-

{{_i}}Close icon{{/i}}

-

{{_i}}Use the generic close icon for dismissing content like modals and alerts.{{/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}}

+

{{_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}}Helper classes{{/i}}

+

{{_i}}Simple, focused classes for small display or behavior tweaks.{{/i}}

-

{{_i}}.pull-left{{/i}}

-

{{_i}}Float an element left{{/i}}

+

{{_i}}.pull-left{{/i}}

+

{{_i}}Float an element left{{/i}}

 class="pull-left"
@@ -1790,9 +1722,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"
@@ -1802,8 +1733,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"
@@ -1813,8 +1744,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"
@@ -1832,6 +1763,4 @@ class="clearfix" } -
-
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index e9654f5e67..848112513a 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -1,91 +1,91 @@ - -
-

{{_i}}Javascript for Bootstrap{{/i}}

-

{{_i}}Bring Bootstrap's components to life—now with 12 custom jQuery plugins.{{/i}} -

- -
-
+ +
+

{{_i}}Javascript for Bootstrap{{/i}}

+

{{_i}}Bring Bootstrap's components to life—now with 12 custom jQuery plugins.{{/i}} +

+ +
+
- -
-
-

{{_i}}jQuery plugins{{/i}} {{_i}}A dozen Bootstrap plugins to get you started{{/i}}

-
-
-
-

{{_i}}Modals{{/i}}

-

{{_i}}A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.{{/i}}

-
-
-

{{_i}}Dropdowns{{/i}}

-

{{_i}}Add dropdown menus to nearly anything in Bootstrap with this simple plugin. Bootstrap features full dropdown menu support on in the navbar, tabs, and pills.{{/i}}

-
-
-

{{_i}}Scrollspy{{/i}}

-

{{_i}}Use scrollspy to automatically update the links in your navbar to show the current active link based on scroll position.{{/i}}

-
-
-

{{_i}}Togglable tabs{{/i}}

-

{{_i}}Use this plugin to make tabs and pills more useful by allowing them to toggle through tabbable panes of local content.{{/i}}

-
-
-
-
-

{{_i}}Tooltips{{/i}}

-

{{_i}}A new take on the jQuery Tipsy plugin, Tooltips don't rely on images—they use CSS3 for animations and data-attributes for local title storage.{{/i}}

-
-
-

{{_i}}Popovers{{/i}} *

-

{{_i}}Add small overlays of content, like those on the iPad, to any element for housing secondary information.{{/i}}

-

* {{_i}}Requires Tooltips to be included{{/i}}

-
-
-

{{_i}}Alert messages{{/i}}

-

{{_i}}The alert plugin is a tiny class for adding close functionality to alerts.{{/i}}

-
-
-

{{_i}}Buttons{{/i}}

-

{{_i}}Do more with buttons. Control button states or create groups of buttons for more components like toolbars.{{/i}}

-
-
-
-
-

{{_i}}Collapse{{/i}}

-

{{_i}}Get base styles and flexible support for collapsible components like accordions and navigation.{{/i}}

-
-
-

{{_i}}Carousel{{/i}}

-

{{_i}}Create a merry-go-round of any content you wish to provide an interactive slideshow of content.{{/i}}

-
-
-

Typeahead

-

{{_i}}A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.{{/i}}

-
-
-

{{_i}}Transitions{{/i}} *

-

{{_i}}For simple transition effects, include bootstrap-transition.js once to slide in modals or fade out alerts.{{/i}}

-

* {{_i}}Required for animation in plugins{{/i}}

-
-
-
{{_i}}Heads up!{{/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}}jQuery plugins{{/i}} {{_i}}A dozen Bootstrap plugins to get you started{{/i}}

+
+
+
+

{{_i}}Modals{{/i}}

+

{{_i}}A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.{{/i}}

+
+
+

{{_i}}Dropdowns{{/i}}

+

{{_i}}Add dropdown menus to nearly anything in Bootstrap with this simple plugin. Bootstrap features full dropdown menu support on in the navbar, tabs, and pills.{{/i}}

+
+
+

{{_i}}Scrollspy{{/i}}

+

{{_i}}Use scrollspy to automatically update the links in your navbar to show the current active link based on scroll position.{{/i}}

+
+
+

{{_i}}Togglable tabs{{/i}}

+

{{_i}}Use this plugin to make tabs and pills more useful by allowing them to toggle through tabbable panes of local content.{{/i}}

+
+
+
+
+

{{_i}}Tooltips{{/i}}

+

{{_i}}A new take on the jQuery Tipsy plugin, Tooltips don't rely on images—they use CSS3 for animations and data-attributes for local title storage.{{/i}}

+
+
+

{{_i}}Popovers{{/i}} *

+

{{_i}}Add small overlays of content, like those on the iPad, to any element for housing secondary information.{{/i}}

+

* {{_i}}Requires Tooltips to be included{{/i}}

+
+
+

{{_i}}Alert messages{{/i}}

+

{{_i}}The alert plugin is a tiny class for adding close functionality to alerts.{{/i}}

+
+
+

{{_i}}Buttons{{/i}}

+

{{_i}}Do more with buttons. Control button states or create groups of buttons for more components like toolbars.{{/i}}

+
+
+
+
+

{{_i}}Collapse{{/i}}

+

{{_i}}Get base styles and flexible support for collapsible components like accordions and navigation.{{/i}}

+
+
+

{{_i}}Carousel{{/i}}

+

{{_i}}Create a merry-go-round of any content you wish to provide an interactive slideshow of content.{{/i}}

+
+
+

Typeahead

+

{{_i}}A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.{{/i}}

+
+
+

{{_i}}Transitions{{/i}} *

+

{{_i}}For simple transition effects, include bootstrap-transition.js once to slide in modals or fade out alerts.{{/i}}

+

* {{_i}}Required for animation in plugins{{/i}}

+
+
+
{{_i}}Heads up!{{/i}} {{_i}} If you have downloaded the latest version of Bootstrap, both bootstrap.js and bootstrap.min.js contain all of these plugins.{{/i}}
+
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 6b0b2a919c..3033c7b028 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -3,7 +3,20 @@

{{_i}}Scaffolding{{/i}}

{{_i}}Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.{{/i}}

-
+ +
+

Contents

+ +
+ +