From 648c4689273647c321dd6e3979d910282e9a9339 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 26 Oct 2011 23:11:56 -0700 Subject: breaking down the main page into subpages for easier, more comprehensive documentation --- docs/base-css.html | 885 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 885 insertions(+) create mode 100644 docs/base-css.html (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html new file mode 100644 index 000000000..e3b3782c0 --- /dev/null +++ b/docs/base-css.html @@ -0,0 +1,885 @@ + + + + + Bootstrap, from Twitter + + + + + + + + + + + + + + + + + + + + + +
+
+
+ Bootstrap + +
+
+
+ +
+ + +
+

Base CSS

+

The core typography, form, and table styles of Bootstrap

+
+ + + +
+
+

Typography Headings, paragraphs, lists, and other inline type elements

+
+ +

Headings & body copy

+ + +
+
+

Typographic scale

+

The entire typographic grid is based on two Less variables in our preboot.less file: @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 math, to create the margins, paddings, and line-heights of all our type and more.

+
+
+

Example body text

+

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 ut id elit.

+

Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui.

+
+
+
+

h1. Heading 1

+

h2. Heading 2

+

h3. Heading 3

+

h4. Heading 4

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

Emphasis, address, and abbreviation

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ElementDescriptionUsage
+ <strong> + + For emphasizing a snippet of text with important + + None +
+ <em> + + For emphasizing a snippet of text with stress + + None +
+ <abbr> + + Wraps abbreviations and acronyms to show the expanded version on hover + + Include optional title for expanded text +
+ <address> + + For contact information for its nearest ancestor or the entire body of work + + Preserve formatting by ending all lines with <br> +
+ +
+
+

Using emphasis

+

Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue.

+

Note: Feel free to use <b> and <i> in HTML5, but their usage has changed a bit. <b> is meant to highlight words or phrases without conveying additional importance while <i> is mostly for voice, technical terms, etc.

+
+
+

Example addresses

+

Here are two examples of how the <address> tag can be used:

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

Example abbreviations

+

Abbreviations are styled with uppercase text and a light dotted bottom border. They also have a help cursor on hover so users have extra indication something will be shown on hover.

+

HTML is the best thing since sliced bread.

+

An abbreviation of the word attribute is attr.

+
+
+ + + +

Blockquotes

+
+
+

To include a blockquote, wrap <blockquote> around <p> and <small> tags. Use the <small> element to cite your source and you'll get an em dash &mdash; before it.

+
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis dapibus posuere velit aliquet.

+ Someone famous +
+
+
+
+<blockquote>
+  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis dapibus posuere velit aliquet.</p>
+  <small>Dr. Julius Hibbert</small>
+</blockquote>
+
+
+
+ + +

Lists

+
+
+

Unordered <ul>

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

Unstyled <ul.unstyled>

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

Ordered <ol>

+
    +
  1. Lorem ipsum dolor sit amet
    2. +
  2. Consectetur adipiscing elit
    3. +
  3. Integer molestie lorem at massa
    4. +
  4. Facilisis in pretium nisl aliquet
    5. +
  5. Nulla volutpat aliquam velit
    6. +
  6. Faucibus porta lacus fringilla vel
    7. +
  7. Aenean sit amet erat nunc
    8. +
  8. Eget porttitor lorem
    9. +
+
+
+

Description <dl>

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

Code Inline and block

+ + + + + + + + + + + + + + + + + + + + + +
ElementResult
<code>In a line of text like this, your wrapped code will look like this <html> element.
<pre> +
<div>
+  <h1>Heading</h1>
+  <p>Something right here...</p>
+</div>
+

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

+
<pre class="prettyprint"> +

Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.

+
<div>
+  <h1>Heading</h1>
+  <p>Something right here...</p>
+</div>
+
<div>
+  <h1>Heading</h1>
+  <p>Something right here...</p>
+</div>
+

Download google-code-prettify and view the readme for how to use.

+
+ + +

Inline labels for special attention

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
LabelsMarkup
+ Default + + <span class="label">Default</span> +
+ New + + <span class="label success">New</span> +
+ Warning + + <span class="label warning">Warning</span> +
+ Important + + <span class="label important">Important</span> +
+ Notice + + <span class="label notice">Notice</span> +
+ +
+ + + + +
+
+

Tables For, you guessed it, tabular data

+
+ +

Table markup

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
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>
+    <tr>
+      <th>...</th>
+      <th>...</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>...</td>
+      <td>...</td>
+    </tr>
+  </tbody>
+</table>
+
+
+
+ +

Example tables

+

1. Default table styles

+

All tables will be automatically styled with only the essential borders to ensure readability and maintain structure. No need to add extra classes or attributes.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#First NameLast NameLanguage
1SomeOneEnglish
2JoeSixpackEnglish
3StuDentCode
+
+<table>
+  ...
+</table>
+

2. Zebra-striped

+

Get a little fancy with your tables by adding zebra-striping—just add the .zebra-striped class.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#First NameLast NameLanguage
1SomeOneEnglish
2JoeSixpackEnglish
3StuDentCode
+

Note: Zebra-striping is a progressive enhancement not available for older browsers like IE8 and below.

+
+<table class="zebra-striped">
+...
+</table>
+

3. Zebra-striped w/ TableSorter.js

+

Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via jQuery and the Tablesorter plugin. Click any column’s header to change the sort.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#First NameLast NameLanguage
1YourOneEnglish
2JoeSixpackEnglish
3StuDentCode
+
+<script src="js/jquery/jquery.tablesorter.min.js"></script>
+<script >
+  $(function() {
+    $("table#sortTableExample").tablesorter({ sortList: [[1,0]] });
+  });
+</script>
+<table class="zebra-striped">
+  ...
+</table>
+ +
+ + + + +
+
+

Forms

+
+
+
+

Four types of forms

+

With 2.0, we now have four types of forms to choose from:

+
    +
  • Search form for a super-rounded input and optional button
    • +
  • Inline form for a series of elements on one line
    • +
  • Horizontal form for left-aligned labels
    • +
  • Vertical form for stacked labels and inputs
    • +
+
+
+

+
+
+
+
+

Search form

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

Inline form

+
+
+
+
+

Some directional text

+

And maybe some kind of optional supporting text right here.

+ + + + +
+
+
+
+
+
+

Horizontal form

+
+
+
+ Example form +
+ +
+ +

Help text here. Be sure to fill this out like so, or else!

+
+
+
+ +
+ +
+
+
+ +
+ +
+
+ Example form +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + + + +
+

Note: Labels surround all the options for much larger click areas and a more usable form.

+
+
+
+ +
+
+ + +
+

Note: Labels surround all the options for much larger click areas and a more usable form.

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

Vertical form

+
+
+
+ Example form +
+ +
+ +

Be sure to fill this out like so, or else!

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

Buttons

+

As a convention, buttons are used for actions while links are used for objects. For instance, "Download" could be a button and "recent activity" could be a link.

+

All buttons default to a light gray style, but a number of functional classes can be applied for different color styles. These classes include a blue .primary class, a light-blue .info class, a green .success class, and a red .danger class.

+
+
+

Example buttons

+

Button styles can be applied to anything with the .btn applied. Typically you’ll want to apply these to only <a>, <button>, and select <input> elements. Here’s how it looks:

+
+      +
+

Alternate sizes

+

Fancy larger or smaller buttons? Have at it!

+
+ Primary action + Action +
+
+ Primary action + Action +
+

Disabled state

+

For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s .disabled for links and :disabled for <button> elements.

+

Links

+
+ Primary action + Action +
+

Buttons

+
+   +
+
+
+ +
+
+

Button groups

+
+
+

Example

+
+
+ Left + Middle + Right +
+
+
+
+
+ 1 + 2 + 3 + 4 + 5 +
+
+ 6 + 7 + 8 +
+
+ 9 +
+
+ 10 +
+
+
+
+
+ +
+ + + + +
+ + + + + + + + + + + + + + -- cgit v1.2.3 From b4c894961c0b75361ead496f1686eb3cf41c5c97 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 26 Oct 2011 23:24:22 -0700 Subject: address issue #414 and fix up a number of docs loose ends --- docs/base-css.html | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index e3b3782c0..47dff40e7 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -197,7 +197,8 @@

Lists

-

Unordered <ul>

+

Unordered

+

<ul>

  • Lorem ipsum dolor sit amet
  • Consectetur adipiscing elit
    • @@ -217,7 +218,8 @@
-

Unstyled <ul.unstyled>

+

Unstyled

+

<ul class="unstyled">

  • Lorem ipsum dolor sit amet
  • Consectetur adipiscing elit
    • @@ -237,7 +239,8 @@
-

Ordered <ol>

+

Ordered

+

<ol>

  1. Lorem ipsum dolor sit amet
  2. Consectetur adipiscing elit
    3. @@ -250,7 +253,8 @@
-

Description <dl>

+

Description

+

<dl>

Description lists
A description list is perfect for defining terms.
@@ -286,7 +290,7 @@ <h1>Heading</h1> <p>Something right here...</p> </div> -

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

+

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

-- cgit v1.2.3 From 3f512adf953da3a3fbbfca18b138fb6659f2b77f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 30 Oct 2011 20:14:27 -0700 Subject: updated docs and type styles for blockquotes and a few fixes for type --- docs/base-css.html | 68 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 58 insertions(+), 10 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 47dff40e7..750bbd2b3 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -92,8 +92,8 @@ Element - Description Usage + Optional @@ -175,24 +175,72 @@

Blockquotes

+ + + + + + + + + + + + + + + + + + + + +
ElementUsageOptional
+ <blockquote> + + Block-level element for quoting content from another source + +

Add cite attribute for source URL

+ Use .pull-left and .pull-right classes for floated options +
+ <small> + + Optional element for adding a user-facing citation, typically an author with title of work + + Place the <cite> around the title or name of source +
-
-

To include a blockquote, wrap <blockquote> around <p> and <small> tags. Use the <small> element to cite your source and you'll get an em dash &mdash; before it.

-
-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis dapibus posuere velit aliquet.

- Someone famous -
+
+

To include a blockquote, wrap <blockquote> around any HTML as the quote. For straight quotes we recommend a <p>.

+

Include an optional <small> element to cite your source and you'll get an em dash &mdash; before it for styling purposes.

-
+ 
 <blockquote>
-  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis dapibus posuere velit aliquet.</p>
-  <small>Dr. Julius Hibbert</small>
+  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p>
+  <small>Someone famous</small>
 </blockquote>
+
+ +

Example blockquotes

+
+
+
+

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

+ Someone famous +
+
+
+
+

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

+ Someone famous +
+
+

Lists

-- cgit v1.2.3 From ba597ef8458de4593b7a0269b0dd794f9ca89818 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 31 Oct 2011 16:32:13 -0700 Subject: updating table documentation, jumping to dev to bring over new table styles from there --- docs/base-css.html | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 750bbd2b3..2872fbb99 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -227,15 +227,17 @@

Example blockquotes

+

Default blockquotes are styled as such:

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

- Someone famous + Someone famous in Body of work
+

To float your blockquote to the right, add class="pull-right":

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

- Someone famous + Someone famous in Body of work
@@ -514,6 +516,45 @@
+

Table options

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameClassDescription
DefaultNoneOnly horizontal lines between rows
Bordered + .bordered-table + Rounds corners and adds outter border
Zebra-stripe + .striped-table + Adds light gray background color to odd rows (1, 3, 5, etc)
Condensed + .condensed-table + Cuts padding in half, from 10px to 5px, within all td and th elements
+

Example tables

1. Default table styles

All tables will be automatically styled with only the essential borders to ensure readability and maintain structure. No need to add extra classes or attributes.

-- cgit v1.2.3 From 02bf27592c8eec51795ac806390bc57db501926d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 31 Oct 2011 19:37:10 -0700 Subject: overhaul the table styles and update those everywhere in the docs, update the button docs, spec out the forms docs --- docs/base-css.html | 228 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 151 insertions(+), 77 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 2872fbb99..6d3d92a17 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -88,7 +88,7 @@

Emphasis, address, and abbreviation

- +
@@ -175,7 +175,7 @@

Blockquotes

-
Element
+
@@ -321,7 +321,7 @@

Code Inline and block

-
Element
+
@@ -363,7 +363,7 @@

Inline labels for special attention

-
Element
+
@@ -428,7 +428,7 @@

Table markup

-
Labels
+
@@ -517,7 +517,7 @@

Table options

-
Tag
+
@@ -592,9 +592,9 @@ <table> ... </table> -

2. Zebra-striped

-

Get a little fancy with your tables by adding zebra-striping—just add the .zebra-striped class.

-
Name
+

2. Striped table

+

Get a little fancy with your tables by adding zebra-striping—just add the .striped-table class.

+
@@ -626,12 +626,12 @@
#

Note: Zebra-striping is a progressive enhancement not available for older browsers like IE8 and below.

-<table class="zebra-striped">
+<table class="striped-table">
 ...
 </table>
-

3. Zebra-striped w/ TableSorter.js

+

3. Striped table w/ TableSorter.js

Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via jQuery and the Tablesorter plugin. Click any column’s header to change the sort.

- +
@@ -668,7 +668,7 @@ $("table#sortTableExample").tablesorter({ sortList: [[1,0]] }); }); </script> -<table class="zebra-striped"> +<table class="striped-table"> ... </table> @@ -682,19 +682,49 @@

Forms

+ +

Four types of forms

+
#
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameClassDescription
Vertical (default).vertical-form (not required)Stacked, left-aligned labels over controls
Horiztonal.horizontal-formFloat left, right-aligned labels on same line as controls
Inline.inline-formLeft-aligned label and inline-block controls for compact style
Search.search-formExtra-rounded text input for a typical search aesthetic
+ +
-

Four types of forms

-

With 2.0, we now have four types of forms to choose from:

-
    -
  • Search form for a super-rounded input and optional button
    • -
  • Inline form for a series of elements on one line
    • -
  • Horizontal form for left-aligned labels
    • -
  • Vertical form for stacked labels and inputs
    • -
+

Why four types

+

With Bootstrap 2, we completely recoded our forms to allow for simple base styles and improved namespacing on labels and controls. To address the many uses of forms, we've included some base styles to help get you started.

-

+

Vertical or horizontal

+

Our default form styles are now vertical, not horizontal. This makes it easier to customize bare-bones forms, as well as forms in tricker situations like sign-up, modals, etc. They share the same exact markup; just swap the class.

@@ -875,79 +905,123 @@
+ + +

Buttons

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NamePreviewClassDescription
DefaultButton.btnStandard gray button with gradient
PrimaryButton.primaryMakes button blue for more visual weight to indicate the primary action in a set of buttons
InfoButton.infoUsed as an alternate to the default styles
SuccessButton.successUsed to indicate a successful or positive action will be taken
DangerButton.dangerUsed to indicate a dangerous or potentially negative action will be taken
+
-
-

Buttons

-

As a convention, buttons are used for actions while links are used for objects. For instance, "Download" could be a button and "recent activity" could be a link.

-

All buttons default to a light gray style, but a number of functional classes can be applied for different color styles. These classes include a blue .primary class, a light-blue .info class, a green .success class, and a red .danger class.

+
+

Buttons for actions

+

As a convention, buttons should only be used for actions while hyperlinks are to be used for objects. For instance, "Download" should be a button while "recent activity" should be a link.

-
-

Example buttons

-

Button styles can be applied to anything with the .btn applied. Typically you’ll want to apply these to only <a>, <button>, and select <input> elements. Here’s how it looks:

-
-      -
-

Alternate sizes

+
+

For anchors and forms

+

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

+
+
+

Note: All buttons must include the .btn class. Button styles should be applied to <button> and <a> elements for consistency.

+
+
+ +
+
+

Multiple sizes

Fancy larger or smaller buttons? Have at it!

-
+

Primary action Action -

-
+

+

Primary action Action -

+

+
+

Disabled state

For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s .disabled for links and :disabled for <button> elements.

-

Links

-
+

Primary action Action -

-

Buttons

-
+

+

  -

+

-
+
-
-
-

Button groups

+

Button groups

+ +
+
+ Left + Middle + Right
-
-

Example

-
-
- Left - Middle - Right -
+
+
+
+
+ 1 + 2 + 3 + 4 + 5
-
-
-
- 1 - 2 - 3 - 4 - 5 -
-
- 6 - 7 - 8 -
-
- 9 -
-
- 10 -
-
+
+ 6 + 7 + 8 +
+
+ 9 +
+
+ 10
-
+
-- cgit v1.2.3 From 27b8e5e4fce71ccc5ebd56230dedd9c2403239eb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 31 Oct 2011 21:24:57 -0700 Subject: small docs tweak --- docs/base-css.html | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 6d3d92a17..f6030ace1 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -992,7 +992,6 @@

Button groups

-
Left -- cgit v1.2.3 From 74dc83f211245dfaf06da9a1b2ad94f51f790be2 Mon Sep 17 00:00:00 2001 From: Raul Riera Date: Mon, 7 Nov 2011 10:22:28 +0100 Subject: Added the view port meta tag for proper responsiveness --- docs/base-css.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index f6030ace1..03f50f6ff 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -3,6 +3,7 @@ Bootstrap, from Twitter + -- cgit v1.2.3 From 0e6cd670ca0619c663c016c08059530b598e15d3 Mon Sep 17 00:00:00 2001 From: Raul Riera Date: Tue, 8 Nov 2011 20:32:28 +0100 Subject: Removed trailing backslash :) --- docs/base-css.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 03f50f6ff..51c4d35a3 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -3,7 +3,7 @@ Bootstrap, from Twitter - + -- cgit v1.2.3 From 275da020c275b2eb76ef28a1d210b6e6340e4e6e Mon Sep 17 00:00:00 2001 From: Jon Stevens Date: Wed, 16 Nov 2011 11:10:27 -0800 Subject: added condensed example --- docs/base-css.html | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 51c4d35a3..c8ce7b222 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -630,7 +630,43 @@ <table class="striped-table"> ... </table> -

3. Striped table w/ TableSorter.js

+

3. Condensed table

+

Make your tables smaller—just add the .condensed-table class.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#First NameLast NameLanguage
1SomeOneEnglish
2JoeSixpackEnglish
3StuDentCode
+
+<table class="condensed-table">
+...
+</table>
+

4. Striped table w/ TableSorter.js

Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via jQuery and the Tablesorter plugin. Click any column’s header to change the sort.

-- cgit v1.2.3 From a0179322854a9d1e2b9363447c9884e40733d04f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 16 Nov 2011 23:58:36 -0800 Subject: start breaking down patterns.less into more distinct files, update docs for forms to use correct classes --- docs/base-css.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 51c4d35a3..9c1af11c4 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -696,22 +696,22 @@ - + - + - + - + -- cgit v1.2.3 From a8e88d14a422c3dfdb79eaf6d6a3a2f1144df150 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 17 Nov 2011 00:06:16 -0800 Subject: make form classes match table classes (readable left to right), update docs associated with it --- docs/base-css.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 9c1af11c4..0b84d01ad 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -696,22 +696,22 @@ - + - + - + - + @@ -734,7 +734,7 @@
-
+ @@ -747,7 +747,7 @@
-
+

Some directional text

And maybe some kind of optional supporting text right here.

@@ -763,7 +763,7 @@

Horizontal form

- + Example form
@@ -867,7 +867,7 @@

Vertical form

- + Example form
-- cgit v1.2.3 From 5abb4b32004d493ac6bbefcdd1b1f71bdf6e5437 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 17 Nov 2011 00:09:12 -0800 Subject: update tables docs after merging in the condensed styles --- docs/base-css.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 2935f8867..aa4a2ebfc 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -628,10 +628,10 @@

Note: Zebra-striping is a progressive enhancement not available for older browsers like IE8 and below.

 <table class="striped-table">
-...
+  ...
 </table>

3. Condensed table

-

Make your tables smaller—just add the .condensed-table class.

+

Make your tables more compact by adding the .condensed-table class to cut table cell padding in half (from 10px to 5px).

Vertical (default).vertical-form (not required).form-vertical (not required) Stacked, left-aligned labels over controls
Horiztonal.horizontal-form.form-horizontal Float left, right-aligned labels on same line as controls
Inline.inline-form.form-inline Left-aligned label and inline-block controls for compact style
Search.search-form.form-search Extra-rounded text input for a typical search aesthetic
Vertical (default).form-vertical (not required).vertical-form (not required) Stacked, left-aligned labels over controls
Horiztonal.form-horizontal.horizontal-form Float left, right-aligned labels on same line as controls
Inline.form-inline.inline-form Left-aligned label and inline-block controls for compact style
Search.form-search.search-form Extra-rounded text input for a typical search aesthetic
@@ -664,7 +664,7 @@ 
 <table class="condensed-table">
-...
+  ...
 </table>

4. Striped table w/ TableSorter.js

Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via jQuery and the Tablesorter plugin. Click any column’s header to change the sort.

-- cgit v1.2.3 From bc65b58551575c9dfb2e4d9f4f7af97009e39432 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 20 Nov 2011 20:58:04 -0800 Subject: merge in js from 1.4... start working through js docs --- docs/base-css.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index aa4a2ebfc..11346b5b0 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -37,7 +37,7 @@
  • Scaffolding
  • Base CSS
  • Components
    • -
  • Javascript
    • +
  • Javascript plugins
  • Using LESS
    • -- cgit v1.2.3 From b36df463108e2e4df8c389a06f577823564788d9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 29 Nov 2011 22:35:03 -0800 Subject: misc docs updates, revamped tables CSS save for grid columns and tablesorter options --- docs/base-css.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index aa4a2ebfc..48704cbd4 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -519,7 +519,7 @@

    Table options

    - + @@ -551,7 +551,7 @@ - +
    Name Class .condensed-table Cuts padding in half, from 10px to 5px, within all td and th elementsCuts vertical padding in half, from 8px to 4px, within all td and th elements
    -- cgit v1.2.3 From 0c8d2e37e76db3d3b47ca9eb5340def031b9196b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 29 Nov 2011 23:16:38 -0800 Subject: adding bordered table to docs and showing it works with colspan --- docs/base-css.html | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index bab55f0e4..7626d1668 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -630,7 +630,42 @@ <table class="striped-table"> ... </table> -

    3. Condensed table

    +

    3. Bordered table

    +

    Add borders around the entire table and between each row, plus a bit of rounded corners for aesthetic purposes.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    #First NameLast NameLanguage
    1Some OneEnglish
    2 JoeSixpackEnglish
    3StuDentCode
    +

    Note: Zebra-striping is a progressive enhancement not available for older browsers like IE8 and below.

    +
    +<table class="striped-table">
+  ...
+</table>
    +

    4. Condensed table

    Make your tables more compact by adding the .condensed-table class to cut table cell padding in half (from 10px to 5px).

    @@ -666,7 +701,7 @@ <table class="condensed-table"> ... </table> -

    4. Striped table w/ TableSorter.js

    +

    5. Striped table w/ TableSorter.js

    Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via jQuery and the Tablesorter plugin. Click any column’s header to change the sort.

    -- cgit v1.2.3 From 90c190d4efedd4080c574b34bffdf54cd5b9ed88 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 29 Nov 2011 23:48:27 -0800 Subject: updates to add warning for bordered tables to docs, fix to spacing on prettyprint pre blocks --- docs/base-css.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 7626d1668..cc1b4903c 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -632,6 +632,7 @@ </table>

    3. Bordered table

    Add borders around the entire table and between each row, plus a bit of rounded corners for aesthetic purposes.

    +

    Note Bordered tables do not work well with rowspan due to somewhat hacky CSS applied to the tables. Sorry about that!

    @@ -648,7 +649,13 @@ - + + + + + + + -- cgit v1.2.3 From 447c9322e96ebd1102115aea01d925536016351a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 29 Nov 2011 23:56:01 -0800 Subject: update all leads on docs pages --- docs/base-css.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index cc1b4903c..2b7d17b4a 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -50,7 +50,7 @@ ================================================== -->

    Base CSS

    -

    The core typography, form, and table styles of Bootstrap

    +

    On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.

    -- cgit v1.2.3 From e603009fca162178de3265192b2e5da40ce3a151 Mon Sep 17 00:00:00 2001 From: Chris Sternal-Johnson Date: Thu, 8 Dec 2011 14:42:42 -0500 Subject: fix docs for bordered-table --- docs/base-css.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 2b7d17b4a..a9529821b 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -667,9 +667,8 @@
    English
    2 Joe2JoeSixpackEnglish
    Joe Sixpack English
    -

    Note: Zebra-striping is a progressive enhancement not available for older browsers like IE8 and below.

    -<table class="striped-table">
+<table class="bordered-table">
   ...
 </table>

    4. Condensed table

    -- cgit v1.2.3 From 1d1805ee5cb188f0c70b6a27e227ea6caca62c8e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 9 Dec 2011 11:41:00 -0800 Subject: add jank js for prototyping new topbar to all docs pages --- docs/base-css.html | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 2b7d17b4a..e087432fe 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1118,6 +1118,17 @@ + + + -- cgit v1.2.3 From 7b810bf9a617e1f02e073aafcc70857dc915ee59 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 9 Dec 2011 12:10:01 -0800 Subject: update js in footer, add max-width to img --- docs/base-css.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index e087432fe..efdc1e271 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1122,9 +1122,9 @@ -- cgit v1.2.3 From 97b285896f50bed4a66b00a70ed67eb3224bc7f3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 9 Dec 2011 12:51:54 -0800 Subject: help tables not look like shit on mobile maybe? also fix bordered table example --- docs/base-css.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index efdc1e271..cb6c699f9 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -655,6 +655,7 @@ English + 3 Joe Sixpack English -- cgit v1.2.3 From ecbc9ec4a2cbd3f68067b869c328d55e8afc8aa6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Dec 2011 02:03:16 -0800 Subject: updated footers everywhere --- docs/base-css.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index b353a538d..811bb01bd 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1108,10 +1108,9 @@ ================================================== -->
    -- cgit v1.2.3 From 4e8c26d409c60f50e2ab245e74ec18af5131d838 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Dec 2011 02:38:58 -0800 Subject: updated buttons docs --- docs/base-css.html | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 811bb01bd..209897402 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -990,40 +990,34 @@ - - + - - + - - + - - + - - + - - + -- cgit v1.2.3 From 8a7abc7493a07935d4d91b2cc56a82523fd53970 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2011 16:00:50 -0600 Subject: docs updates, forms updated to include error states and more examples, remove text-shadow from gradientbar mixin to fix bug --- docs/base-css.html | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 74 insertions(+), 6 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 209897402..63ec53306 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -762,6 +762,43 @@

    Forms

    + +

    Four types of forms

    NamePreviewButton Class Description
    DefaultButtonDefault .btn Standard gray button with gradient
    PrimaryButtonPrimary .primary Makes button blue for more visual weight to indicate the primary action in a set of buttons
    InfoButtonInfo .info Used as an alternate to the default styles
    SuccessButtonSuccess .success Used to indicate a successful or positive action will be taken
    DangerButtonDanger .danger Used to indicate a dangerous or potentially negative action will be taken
    @@ -842,7 +879,7 @@
    - Example form + Example form section
    @@ -850,6 +887,16 @@

    Help text here. Be sure to fill this out like so, or else!

    +
    + +
    +
    + @ + +
    + Here's some help text +
    +
    @@ -874,23 +921,44 @@
    - Example form + Example form section +
    + +
    + +
    +
    +
    + +
    + +
    +
    -
    +
    + +
    + + Something may have gone wrong +
    +
    +
    + Please correct the error
    -
    - +
    +
    - + + Woohoo!
    -- cgit v1.2.3 From 20aecb983838422c7b43e20960b10d4d79fefaa3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2011 16:22:20 -0600 Subject: updated all docs to jQuery 1.7, move all docs JS to application.js, and move dropdowns css to dedicated file --- docs/base-css.html | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 63ec53306..bb54b0c51 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1178,18 +1178,7 @@ Form states - - - - + -- cgit v1.2.3 From efacac0d6c812abffa8a84a48fa760f5f56c92f0 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 21 Dec 2011 18:42:43 -0800 Subject: clean up all the js across all the doc pages --- docs/base-css.html | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 209897402..6173a4de6 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1110,25 +1110,10 @@ - - - - - + + - - - - -- cgit v1.2.3 From 49fb910b11baef4ccfe9270479e8b9bf9e5e7731 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 22 Dec 2011 19:25:29 -0800 Subject: more js cleanup after gnarly merge --- docs/base-css.html | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 34e844df3..dad42381d 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1180,7 +1180,6 @@ Form states - -- cgit v1.2.3 From fec02f50455c87f0e01fe74b1fb2e3cd032ade09 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 15:40:58 -0600 Subject: clean up some css for github issues: input prepend z-index, modals revamped for responsive --- docs/base-css.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index dad42381d..99fb9bd1a 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -894,7 +894,7 @@ Form states @
    - Here's some help text +

    Here's some help text

    -- cgit v1.2.3 From e78d5f8ff33009e4c4ab57496913b43ff1e369dc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 16:25:22 -0600 Subject: fix tables for rowspan --- docs/base-css.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 99fb9bd1a..13cbeedbc 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -646,25 +646,24 @@
    - + - + - - +
    1 Some OneEnglishHTML
    2 Joe SixpackEnglishJavascript
    3 Joe SixpackEnglish
    3 Stu DentCodeCSS
    -- cgit v1.2.3 From 53c6dbff0d6dd781df421f07acdd9e98719b41bf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 17:04:55 -0600 Subject: add appended input example to docs, fix help-text wrapping issue by clearing float --- docs/base-css.html | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 13cbeedbc..2bc6f49fb 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -896,6 +896,16 @@ Form states

    Here's some help text

    +
    + +
    +
    + + .00 +
    +

    Here's more help text

    +
    +
    -- cgit v1.2.3 From fb9401b355366452d310d39f51224999da4daa82 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 01:34:14 -0800 Subject: tweaks abound, updated prettify styles, new sidenav component started, sprite icons started --- docs/base-css.html | 152 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 152 insertions(+) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 2bc6f49fb..c07263495 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1175,6 +1175,158 @@ Form states + + +
    +
    +

    Icons Graciously provided by Glyphicons

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

    Built as a sprite

    +

    Instead of making every icon an extra request, we've compiled them into a sprite—a bunch of images in one file that uses CSS to position the images with background-position. This is the same method we use on Twitter.com and it has worked well for us.

    +

    Glyphicons has granted us use of the Halflings set in our open-source toolkit so long as we provide a link and credit. Please consider doing the same in your projects.

    +
    +
    +

    How to use

    +

    With v2.0.0, the <i> tag is essentially dedicated to iconography. To use the icons, you can place the follow code wherever you like one to appear:

    +
    +<i class="chevron-left"></i>
+
    +

    There are over 100 classes to choose from for your icons. Just add an <i> tag with the right class and you're set. You can find the full list in sprites.less or right here in this document.

    +
    +
    +

    Use cases

    +

    Icons are great, but where would one use them? Here are a few ideas:

    +
      +
    • As visuals for your sidebar navigation
      • +
    • For a purely icon-driven nav
      • +
    • For buttons to help convey the meaning of an action
      • +
    • With links to share context on a user's destination
      • +
    +

    Essentially, anywhere you can put an <i> tag, you can put an icon.

    +
    +
    +
    + + +
    -- cgit v1.2.3 From a13ab64870f40a67ffd85532c30620f8001d0822 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 01:36:05 -0800 Subject: add a quick little example of icons in buttons --- docs/base-css.html | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index c07263495..37fa97ba8 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1323,6 +1323,9 @@ Form states

    Essentially, anywhere you can put an <i> tag, you can put an icon.

    + +

    Examples

    +

    Button

    -- cgit v1.2.3 From 20add59de3f2b69aaa9c9b325dab20b13c75eaa1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 10:01:42 -0800 Subject: breaking out patterns.less even more, removing unnecessary div from checkbox and radio lists--now just labels and inputs --- docs/base-css.html | 72 +++++++++++++++++++++++++----------------------------- 1 file changed, 33 insertions(+), 39 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 37fa97ba8..58d42c2b0 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -973,40 +973,36 @@ Form states
    -
    - - - - -
    + + + +

    Note: Labels surround all the options for much larger click areas and a more usable form.

    -
    - - -
    + +

    Note: Labels surround all the options for much larger click areas and a more usable form.

    @@ -1040,17 +1036,15 @@ Form states
    -
    - - - -
    + + +
    -- cgit v1.2.3 From 23e5fc2133dd748ba4a7df52b598a24a2915811a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 14:11:41 -0800 Subject: Tweak the docs and address the new forms list of controls: radios and checkboxes are now hanging controls to wrap text properly --- docs/base-css.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 58d42c2b0..1ec808a39 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -795,9 +795,16 @@ Form states warning error success - --> +
    +
    +

    Flexible markup and styles

    +

    The best part about forms in Bootstrap is that all your inputs and controls look great no matter how you build them in your markup. No superfluous HTML is required, but we provide the patterns for those who require it.

    +
    +
    + +

    Four types of forms

    -- cgit v1.2.3 From 621dd13d87b6ba5fd351966056ea335c6a946f45 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 15:43:07 -0800 Subject: move mega link footer to scaffolding to try it out, fix broken button text shadow, change UL/OL margins back, make li color same as body --- docs/base-css.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 1ec808a39..10be4c3d4 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -802,6 +802,8 @@ Form states

    Flexible markup and styles

    The best part about forms in Bootstrap is that all your inputs and controls look great no matter how you build them in your markup. No superfluous HTML is required, but we provide the patterns for those who require it.

    +
    +
    -- cgit v1.2.3 From c56e9d2d35299b4c9e4e3d1aabcf59cedc9143f2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 21:43:28 -0800 Subject: massive docs update, mostly to all our new forms, and to the buttons --- docs/base-css.html | 381 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 224 insertions(+), 157 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 10be4c3d4..225f10ae2 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -593,6 +593,9 @@ <table> ... </table> + +
    +

    2. Striped table

    Get a little fancy with your tables by adding zebra-striping—just add the .striped-table class.

    @@ -630,6 +633,9 @@ <table class="striped-table"> ... </table> + +
    +

    3. Bordered table

    Add borders around the entire table and between each row, plus a bit of rounded corners for aesthetic purposes.

    Note Bordered tables do not work well with rowspan due to somewhat hacky CSS applied to the tables. Sorry about that!

    @@ -671,6 +677,9 @@ <table class="bordered-table"> ... </table> + +
    +

    4. Condensed table

    Make your tables more compact by adding the .condensed-table class to cut table cell padding in half (from 10px to 5px).

    @@ -707,6 +716,9 @@ <table class="condensed-table"> ... </table> + +
    +

    5. Striped table w/ TableSorter.js

    Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via jQuery and the Tablesorter plugin. Click any column’s header to change the sort.

    @@ -760,54 +772,32 @@

    Forms

    - - - -
    -
    -

    Flexible markup and styles

    -

    The best part about forms in Bootstrap is that all your inputs and controls look great no matter how you build them in your markup. No superfluous HTML is required, but we provide the patterns for those who require it.

    -
    -
    +
    +
    +

    Flexible HTML and CSS

    +

    The best part about forms in Bootstrap is that all your inputs and controls look great no matter how you build them in your markup. No superfluous HTML is required, but we provide the patterns for those who require it.

    +

    More complicated layouts come with succinct and scalable classes for easy styling and event binding, so you're covered at every step.

    +
    +
    +

    Four layouts included

    +

    Bootstrap comes with support for four types of form layouts:

    +
      +
    • Vertical (default)
      • +
    • Search
      • +
    • Inline
      • +
    • Horizontal
      • +
    +

    Different types of form layouts require some changes to markup, but the controls themselves remain and behave the same.

    +
    +
    +

    Control states and more

    +

    Bootstrap's forms include styles for all the base form controls like input, textarea, and select you'd expect. But it also comes with a number of custom components like appended and prepended inputs and support for lists of checkboxes.

    +

    States like error, warning, and success are included for each type of form control. Also included are styles for disabled controls.

    +
    -
    -

    Four types of forms

    +

    Bootstrap provides simple markup and styles for four styles of common web forms.

    @@ -823,7 +813,7 @@ Form states - + @@ -841,78 +831,60 @@ Form states
    Stacked, left-aligned labels over controls
    HoriztonalHorizontal .horizontal-form Float left, right-aligned labels on same line as controls
    +

    Example forms using just form controls, no extra markup

    -

    Why four types

    -

    With Bootstrap 2, we completely recoded our forms to allow for simple base styles and improved namespacing on labels and controls. To address the many uses of forms, we've included some base styles to help get you started.

    +

    Basic form

    +

    With v2.0, we have lighter and smarter defaults for form styles. No extra markup, just form controls.

    + + + + + +
    -

    Vertical or horizontal

    -

    Our default form styles are now vertical, not horizontal. This makes it easier to customize bare-bones forms, as well as forms in tricker situations like sign-up, modals, etc. They share the same exact markup; just swap the class.

    -
    -
    -
    -
    -

    Search form

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

    Inline form

    +

    Search form

    +

    Reflecting default WebKit styles, just add .search-form for extra rounded search fields.

    +
    + + +
    -
    -
    -
    -

    Some directional text

    -

    And maybe some kind of optional supporting text right here.

    - - - - -
    -
    +
    +

    Inline form

    +

    Inputs are block level to start. For .inline-form and .horizontal-form, we use inline-block.

    +
    + + + +
    + +
    + +

    Horizontal forms

    -
    -

    Horizontal form

    -
    -
    +
    - Example form section + Controls Bootstrap supports
    -

    Help text here. Be sure to fill this out like so, or else!

    -
    -
    -
    - -
    -
    - @ - -
    -

    Here's some help text

    +

    In addition to freeform text, any HTML5 text-based input appears like so.

    - +
    -
    - - .00 -
    -

    Here's more help text

    +
    @@ -939,23 +911,69 @@ Form states
    - Example form section +
    + +
    + +
    +
    +
    + + +
    + +
    +
    +
    +

    What's included

    +

    Shown on the left are all the default form controls we support. Here's the bulleted list:

    +
      +
    • text inputs (text, password, email, etc)
      • +
    • checkbox
      • +
    • radio
      • +
    • select
      • +
    • multiple select
      • +
    • file input
      • +
    • textarea
      • +
    +
    +

    New defaults with v2.0

    +

    Up to v1.4, Bootstrap's default form styles used the horizontal layout. With Bootstrap 2, we removed that constraint to have smarter, more scalable defaults for any form.

    +
    +
    +
    + +
    + +
    +
    +
    + Form control states
    - +
    - +
    - +
    - + +
    +
    +
    + +
    +
    @@ -979,6 +997,54 @@ Form states Woohoo!
    +
    + + +
    + +
    +
    +
    +

    Redesigned browser states

    +

    Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in it's place for :focus.

    +
    +

    Form validation

    +

    It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding .control-group.

    +
    +<fieldset class="control-group error">
+  ...
+</fieldset>
+
    +
    +
    +
    + +
    + +
    +
    +
    + Extending form controls +
    + +
    +
    + @ + +
    +

    Here's some help text

    +
    +
    +
    + +
    +
    + + .00 +
    +

    Here's more help text

    +
    +
    @@ -994,10 +1060,6 @@ Form states Option three can—yes, you guessed it—also be checked and included in form results -

    Note: Labels surround all the options for much larger click areas and a more usable form.

    @@ -1010,9 +1072,8 @@ Form states -

    Note: Labels surround all the options for much larger click areas and a more usable form.

    @@ -1021,52 +1082,24 @@ Form states
    -
    -
    -
    -

    Vertical form

    -
    -
    -
    - Example form -
    - -
    - -

    Be sure to fill this out like so, or else!

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

    Prepend & append inputs

    +

    Input groups—with appended or prepended text—provide an easy way to give more context for your inputs. Great examples include the @ sign for Twitter usernames or $ for finances.

    +
    +

    Checkboxes and radios

    +

    Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <label class="checkbox"> that wraps the <input type="checkbox">.

    +
    + -

    Buttons

    +
    +
    +

    Buttons

    +
    @@ -1084,7 +1117,7 @@ Form states - + @@ -1094,12 +1127,12 @@ Form states - + - +
    Primary .primaryMakes button blue for more visual weight to indicate the primary action in a set of buttonsProvides extra visual weight and identifies the primary action in a set of buttons
    Info
    Success .successUsed to indicate a successful or positive action will be takenIndicates a successful or positive action
    Danger .dangerUsed to indicate a dangerous or potentially negative action will be takenIndicates a dangerous or potentially negative action
    @@ -1296,6 +1329,9 @@ Form states
    +
    +

    Light red background color is only used to show the dimensions of the icons in the docs.

    +

    @@ -1328,7 +1364,38 @@ Form states

    Examples

    -

    Button

    +
    +
    +

    Use them in buttons, or in button groups for a toolbar style presentation.

    +

    + Refresh + Settings +

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

    Or, use them in navigation.

    +
    + +
    +
    +
    -- cgit v1.2.3 From 7582520808ad6c3610831652d0d4d33ea4ebf15b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 22:37:23 -0800 Subject: docs cleanup and navbar brand hover --- docs/base-css.html | 68 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 27 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 225f10ae2..a0c3c4cf1 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -638,7 +638,6 @@

    3. Bordered table

    Add borders around the entire table and between each row, plus a bit of rounded corners for aesthetic purposes.

    -

    Note Bordered tables do not work well with rowspan due to somewhat hacky CSS applied to the tables. Sorry about that!

    @@ -1177,37 +1176,52 @@ -

    Button groups

    -
    -
    - Left - Middle - Right +
    + +
    +
    +

    Button groups

    +

    Use button groups to join multiple buttons together as one composite component. Button groups can be built with not only <a> or <button> elements, but also radios and checkboxes.

    +

    You can also combine sets of button groups into a toolbar for more complex projects.

    +

    Get the javascript »

    +

    Heads up: CSS for button groups is in a separate file, button-groups.less.

    -
    -
    -
    -
    - 1 - 2 - 3 - 4 - 5 -
    -
    - 6 - 7 - 8 -
    -
    - 9 +
    +

    Linked button group

    +

    Using the standard <a class="btn" href="#">...</a> markup, simply add all the buttons you need.

    +
    +
    + Left + Middle + Right +
    -
    - 10 +

    Level up one more time by wrapping multiple instances of <div class="btn-group"> with <div class="btn-toolbar">.

    +
    +
    +
    + 1 + 2 + 3 + 4 + 5 +
    +
    + 6 + 7 + 8 +
    +
    + 9 +
    +
    + 10 +
    +
    - + -- cgit v1.2.3 From 5cb76037ae70ca26a923750ca9441b04d2fbd6a7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 23:24:19 -0800 Subject: fixing conflict in dividers in navbar, fix navbar docs, fix search form in navbar --- docs/base-css.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index a0c3c4cf1..399a41463 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1181,7 +1181,7 @@

    Button groups

    -

    Use button groups to join multiple buttons together as one composite component. Button groups can be built with not only <a> or <button> elements, but also radios and checkboxes.

    +

    Use button groups to join multiple buttons together as one composite component. Just build them with a series of <a> or <button> elements. Button groups can also function as radios and checkboxes (see the Javascript docs for that).

    You can also combine sets of button groups into a toolbar for more complex projects.

    Get the javascript »

    Heads up: CSS for button groups is in a separate file, button-groups.less.

    -- cgit v1.2.3 From cfc2353059df628c67d19a3c5c3ead2cc6051f53 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 6 Jan 2012 23:59:22 -0800 Subject: front page docs updated to include old getting started section, update code styles to look like github gists, and lots more docs updates --- docs/base-css.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 399a41463..cbdf5ea19 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1044,6 +1044,20 @@

    Here's more help text

    +
    + +
    + + + +
    +
    -- cgit v1.2.3 From 36e7660383a7639f5d538efb7dc0f349e285b42d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 00:26:58 -0800 Subject: fix forms in navbars, fix examples' navbars --- docs/base-css.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index cbdf5ea19..cc92bc221 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1102,6 +1102,7 @@

    Checkboxes and radios

    Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <label class="checkbox"> that wraps the <input type="checkbox">.

    +

    Inline checkboxes and radios are also supported. Just add .inline to any .checkbox or .radio and you're done.

    -- cgit v1.2.3 From bcf1136f2c8236cd3fa28eac7e57a9a3fc17d104 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 00:47:53 -0800 Subject: fix form field sizing for selects, document form field grid sizing --- docs/base-css.html | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index cc92bc221..b8a6a2f8d 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1024,6 +1024,15 @@
    Extending form controls +
    + +
    + + + +

    Use the same .span* classes from the grid system for input sizes.

    +
    +
    -- cgit v1.2.3 From d6a1402f2af5111e11a87a6029b642dc0b814854 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 01:03:26 -0800 Subject: update form shadows and tweak prettyprint styles --- docs/base-css.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index b8a6a2f8d..5ae1790f7 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1009,8 +1009,9 @@

    Form validation

    It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding .control-group.

    -
    -<fieldset class="control-group error">
+
    +<fieldset
+  class="control-group error">
   ...
 </fieldset>
 
    
-- 
cgit v1.2.3


From 45d671d97f4d448780729bbb6357e9ec776f980c Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 7 Jan 2012 01:22:52 -0800
Subject: tweak spacing once more on prettify; add support for uneditable
 inputs to input-append and prepend

---
 docs/base-css.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 5ae1790f7..910ea10bb 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1039,7 +1039,7 @@
           
    
             
    
               @
-              
+              
             
    
             
    Here's some help text
    
           
    
@@ -1048,7 +1048,7 @@
           
           
    
             
    
-              
+              
               .00
             
    
             
    Here's more help text
    
-- 
cgit v1.2.3


From 8ccc3bcf03fedbe8c3a19a96c08a5cad6ae456e8 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 7 Jan 2012 03:45:24 -0800
Subject: overhauled dropdowns now require use of .caret for dropdown arrow,
 redid the button group docs section, added the split button dropdown docs
 section

---
 docs/base-css.html | 142 ++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 125 insertions(+), 17 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 910ea10bb..5a8b0b267 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1203,17 +1203,12 @@
 
   
    
 
+  
    Button groups Join buttons for more toolbar-like functionality
    
   
    
     
    
-      
    Button groups
    
-      
    Use button groups to join multiple buttons together as one composite component. Just build them with a series of <a> or <button> elements. Button groups can also function as radios and checkboxes (see the Javascript docs for that).
    
-      
    You can also combine sets of button groups into a toolbar for more complex projects.
    
-      
    Get the javascript »
    
-      
    Heads up: CSS for button groups is in a separate file, button-groups.less.
    
-    
    
-    
    
-      
    Linked button group
    
-      
    Using the standard <a class="btn" href="#">...</a> markup, simply add all the buttons you need.
    
+      
    Button groups
    
+      
    Use button groups to join multiple buttons together as one composite component. Build them with a series of <a> or <button> elements.
    
+      
    You can also combine sets of <div class="btn-group"> into a <div class="btn-toolbar"> for more complex projects.
    
       
    
         
    
           Left
@@ -1221,7 +1216,6 @@
           Right
         
    
       
    
-      
    Level up one more time by wrapping multiple instances of <div class="btn-group"> with <div class="btn-toolbar">.
    
       
    
         
    
           
    
@@ -1229,24 +1223,132 @@
             2
             3
             4
-            5
           
    
           
    
+            5
             6
             7
-            8
-          
    
-          
    
-            9
           
    
           
    
-            10
+            8
           
    
         
    
       
    
+
+    
    
+    
    
+      
    Example markup
    
+      
    Here's how the HTML looks for a standard button group built with anchor tag buttons:
    
+
    +<div class="btn-group">
+  <a class="btn" href="#">1</a>
+  <a class="btn" href="#">2</a>
+  <a class="btn" href="#">3</a>
+</div>
+
    
+      
    And with a toolbar for multiple groups:
    
+
    +<div class="btn-toolbar">
+  <div class="btn-group">
+    ...
+  </div>
+</div>
+
    
+    
    
+    
    
+      
    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.
    
+      
    Get the javascript »
    
+      
    
+      
    Heads up
    
+      
    CSS for button groups is in a separate file, button-groups.less.
    
+    
    
+  
    
+  
+  
    
+  
    Button dropdowns Built on button groups to provide contextual menus
    
+  
    
+    
    
+      
    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.
    
+      
    
+        
    
+          
    
+            Action
+            
+            
+          
            
+          
    
+            Action
+            
+            
+          
         
+          
    
+            Danger
+            
+            
+          
    
+        
    
+        
    
+          
    
+            Success
+            
+            
+          
    
+          
    
+            Info
+            
+            
+          
    
+        
    
+      
     
+    
    
+    
    
+      
    Example markup
    
+      
    Similar to a button group, our markup uses regular button markup, but with a handful of additions to refine the style and support Bootstrap's dropdown jQuery plugin.
    
+
    +<div class="btn-group">
+  <a class="btn" href="#">Action</a>
+  <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+    <span class="caret"></span>
+  </a>
+  <ul class="dropdown-menu">
+    <!-- dropdown menu links -->
+  </ul>
+</div>
+
    
     
    
   
    
-    
 
 
 
@@ -1454,5 +1556,11 @@
     
     
     
+    
+    
   
 
-- 
cgit v1.2.3


From a339f0051b21f9e51d47c3eb1fd7d37f126e87a0 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 7 Jan 2012 12:22:51 -0800
Subject: fixing tablesorter styles by adding the jquery plugin back to the
 lib, fixing the docs examples

---
 docs/base-css.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 5a8b0b267..47858fe10 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1486,7 +1486,7 @@
     
    
       
    How to use
    
       
    With v2.0.0, the <i> tag is essentially dedicated to iconography. To use the icons, you can place the follow code wherever you like one to appear:
    
-
    +
     <i class="chevron-left"></i>
 
    
       
    There are over 100 classes to choose from for your icons. Just add an <i> tag with the right class and you're set. You can find the full list in sprites.less or right here in this document.
    
@@ -1554,11 +1554,13 @@
     
     
     
+    
     
     
     
     
-- 
cgit v1.2.3


From 28420311d89fe2656320cee7306d01a361f1c3c7 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 7 Jan 2012 13:40:05 -0800
Subject: more table docs cleanup

---
 docs/base-css.html | 414 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 244 insertions(+), 170 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 47858fe10..c1cb3fd2d 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -556,211 +556,285 @@
    +

    Example tables

    +

    1. Default table styles

    -

    All tables will be automatically styled with only the essential borders to ensure readability and maintain structure. No need to add extra classes or attributes.

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    #First NameLast NameLanguage
    1SomeOneEnglish
    2JoeSixpackEnglish
    3StuDentCode
    +
    +
    +

    Tables are automatically styled with only the a few borders to ensure readability and maintain structure. No classes are required.

     <table>
   ...
 </table>
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    #First NameLast NameLanguage
    1MarkOttoCSS
    2JacobThorntonJavascript
    3StuDentHTML
    +
    +
    -

    2. Striped table

    -

    Get a little fancy with your tables by adding zebra-striping—just add the .striped-table class.

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    #First NameLast NameLanguage
    1SomeOneEnglish
    2JoeSixpackEnglish
    3StuDentCode
    -

    Note: Zebra-striping is a progressive enhancement not available for older browsers like IE8 and below.

    -
    +  
    
+    
    
+      
    Get a little fancy with your tables by adding zebra-striping—just add the .striped-table class.
    
+      
    Note: Sprited tables use the :nth-child CSS selector and is not available in IE7-IE8.
    
+
     <table class="striped-table">
   ...
 </table>
    
+    
    
+    
    
+      
+        
+          
+            
+            
+            
+            
+          
+        
+        
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+        
+      
    #First NameLast NameLanguage
    1MarkOttoCSS
    2JacobThorntonJavascript
    3StuDentHTML
    
+    
    
+  
    
 
-  
    
 
   
    3. Bordered table
    
-  
    Add borders around the entire table and between each row, plus a bit of rounded corners for aesthetic purposes.
    
-  
-    
-      
-        
-        
-        
-        
-      
-    
-    
-      
-        
-        
-        
-      
-      
-        
-        
-        
-        
-      
-      
-        
-        
-        
-      
-      
-        
-        
-        
-        
-      
-    
-  
    #First NameLast NameLanguage
    1Some OneHTML
    2JoeSixpackJavascript
    3JoeSixpack
    3StuDentCSS
    
+  
    
+    
    
+      
    Add borders around the entire table and rounded corners for aesthetic purposes.
    
 
     <table class="bordered-table">
   ...
 </table>
    
+    
    
+    
    
+      
+        
+          
+            
+            
+            
+            
+          
+        
+        
+          
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+        
+      
    #First NameLast NameLanguage
    1Mark OttoCSS
    2JacobThorntonJavascript
    3StuDent
    3BrosefStalinHTML
    
+    
    
+  
    
 
-  
    
 
   
    4. Condensed table
    
-  
    Make your tables more compact by adding the .condensed-table class to cut table cell padding in half (from 10px to 5px).
    
-  
-    
-      
-        
-        
-        
-        
-      
-    
-    
-      
-        
-        
-        
-        
-      
-      
-        
-        
-        
-        
-      
-      
-        
-        
-        
-        
-      
-    
-  
    #First NameLast NameLanguage
    1SomeOneEnglish
    2JoeSixpackEnglish
    3StuDentCode
    
-
    +  
    
+    
    
+      
    Make your tables more compact by adding the .condensed-table class to cut table cell padding in half (from 10px to 5px).
    
+
     <table class="condensed-table">
   ...
 </table>
    
+    
    
+    
    
+      
+        
+          
+            
+            
+            
+            
+          
+        
+        
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+        
+      
    #First NameLast NameLanguage
    1MarkOttoCSS
    2JacobThorntonJavascript
    3StuDentHTML
    
+    
    
+  
    
+
 
-  
    
 
   
    5. Striped table w/ TableSorter.js
    
-  
    Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via jQuery and the Tablesorter plugin. Click any column’s header to change the sort.
    
-  
-    
-      
-        
-        
-        
-        
-      
-    
-    
-      
-        
-        
-        
-        
-      
-      
-        
-        
-        
-        
-      
-      
-        
-        
-        
-        
-      
-    
-  
    #First NameLast NameLanguage
    1YourOneEnglish
    2JoeSixpackEnglish
    3StuDentCode
    
+  
    
+    
    
+      
    Include the jQuery Tablesorter plugin and automaically get clear styles for sorted columns.
    
 
    -<script src="js/jquery/jquery.tablesorter.min.js"></script>
+<script src="jquery.tablesorter.js"></script>
 <script >
   $(function() {
-    $("table#sortTableExample").tablesorter({ sortList: [[1,0]] });
+    $("table#sortTableExample")
+    .tablesorter({
+      sortList: [[1,0]]
+    });
   });
 </script>
 <table class="striped-table">
   ...
 </table>
    
-
+    
    
+    
    
+      
+        
+          
+            
+            
+            
+            
+          
+        
+        
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+        
+      
    #First NameLast NameLanguage
    1MarkOttoCSS
    2JacobThorntonJavascript
    3StuDentHTML
    4BrosefStalinHTML
    
+      
    Styles for the Tablesorter, zebra striping, borders, and condensing may all compound in any variation to fit your needs.
    
+      
+        
+          
+            
+            
+            
+            
+          
+        
+        
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+        
+      
    #First NameLast NameLanguage
    1MarkOttoCSS
    2JacobThorntonJavascript
    3StuDentHTML
    4BrosefStalinHTML
    
+    
    
+  
    
 
 
 
@@ -1560,7 +1634,7 @@
     
     
-- 
cgit v1.2.3


From b14426c176689c314a339eaaec389c015e3d33ec Mon Sep 17 00:00:00 2001
From: Purwandi 
Date: Sun, 8 Jan 2012 17:44:19 +0700
Subject: Added example sidebar navigation with icon in docs

---
 docs/base-css.html | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index c1cb3fd2d..d764268b4 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1602,11 +1602,12 @@
     
     
    
       
    Or, use them in navigation.
    
-      
    
-        
    
-- 
cgit v1.2.3


From 83c0896999c91f4d85bb75434f4a4ecfaff07fe0 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 8 Jan 2012 21:48:07 -0800
Subject: updated js pages to put examples first

---
 docs/base-css.html | 146 -----------------------------------------------------
 1 file changed, 146 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index c1cb3fd2d..29f5d1d19 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1277,152 +1277,6 @@
 
   
    
 
-  
    Button groups Join buttons for more toolbar-like functionality
    
-  
    
-    
    
-      
    Button groups
    
-      
    Use button groups to join multiple buttons together as one composite component. Build them with a series of <a> or <button> elements.
    
-      
    You can also combine sets of <div class="btn-group"> into a <div class="btn-toolbar"> for more complex projects.
    
-      
    
-        
    
-          Left
-          Middle
-          Right
-        
    
-      
    
-      
    
-        
    
-          
    
-            1
-            2
-            3
-            4
-          
    
-          
    
-            5
-            6
-            7
-          
    
-          
    
-            8
-          
    
-        
    
-      
    
-
-    
    
-    
    
-      
    Example markup
    
-      
    Here's how the HTML looks for a standard button group built with anchor tag buttons:
    
-
    -<div class="btn-group">
-  <a class="btn" href="#">1</a>
-  <a class="btn" href="#">2</a>
-  <a class="btn" href="#">3</a>
-</div>
-
    
-      
    And with a toolbar for multiple groups:
    
-
    -<div class="btn-toolbar">
-  <div class="btn-group">
-    ...
-  </div>
-</div>
-
    
-    
    
-    
    
-      
    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.
    
-      
    Get the javascript »
    
-      
    
-      
    Heads up
    
-      
    CSS for button groups is in a separate file, button-groups.less.
    
-    
    
-  
    
-  
-  
    
-  
    Button dropdowns Built on button groups to provide contextual menus
    
-  
    
-    
    
-      
    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.
    
-      
    
-        
    
-          
    
-            Action
-            
-            
-          
            
-          
    
-            Action
-            
-            
-          
         
-          
    
-            Danger
-            
-            
-          
    
-        
    
-        
    
-          
    
-            Success
-            
-            
-          
    
-          
    
-            Info
-            
-            
-          
    
-        
    
-      
     
-    
    
-    
    
-      
    Example markup
    
-      
    Similar to a button group, our markup uses regular button markup, but with a handful of additions to refine the style and support Bootstrap's dropdown jQuery plugin.
    
-
    -<div class="btn-group">
-  <a class="btn" href="#">Action</a>
-  <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-    <span class="caret"></span>
-  </a>
-  <ul class="dropdown-menu">
-    <!-- dropdown menu links -->
-  </ul>
-</div>
-
    
-    
    
-  
    
 
 
 
-- 
cgit v1.2.3


From 391248c0e3ba9b00b0b4a02e4d94475e9ae9877a Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 12 Jan 2012 15:29:16 -0800
Subject: nuke uber footer, bring back topbar dropdowns

---
 docs/base-css.html | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 65 insertions(+), 5 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 29f5d1d19..7f60580b4 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -34,11 +34,71 @@
           Bootstrap
           
         
    
       
-- 
cgit v1.2.3


From 11be9cd16370ecd15d227917d98ff63eccae68ae Mon Sep 17 00:00:00 2001
From: Purwandi 
Date: Fri, 13 Jan 2012 14:57:21 +0700
Subject: Fix id anchor javascript

---
 docs/base-css.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 7f60580b4..9491f40aa 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -80,13 +80,13 @@
                 
               
               
      
-                
    • Transition
      • 
-                
    • Modal
      • 
-                
    • Dropdown
      • 
+                
    • Transition
      • 
+                
    • Modal
      • 
+                
    • Dropdown
      • 
                 
    • Scrollspy
      • 
-                
    • Tab
      • 
-                
    • Tooltip
      • 
-                
    • Popover
      • 
+                
    • Tab
      • 
+                
    • Tooltip
      • 
+                
    • Popover
      • 
                 
    • Alert
      • 
                 
    • Button
      • 
                 
    • Collapse
      • 
-- 
cgit v1.2.3


From 7b321e9c1fbd5ff124cb190f1375a78b132fb9cb Mon Sep 17 00:00:00 2001
From: Purwandi 
Date: Fri, 13 Jan 2012 15:03:23 +0700
Subject: Remove sidebar with icon from my own repo

---
 docs/base-css.html | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 8d6c56701..9491f40aa 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1516,12 +1516,11 @@
     
     
      
       
      Or, use them in navigation.
      
-      
      
-        
      
-- 
cgit v1.2.3


From a4b107bf879d47db0a6e036814f5aeee4316d36c Mon Sep 17 00:00:00 2001
From: Chris Gunther 
Date: Sat, 14 Jan 2012 15:15:24 -0500
Subject: fix navbar links to scaffolding > grid system

---
 docs/base-css.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 9491f40aa..3ad403ecd 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -40,7 +40,7 @@
                 
               
               
@@ -928,7 +928,7 @@
       
      States like error, warning, and success are included for each type of form control. Also included are styles for disabled controls.
      
     
      
   
-  
+
   
      Four types of forms
      
   
      Bootstrap provides simple markup and styles for four styles of common web forms.
      
   
-- 
cgit v1.2.3


From f82fb2a1976060b2d0b71c3e6ad20f6d7a7772f7 Mon Sep 17 00:00:00 2001
From: Chris Gunther 
Date: Sat, 14 Jan 2012 15:18:59 -0500
Subject: fix navbar links to base CSS > typography

---
 docs/base-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 3ad403ecd..7d06ee5d1 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -51,7 +51,7 @@
                 
               
               
        
-                
      • Type
        • 
+                
      • Typography
        • 
                 
      • Tables
        • 
                 
      • Forms
        • 
                 
      • Buttons
        • 
-- 
cgit v1.2.3


From ec7f8917b1bfa79dee54cd6c5f6cf0074764fce4 Mon Sep 17 00:00:00 2001
From: Chris Gunther 
Date: Sat, 14 Jan 2012 15:24:35 -0500
Subject: add Progress Bars to Components narbar dropdown

---
 docs/base-css.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 7d06ee5d1..79bbaa758 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -72,6 +72,7 @@
                 
      • Pagination
        • 
                 
      • Thumbnails
        • 
                 
      • Alert messages
        • 
+                
      • Progress bars
        • 
               
      
             
             
    • 
-- 
cgit v1.2.3


From 74c0fc17c826d3a16c1b3e45b71138c048f7d630 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 14 Jan 2012 16:56:47 -0800
Subject: fix duplicate icons

---
 docs/base-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 79bbaa758..c851c84e9 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1439,7 +1439,7 @@
         
         
         
-        
+        
         
         
         
-- 
cgit v1.2.3


From dab6d2b17cc2fd67c2462b5a5eb84eb58d9c72bc Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 14 Jan 2012 21:28:47 -0800
Subject: change up classes on tables and forms, fix nav list styles in example

---
 docs/base-css.html | 76 +++++++++++++++++++++++++++---------------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index c851c84e9..ccc2216c6 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -150,7 +150,7 @@
 
   
   
      Emphasis, address, and abbreviation
      
-  
      • 
+  
      
@@ -237,7 +237,7 @@
 
   
      Blockquotes
      
-  
      
     
       
      
         Element
   
      
+  
      
@@ -383,7 +383,7 @@
   
      Code Inline and block
      
-  
      
     
       
      
         Element
 
   
      
+  
      
@@ -425,7 +425,7 @@
 
   
      Inline labels for special attention
      
-  
      
     
       
      
         Element
   
      
+  
      
@@ -490,7 +490,7 @@
   
      Table markup
      
     
      
-      
      
     
       
      
         Labels
   
      
+      
      
@@ -579,7 +579,7 @@
   
      Table options
      
-  
      
         
           
      
             Tag
 
   
      
+  
      
@@ -596,21 +596,21 @@
       
@@ -667,15 +667,15 @@
   
      2. Striped table
      
     
      
-      
      Get a little fancy with your tables by adding zebra-striping—just add the .striped-table class.
      
+      
      Get a little fancy with your tables by adding zebra-striping—just add the .table-striped class.
      
       
      Note: Sprited tables use the :nth-child CSS selector and is not available in IE7-IE8.
      
 
      -<table class="striped-table">
+<table class="table-striped">
   ...
 </table>
      
     
      
     
      
-      
      
   
       
      
         Name
      
         Bordered
         
-          .bordered-table
+          .table-bordered
         
         Rounds corners and adds outter border
       
      
       
      
         Zebra-stripe
         
-          .striped-table
+          .table-striped
         
         Adds light gray background color to odd rows (1, 3, 5, etc)
       
      
       
      
         Condensed
         
-          .condensed-table
+          .table-condensed
         
         Cuts vertical padding in half, from 8px to 4px, within all td and th elements
       
      
   
      
+      
      
@@ -714,12 +714,12 @@
     
      
       
      Add borders around the entire table and rounded corners for aesthetic purposes.
      
 
      -<table class="bordered-table">
+<table class="table-bordered">
   ...
 </table>
      
     
      
-      
      
         
           
      
             #
     
      
+      
      
@@ -760,14 +760,14 @@
   
      4. Condensed table
      
     
      
-      
      Make your tables more compact by adding the .condensed-table class to cut table cell padding in half (from 10px to 5px).
      
+      
      Make your tables more compact by adding the .table-condensed class to cut table cell padding in half (from 10px to 5px).
      
 
      -<table class="condensed-table">
+<table class="table-condensed">
   ...
 </table>
      
     
      
     
      
-      
      
         
           
      
             #
   
      
+      
      
@@ -816,12 +816,12 @@
     });
   });
 </script>
-<table class="striped-table">
+<table class="table-striped">
   ...
 </table>
      
-      
      
         
           
      
             #
     
     
      
+      
      
@@ -858,7 +858,7 @@
         
      
         
           
      
             #
       
      
       
      Styles for the Tablesorter, zebra striping, borders, and condensing may all compound in any variation to fit your needs.
      
-      
+      
      
@@ -932,7 +932,7 @@
 
   
      Four types of forms
      Bootstrap provides simple markup and styles for four styles of common web forms.
      
-  
      
         
           
      
             #
   
      
+  
      
@@ -948,17 +948,17 @@
       
-        
+        
-        
+        
-        
+        
@@ -981,16 +981,16 @@
     
      
       
      Search form
      
-      
      Reflecting default WebKit styles, just add .search-form for extra rounded search fields.
      
-      
+      
      Reflecting default WebKit styles, just add .form-search for extra rounded search fields.
      
+      
         
         
       
     
      
       
      Inline form
      
-      
      Inputs are block level to start. For .inline-form and .horizontal-form, we use inline-block.
      
-      
      
+      
      Inputs are block level to start. For .form-inline and .form-horizontal, we use inline-block.
      
+      
         
         
         
@@ -1003,7 +1003,7 @@
   
      Horizontal forms
      
   
      
     
      
-      
+      
         Controls Bootstrap supports
         
      
           
@@ -1087,7 +1087,7 @@
 
   
      
     
      
-      
+      
         Form control states
         
      
           
@@ -1158,7 +1158,7 @@
 
   
      
     
      
-      
+      
         Extending form controls
         
      
           
@@ -1259,7 +1259,7 @@
   
      
     
      Buttons
      
   
      
-  
      
     
       
      
         Name
      
       
      
         Horizontal.horizontal-form.form-horizontal
         Float left, right-aligned labels on same line as controls
       
      
       
      
         Inline.inline-form.form-inline
         Left-aligned label and inline-block controls for compact style
       
      
       
      
         Search.search-form.form-search
         Extra-rounded text input for a typical search aesthetic
       
      
     
     
     
      
+  
      
@@ -1517,13 +1517,13 @@
     
      
       
      Or, use them in navigation.
      
-      
      
-        
       
     
      
-- 
cgit v1.2.3


From b4dd2b9a10a9313bbe0863b9da279e212f8d230d Mon Sep 17 00:00:00 2001
From: Jon Stevens 
Date: Sun, 15 Jan 2012 19:38:30 -0800
Subject: fix typo

---
 docs/base-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index ccc2216c6..99a4efe3a 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -623,7 +623,7 @@
   
      1. Default table styles
      
   
      
     
      
-      
      Tables are automatically styled with only the a few borders to ensure readability and maintain structure. No classes are required.
      
+      
      Tables are automatically styled with only a few borders to ensure readability and maintain structure. No classes are required.
      
 
       <table>
   ...
-- 
cgit v1.2.3


From f1a88eede391cbb4beaadce60768a351724d7633 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 16 Jan 2012 17:27:30 -0800
Subject: fix js link in docs nav, restyle accordion with new css

---
 docs/base-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index ccc2216c6..3ba3e4525 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -81,7 +81,7 @@
                 
               
               
        
-                
      • Transition
        • 
+                
      • Overview
        • 
                 
      • Modal
        • 
                 
      • Dropdown
        • 
                 
      • Scrollspy
        • 
-- 
cgit v1.2.3


From 47b8184bbb5784eb373ffbb905c8a1756eba3c6d Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 17 Jan 2012 23:39:18 -0800
Subject: scope table styles to a class, .table, instead of on the generic
 element as a smarter default

---
 docs/base-css.html | 47 +++++++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 20 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 1d64a5787..fa60204a8 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -150,7 +150,7 @@
 
   
   
        Emphasis, address, and abbreviation
        
-  
      
     
       
      
         Button
     
   
 
      
+  
      
@@ -237,7 +237,7 @@
 
   
      Blockquotes
      
-  
      
     
       
      
         Element
   
      
+  
      
@@ -383,7 +383,7 @@
   
      Code Inline and block
      
-  
      
     
       
      
         Element
 
   
      
+  
      
@@ -425,7 +425,7 @@
 
   
      Inline labels for special attention
      
-  
      
     
       
      
         Element
   
      
+  
      
@@ -490,7 +490,7 @@
   
      Table markup
      
     
      
-      
      
     
       
      
         Labels
   
      
+      
      
@@ -579,7 +579,7 @@
   
      Table options
      
-  
      
         
           
      
             Tag
 
   
      
+  
      
@@ -591,6 +591,13 @@
       
+        
+      
+      
+        
+        
@@ -623,14 +630,14 @@
   
      1. Default table styles
      
     
      
-      
      Tables are automatically styled with only a few borders to ensure readability and maintain structure. No classes are required.
      
+      
      Tables are automatically styled with only a few borders to ensure readability and maintain structure. With 2.0, the .table class is required.
      
 
      -<table>
+<table class="table">
   ...
 </table>
      
     
      
     
      
-      
      
   
       
      
         Name
      
         Default
         NoneNo styles, just columns and rows
      Basic
+          .table
+        
         Only horizontal lines between rows
       
      
       
      
   
      
+      
      
@@ -670,12 +677,12 @@
       
      Get a little fancy with your tables by adding zebra-striping—just add the .table-striped class.
      Note: Sprited tables use the :nth-child CSS selector and is not available in IE7-IE8.
      -<table class="table-striped">
+<table class="table table-striped">
   ...
 </table>
      
-      
      
         
           
      
             #
       
 
     
     
      
+      
      
@@ -714,12 +721,12 @@
     
      
       
      Add borders around the entire table and rounded corners for aesthetic purposes.
      
 
      -<table class="table-bordered">
+<table class="table table-bordered">
   ...
 </table>
      
     
      
-      
      
         
           
      
             #
     
      
+      
      
@@ -762,12 +769,12 @@
     
      
       
      Make your tables more compact by adding the .table-condensed class to cut table cell padding in half (from 10px to 5px).
      
 
      -<table class="table-condensed">
+<table class="table table-condensed">
   ...
 </table>
      
     
      
-      
      
         
           
      
             #
     
      
+      
      
@@ -816,12 +823,12 @@
     });
   });
 </script>
-<table class="table-striped">
+<table class="table table-striped">
   ...
 </table>
      
-      
      
         
           
      
             #
     
     
      
+      
      
@@ -858,7 +865,7 @@
         
      
         
           
      
             #
       
      
       
      Styles for the Tablesorter, zebra striping, borders, and condensing may all compound in any variation to fit your needs.
      
-      
+      
      
@@ -932,7 +939,7 @@
 
   
      Four types of forms
      Bootstrap provides simple markup and styles for four styles of common web forms.
      
-  
      
         
           
      
             #
   
      
+  
      
@@ -1259,7 +1266,7 @@
   
      
     
      Buttons
      
   
      
-  
      
     
       
      
         Name
      
+  
      
-- 
cgit v1.2.3


From 155b72e8730e9b8badb5fa80c8d7f8990f10cc82 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sun, 22 Jan 2012 20:02:56 -0800
Subject: share -> share-alt

---
 docs/base-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index fa60204a8..8ac913477 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1458,7 +1458,7 @@
         
         
         
-        
+        
         
         
         
-- 
cgit v1.2.3


From a7bf0295fbf3ce9abc1ca44680f4a6eaf17339b5 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 23 Jan 2012 11:55:04 -0800
Subject: remove dropdowns, add in sub nav instead

---
 docs/base-css.html | 76 ++++++++++++------------------------------------------
 1 file changed, 16 insertions(+), 60 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 8ac913477..df0c9c7ce 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -34,71 +34,20 @@
           Bootstrap
           
         
@@ -112,6 +61,13 @@
       
      
         
      Base CSS
      
         
      On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.
      
+        
       
      
 
 
-- 
cgit v1.2.3


From f764aee4b919c28974dba7b91edac9a04172ba25 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Mon, 23 Jan 2012 14:14:16 -0800
Subject: add templates for doc generation

---
 docs/base-css.html | 61 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 33 insertions(+), 28 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 8ac913477..a3e8cc85a 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -7,7 +7,7 @@
     
     
 
-    
+    
     
@@ -18,10 +18,11 @@
     
 
     
-    
-    
-    
-    
+    
+    
+    
+    
+
   
 
   
@@ -33,8 +34,8 @@
         
      
           Bootstrap
           
             
-            
    • 
+            
    • 
               
                 Components
                 
@@ -75,7 +76,7 @@
                 
    • Progress bars
      • 
               
             
-            
    • 
+            
    • 
               
                 Javascript plugins
                 
@@ -95,7 +96,7 @@
                 
    • Typeahead
      • 
               
             
-            
    • 
+            
    • 
               
                 Using LESS
               
@@ -107,12 +108,12 @@
 
     
      
 
-      
-      
      
-        
      Base CSS
      
-        
      On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.
      
-      
      
+
+
      
+  
      Base CSS
      
+  
      On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.
      
+
      
 
 
 
       
+
     
      
 
+
     
     
-    
-    
+    
+    
     
-    
+    
+    
+    
     
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
   
 
-- 
cgit v1.2.3


From b4b1ef68398b68dcdfa29465d06cd76d6bf2c49d Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Mon, 23 Jan 2012 15:17:32 -0800
Subject: rebuild with new templates

---
 docs/base-css.html | 95 +++++++++---------------------------------------------
 1 file changed, 15 insertions(+), 80 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index a869eecf8..91cb4ec70 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -27,86 +27,30 @@
 
   
 
-    
     
      
       
      
         
      
           Bootstrap
           
         
      
@@ -115,28 +59,19 @@
 
     
      
 
-<<<<<<< HEAD
 
 
      
   
      Base CSS
      
   
      On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.
      
+  
 
      
-=======
-      
-      
      
-        
      Base CSS
      
-        
      On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.
      
-        
-      
      
->>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
 
 
 
       
      
         
      Back to top
      
-- 
cgit v1.2.3


From 82de03b67cf729291ea5a73741e44838a42940f8 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Mon, 23 Jan 2012 19:55:00 -0800
Subject: start wrapping text in {{_i}} for translation

---
 docs/base-css.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 91cb4ec70..6485d76a2 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -22,11 +22,10 @@
     
     
     
-
   
 
   
-
+  
   
     
      
-- 
cgit v1.2.3


From 91b32f47838d1da117998cee3ffa2ec5e5cd905c Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Tue, 24 Jan 2012 12:12:35 -0500
Subject: Fixes apostrophe usage in base-css.html

---
 docs/base-css.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index df0c9c7ce..ec749894f 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -364,7 +364,7 @@
       
      • 
@@ -369,11 +369,11 @@
           
      Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.
      <div>
   <h1>Heading</h1>
-  <p>Something right here...</p>
+  <p>Something right here…</p>
 </div>
      <div>
   <h1>Heading</h1>
-  <p>Something right here...</p>
+  <p>Something right here…</p>
 </div>
      Download google-code-prettify and view the readme for how to use.
      
@@ -521,14 +521,14 @@
 <table>
   <thead>
     <tr>
-      <th>...</th>
-      <th>...</th>
+      <th>…</th>
+      <th>…</th>
     </tr>
   </thead>
   <tbody>
     <tr>
-      <td>...</td>
-      <td>...</td>
+      <td>…</td>
+      <td>…</td>
     </tr>
   </tbody>
 </table>
@@ -591,7 +591,7 @@
       
      Tables are automatically styled with only a few borders to ensure readability and maintain structure. With 2.0, the .table class is required.
       <table class="table">
-  ...
+  …
 </table>
      
@@ -636,7 +636,7 @@
       
      Note: Sprited tables use the :nth-child CSS selector and is not available in IE7-IE8.
      
 
       <table class="table table-striped">
-  ...
+  …
 </table>
      
     
      
@@ -680,7 +680,7 @@
       
      Add borders around the entire table and rounded corners for aesthetic purposes.
      
 
       <table class="table table-bordered">
-  ...
+  …
 </table>
      
     
      
@@ -725,10 +725,10 @@
   
      4. Condensed table
      
   
      
     
      
-      
      Make your tables more compact by adding the .table-condensed class to cut table cell padding in half (from 10px to 5px).
      
+      
      Make your tables more compact by adding the .table-condensed class to cut table cell padding in half (from 8px to 4px).
      
 
       <table class="table table-condensed">
-  ...
+  …
 </table>
      
     
      
     
      
@@ -770,7 +770,7 @@
   
      5. Striped table w/ TableSorter.js
      
   
      
     
      
-      
      Include the jQuery Tablesorter plugin and automaically get clear styles for sorted columns.
      
+      
      Include the jQuery Tablesorter plugin and automatically get clear styles for sorted columns.
      
 
       <script src="jquery.tablesorter.js"></script>
 <script >
@@ -782,7 +782,7 @@
   });
 </script>
 <table class="table table-striped">
-  ...
+  …
 </table>
      
     
      
     
      
@@ -937,7 +937,7 @@
       
      With v2.0, we have lighter and smarter defaults for form styles. No extra markup, just form controls.
      
       
         
-        
+        
         
@@ -1057,13 +1057,13 @@
         
      
           
           
      
-            
+            
           
      
         
      
         
      
           
           
      
-            
+            
           
      
         
      
         
      
@@ -1112,7 +1112,7 @@
 
       <fieldset
   class="control-group error">
-  ...
+  …
 </fieldset>
 
      
       
      
@@ -1296,7 +1296,8 @@
         Action
       
      
       
      
-         
+        
+        
       
      
     
      
   
      
-- 
cgit v1.2.3


From b9bd5c65e76eea140b0121d5cbca00c43f3ae018 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 24 Jan 2012 16:18:12 -0800
Subject: fix mailto link

---
 docs/base-css.html | 60 +++++++-----------------------------------------------
 1 file changed, 7 insertions(+), 53 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 92117b80e..bcb0c7d21 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -181,7 +181,7 @@
       
       
      
         Full Name
      
-        first.last@gmail.com
+        first.last@gmail.com
       
      
     
      
     
      
@@ -767,63 +767,17 @@
 
 
 
-  
      5. Striped table w/ TableSorter.js
      
+  
      5. Combine them all!
      
   
      
     
      
-      
      Include the jQuery Tablesorter plugin and automatically get clear styles for sorted columns.
      
-
      -<script src="jquery.tablesorter.js"></script>
-<script >
-  $(function() {
-    $("table#sortTableExample")
-    .tablesorter({
-      sortList: [[1,0]]
-    });
-  });
-</script>
-<table class="table table-striped">
-  …
+      
      Feel free to combine any of the table classes to achieve different looks by utilizing any of the available classes.
      
+
      +<table class="table table-striped table-bordered table-condensed">
+  ...
 </table>
      
     
      
     
      
-      
      
     
       
      
         Button
      
         <pre class="prettyprint">
         
-          
      Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.
      
+          
      Using the google-code-prettify library, your blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.
      
 
      <div>
   <h1>Heading</h1>
   <p>Something right here...</p>
@@ -1103,7 +1103,7 @@
     
      
       
      
         
      Redesigned browser states
      
-        
      Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in it's place for :focus.
      
+        
      Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in its place for :focus.
      
         
      
         
      Form validation
      
         
      It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding .control-group.
      
-- 
cgit v1.2.3


From 7d52e1dcd479e017d85fee8df4032644970525bd Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Tue, 24 Jan 2012 13:47:24 -0800
Subject: remake

---
 docs/base-css.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index f21f25f6b..6485d76a2 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -366,7 +366,7 @@
       
      
         <pre class="prettyprint">
         
-          
      Using the google-code-prettify library, your blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.
      
+          
      Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.
      
 
      <div>
   <h1>Heading</h1>
   <p>Something right here...</p>
@@ -1105,7 +1105,7 @@
     
      
       
      
         
      Redesigned browser states
      
-        
      Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in its place for :focus.
      
+        
      Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in it's place for :focus.
      
         
      
         
      Form validation
      
         
      It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding .control-group.
      
-- 
cgit v1.2.3


From 3aea86370d7d6c717939eebcd6f3a93776c567d4 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Tue, 24 Jan 2012 13:48:05 -0800
Subject: rebuild base-css

---
 docs/base-css.html | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 6485d76a2..92117b80e 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -358,7 +358,7 @@
         
      		
 
      <div>
   <h1>Heading</h1>
-  <p>Something right here...</p>
+  <p>Something right here…</p>
 </div>
      
           
      Note: Be sure to keep code within <pre> tags as close to the left as possible; it will render all tabs.
      
               		
 
 
           
         
 
     
     
     
     
      
-        
-          
-            
-            
-            
-            
-          
-        
-        
-          
-            
-            
-            
-            
-          
-          
-            
-            
-            
-            
-          
-          
-            
-            
-            
-            
-          
-          
-            
-            
-            
-            
-          
-        
-      
      #First NameLast NameLanguage
      1MarkOttoCSS
      2JacobThorntonJavascript
      3StuDentHTML
      4BrosefStalinHTML
      
-      
      Styles for the Tablesorter, zebra striping, borders, and condensing may all compound in any variation to fit your needs.
      
-      
+      
      
-- 
cgit v1.2.3


From 672ba4c2fd9a42d4f178e795ebc162cce81bbc2f Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 24 Jan 2012 19:19:50 -0800
Subject: update the subnav on all pages

---
 docs/base-css.html | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index bcb0c7d21..c849a299e 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -63,13 +63,15 @@
 
      
   
      Base CSS
      
   
      On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.
      
-  
+  
      
+    
+  
      
 
      
 
 
-- 
cgit v1.2.3


From bacb05608f2d42ef7fdb6fa25241d4268b989387 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 24 Jan 2012 19:43:52 -0800
Subject: redo the form examples to enable better responsive layout

---
 docs/base-css.html | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index c849a299e..27251d824 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -887,10 +887,12 @@
 
 
   
      Example forms using just form controls, no extra markup
      
+  
      Basic form
      
   
      
-    
      
-      
      Basic form
      
+    
      
       
      With v2.0, we have lighter and smarter defaults for form styles. No extra markup, just form controls.
      
+    
      
+    
      
       
         
         
@@ -900,17 +902,25 @@
         
       
     
      
-    
      
-      
      Search form
      
+  
       
+  
      Search form
      
+  
      
+    
      
       
      Reflecting default WebKit styles, just add .form-search for extra rounded search fields.
      
+    
      
+    
      
       
      
         
         
       
     
      
-    
      
-      
      Inline form
      
+  
       
+  
      Inline form
      
+  
      
+    
      
       
      Inputs are block level to start. For .form-inline and .form-horizontal, we use inline-block.
      
+    
      
+    
      
       
      
         
         
-- 
cgit v1.2.3


From 74b5dc8d3bd5ef34bb2cdc590b8a5dcbc43a8f4c Mon Sep 17 00:00:00 2001
From: Roberto Poo 
Date: Wed, 25 Jan 2012 02:06:50 -0200
Subject: Fixed typo

---
 docs/base-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index c849a299e..8d0ab86f9 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -368,7 +368,7 @@
       
      
-        
+        
-- 
cgit v1.2.3


From 25519bacd56ee2507cdde727d85458e5e5ef7949 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Wed, 25 Jan 2012 11:25:35 -0800
Subject: rebuild + add spy to template

---
 docs/base-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 1a9c4e15a..b0a6743f3 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -25,7 +25,7 @@
     
   
 
-  
+  
   
   
-- 
cgit v1.2.3


From b8511568637dfa4decb3f0475436a3dfa637a57d Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 11:26:45 -0800
Subject: change form fields back to inline-block to allow for inline-help text
 in default form markup

---
 docs/base-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 1a9c4e15a..057c98b85 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -899,7 +899,7 @@
     
      
       
         
-        
+         Associated help text!
         
-- 
cgit v1.2.3


From 58d08a2db3e2ed1b789a5290ced2f0327c9c163b Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 11:35:08 -0800
Subject: enable support for form states on select elements

---
 docs/base-css.html | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index a8a87da42..1e9a3d942 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1066,6 +1066,19 @@
             Woohoo!
           
      
         
+        
      
+          
+          
      
+            
+            Woohoo!
+          
      
+        
      
         
      
           
           
-- 
cgit v1.2.3


From 9c4a70c597a35f772bb21cb60dd7812146fc29ee Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 12:43:38 -0800
Subject: swap fieldsets for divs

---
 docs/base-css.html | 88 +++++++++++++++++++++++++++---------------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 1e9a3d942..60b5640df 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -940,14 +940,14 @@
     
      
       
         Controls Bootstrap supports
-        
      
+        
      
           
           
      
             
             
      In addition to freeform text, any HTML5 text-based input appears like so.
      
           
      
-        
      
-        
      
+        
      
+        
      
           
           
      
             
           
      
-        
      
-        
      
+        
+        
      
           
           
      
             
           
      
-        
      
-        
      
+        
+        
      
           
           
      
             
           
      
-        
      
-        
      
+        
+        
      
           
           
      
             
           
      
-        
      
-        
      
+        
+        
      
           
           
      
             
           
      
-        
      
-        
      
+        
+        
      
           
           
-        
      
+        
       
     
     
      
@@ -1024,19 +1024,19 @@
     
      
       
      
         Form control states
-        
      
+        
      
           
           
      
             
           
      
-        
      
-        
      
+        
      
+        
      
           
           
      
             
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
             Something may have gone wrong
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
             Please correct the error
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
             Woohoo!
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
             Woohoo!
           
      
-        
-        
      
+        
      
+        
      
           
           
-        
+        
      
       
     
      
     
      
@@ -1108,7 +1108,7 @@
     
      
       
      
         Extending form controls
-        
      
+        
      
           
           
      
             
@@ -1116,8 +1116,8 @@
             
             
      Use the same .span* classes from the grid system for input sizes.
      
           
      
-        
      
-        
      
+        
      
+        
      
           
           
      
             
      
@@ -1126,8 +1126,8 @@
             
      
             
      Here's some help text
      
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
      
@@ -1136,8 +1136,8 @@
             
      
             
      Here's more help text
      
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
             
      Note: Labels surround all the options for much larger click areas and a more usable form.
      
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
           
      
-        
-        
      
+        
      
+        
      
           
           
-        
+        
      
       
     
      
     
      
-- 
cgit v1.2.3


From 4ea63e5261ba0c10e2b729e2216105896108733b Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 13:33:55 -0800
Subject: finish off the static stuff for build and download page

---
 docs/base-css.html | 252 +++++++++++++++++++++++++++--------------------------
 1 file changed, 128 insertions(+), 124 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 60b5640df..8340e0f60 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1023,66 +1023,68 @@
   
      
     
      
       
      
-        Form control states
-        
      
-          
-          
      
-            
+        
      
+          Form control states
+          
      
+            
+            
      
+              
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
+          
      
+            
+            
      
+              
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
+          
      
+            
+            
      
+              
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
-            Something may have gone wrong
+          
      
+            
+            
      
+              
+              Something may have gone wrong
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
-            Please correct the error
+          
      
+            
+            
      
+              
+              Please correct the error
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
-            Woohoo!
+          
      
+            
+            
      
+              
+              Woohoo!
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
-            Woohoo!
+          
      
+            
+            
      
+              
+              Woohoo!
+            
      
           
      
-        
      
-        
      
-          
-          
-        
      
+          
      
+            
+            
+          
      
+        
       
     
      
     
      
@@ -1107,85 +1109,87 @@
   
      
     
      
       
      
-        Extending form controls
-        
      
-          
-          
      
-            
-            
-            
-            
      Use the same .span* classes from the grid system for input sizes.
      
+        
      
+          Extending form controls
+          
      
+            
+            
      
+              
+              
+              
+              
      Use the same .span* classes from the grid system for input sizes.
      
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
      
-              @
-              
+          
      
+            
+            
      
+              
      
+                @
+                
+              
      
+              
      Here's some help text
      
             
      
-            
      Here's some help text
      
           
      
-        
      
-        
      
-          
-          
      
-            
      
-              
-              .00
+          
      
+            
+            
      
+              
      
+                
+                .00
+              
      
+              
      Here's more help text
      
             
      
-            
      Here's more help text
      
           
      
-        
      
-        
      
-          
-          
      
-            
-            
-            
+          
      
+            
+            
      
+              
+              
+              
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
-            
-            
-            
      Note: Labels surround all the options for much larger click areas and a more usable form.
      
+          
      
+            
+            
      
+              
+              
+              
+              
      Note: Labels surround all the options for much larger click areas and a more usable form.
      
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
-            
+          
      
+            
+            
      
+              
+              
+            
      
           
      
-        
      
-        
      
-          
-          
-        
      
+          
      
+            
+            
+          
      
+        
       
     
      
     
      
-- 
cgit v1.2.3


From 94ea3b62f09c840db5efe5e48815d011ca7e43d1 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 21:28:24 -0800
Subject: fix forms examples and allow for inputs in labels

---
 docs/base-css.html | 104 +++++++++++++++++++++++++++--------------------------
 1 file changed, 53 insertions(+), 51 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 8340e0f60..a2eff98ee 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -939,63 +939,65 @@
   
      
     
      
       
      
-        Controls Bootstrap supports
-        
      
-          
-          
      
-            
-            
      In addition to freeform text, any HTML5 text-based input appears like so.
      
+        
      
+          Controls Bootstrap supports
+          
      
+            
+            
      
+              
+              
      In addition to freeform text, any HTML5 text-based input appears like so.
      
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
+          
      
+            
+            
      
+              
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
+          
      
+            
+            
      
+              
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
+          
      
+            
+            
      
+              
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
+          
      
+            
+            
      
+              
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
+          
      
+            
+            
      
+              
+            
      
           
      
-        
      
-        
      
-          
-          
-        
      
+          
      
+            
+            
+          
      
+        
       
     
      
     
      
-- 
cgit v1.2.3


From 0ef4b6419fd83170dd62049a2850c5e8466635c9 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 10:00:09 -0800
Subject: overhaul frontpage jumbotron, add js for twitter buttons back in, fix
 up some form ids and classes, straighten out the use of primary button
 variable

---
 docs/base-css.html | 66 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index a2eff98ee..bbe7ecd88 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -27,6 +27,7 @@
 
   
   
+  
   
     
      
@@ -944,7 +945,7 @@
           
      
             
             
      
-              
+              
               
      In addition to freeform text, any HTML5 text-based input appears like so.
      
             
      
           
      
@@ -952,7 +953,7 @@
             
             
      
               
             
      
@@ -960,7 +961,7 @@
           
      
             
             
      
-              
                 
                 
                 
@@ -972,7 +973,7 @@
           
      
             
             
      
-              
                 
                 
                 
@@ -984,13 +985,13 @@
           
      
             
             
      
-              
+              
             
      
           
      
           
      
             
             
      
-              
+              
             
      
           
      
           
      
@@ -1030,20 +1031,20 @@
           
      
             
             
      
-              
+              
             
      
           
      
           
      
             
             
      
-              
+              
             
      
           
      
           
      
-            
+            
             
      
               
             
      
@@ -1051,28 +1052,28 @@
           
      
             
             
      
-              
+              
               Something may have gone wrong
             
      
           
      
           
      
             
             
      
-              
+              
               Please correct the error
             
      
           
      
           
      
             
             
      
-              
+              
               Woohoo!
             
      
           
      
           
      
             
             
      
-              
                 
                 
                 
@@ -1116,9 +1117,9 @@
           
      
             
             
      
-              
-              
-              
+              
+              
+              
               
      Use the same .span* classes from the grid system for input sizes.
      
             
      
           
      
@@ -1127,7 +1128,7 @@
             
      
               
      
                 @
-                
+                
               
      
               
      Here's some help text
      
             
      
@@ -1136,7 +1137,7 @@
             
             
      
               
      
-                
+                
                 .00
               
      
               
      Here's more help text
      
@@ -1146,43 +1147,43 @@
             
             
      
               
               
               
             
      
           
      
           
      
-            
+            
             
      
               
               
               
               
      Note: Labels surround all the options for much larger click areas and a more usable form.
      
             
      
           
      
           
      
-            
+            
             
      
               
               
             
      
@@ -1482,6 +1483,7 @@
     
      
   
      
 
+
      
       
      
@@ -1494,9 +1496,11 @@
     
      
 
 
-    
+
+    
     
-    
+    
     
     
     
-- 
cgit v1.2.3


From edef89f30efd73e5fca9952eef48136f8264aa93 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 11:10:07 -0800
Subject: move around some comments in buttons.less, update labels to use
 correct variables, add snippet to docs about IE9

---
 docs/base-css.html | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index bbe7ecd88..ebc6285dc 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -432,10 +432,10 @@
       
      
@@ -1210,6 +1210,8 @@
 
 
 
+
      
   
      
     
      Buttons
      
@@ -1278,9 +1280,9 @@
         Action
       
      
     
      
-    
      
+    
      
       
      Disabled state
      
-      
      For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s .disabled for links and :disabled for <button> elements.
      
+      
      For disabled buttons, use .disabled for links and :disabled for <button> elements.
      
       
      
         Primary action
         Action
@@ -1290,6 +1292,11 @@
         
       
      
     
      
+    
      
+      
      Cross browser compatibility
      
+      
      In IE9, we drop the gradient on all buttons in favor of rounded corners as IE9 doesn't crop background gradients to the corners.
      
+      
      Related, IE9 jankifies disabled button elements, rendering text gray with a nasty text-shadow—unfortunately we can't fix this.
      
+    
      
   
      
 
   
      
-- 
cgit v1.2.3


From b260544de02788bc921c4c713df0f754d96c5a27 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 15:54:04 -0800
Subject: fix links to apple touch icons

---
 docs/base-css.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index ebc6285dc..239b963c4 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -20,9 +20,9 @@
 
     
     
-    
-    
-    
+    
+    
+    
   
 
   
@@ -962,7 +962,7 @@
             
             
      
               
             
      
           
+          
      
+            
+            
      
+              Some value here
+            
      
+          
      
           
      
             
             
      
@@ -1491,6 +1497,7 @@
   
      
 
      
 
+
      
      
-- 
cgit v1.2.3


From 3807a88ee9ba33f27bc8762efd789f7ff710ed1a Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 27 Jan 2012 13:56:50 -0800
Subject: update the docs for icons

---
 docs/base-css.html | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index fa22216ef..698b68ea1 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1454,7 +1454,7 @@
     
   
   
      
-    Heads up! On hover we show a light red background color to highlight the size of the icon. This won't appear in normal usage of icons.
+    Heads up! Icon classes are echoed via CSS :after and on hover in the docs we show a light red background color show the icon's size.
   
      
 
   
      
@@ -1470,6 +1470,10 @@
       
      With v2.0.0, we have opted to use an <i> tag for all our icons with a base class of .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:
      
+
      +<i class="icon white search"></i>
 
      
       
      There are 120 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.
      
     
@@ -1488,10 +1492,11 @@
 
   
      Examples
      
   
      
-    
      
+    
      
       
      Use them in buttons, or in button groups for a toolbar style presentation.
      
       
      
          Refresh
+         Checkout
          Delete
       
      
       
      
-- 
cgit v1.2.3


From a2a10ae4211f0cdba5fe54417d267e3ba3b63705 Mon Sep 17 00:00:00 2001
From: Burak Tuyan 
Date: Sat, 28 Jan 2012 02:13:53 +0200
Subject: Adding new examples to the icons' docs.

- Button with dropdown menu.
- Small info button.
- Text alignment for navigation with no icon.
- Text input form with prepended icon
- Select input form with prepended icon
---
 docs/base-css.html | 73 +++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 56 insertions(+), 17 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 698b68ea1..7c7ab48ef 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1482,51 +1482,90 @@
       
      Icons are great, but where would one use them? Here are a few ideas:
      
       
        
         
      • As visuals for your sidebar navigation
        • 
-        
      • For a purely icon-driven nav
        • 
+        
      • For a purely icon-driven navigation
        • 
         
      • For buttons to help convey the meaning of an action
        • 
         
      • With links to share context on a user's destination
        • 
       
      
-      
      Essentially, anywhere you can put an <i> tag, you can put an icon.
      
+      
      Essentially, anywhere you can put an <i> tag, you can put an icon. And if you need to position the text with no icon before it (where other items have an icon; see the navigation example below) simply use .icon class with no other classes:
      
+
      +<i class="icon"></i>
+
      
     
      
   
      
 
   
      Examples
      
   
      
-    
      
-      
      Use them in buttons, or in button groups for a toolbar style presentation.
      
-      
      
-         Refresh
-         Checkout
-         Delete
-      
      
+    
      
+      
      Use them in buttons - of all types and sizes.
      
       
      
-        
      
-          
-          
-          
-        
      
         
      
           
           
           
           
         
      
+        
      
+           User
+          
+          
+        
      
       
      
       
      
-         Refresh
+         Refresh
+         Checkout
+         Delete
+      
      
+      
      
+         Comment
          Settings
+         More Info
       
      
     
      
-    
      
-      
      Or, use them in navigation.
      
+    
      
+      
      Use them in navigation.
      
       
      
         
       
       
     
      
+    
      
+      
      
+        
      Use them with prepended forms.
      
+        
      
+          
+          
      
+            
      
+              
+              
+            
      
+          
      
+        
      
+        
      
+          
+          
      
+            
      
+              
+              
+            
      
+          
      
+        
      
+      
+    
      
   
      
 
 
-- 
cgit v1.2.3


From d02c6957d44761c35121cb88af727802ce4d9e5e Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 27 Jan 2012 19:49:56 -0800
Subject: fixing up buttons and examples of implementing icons

---
 docs/base-css.html | 29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 0c6579b1e..7552fb9b9 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1492,18 +1492,15 @@
         
    • For buttons to help convey the meaning of an action
      • 
         
    • With links to share context on a user's destination
      • 
       
-      
      Essentially, anywhere you can put an <i> tag, you can put an icon. And if you need to position the text with no icon before it (where other items have an icon; see the navigation example below) simply use .icon class with no other classes:
      
-
      -<i class="icon"></i>
-
      
+      
      Essentially, anywhere you can put an <i> tag, you can put an icon.
      
     
      
   
      
 
   
      Examples
      
+  
      Use them in buttons, button groups for a toolbar, navigation, or prepended form inputs.
      
   
      
     
      
-      
      Use them in buttons - of all types and sizes.
      
-      
      
+      
      
         
      
           
           
@@ -1518,7 +1515,7 @@
             
    •  Delete
      • 
             
    •  Ban
      • 
             
    • 
-            
    •  Make Admin
      • 
+            
    •  Make admin
      • 
           
         
      
       
      
@@ -1534,7 +1531,6 @@
       
      
     
      
     
      
-      
      Use them in navigation.
      
       
      
         
        
           
      •  Home
        • 
@@ -1546,9 +1542,8 @@
     
      
     
      
       
      
-        
      Use them with prepended forms.
      
         
      
-          
+          
           
      
             
      
               
@@ -1556,20 +1551,6 @@
             
      
           
      
         
      
-        
      
-          
-          
      
-            
      
-              
-              
-            
      
-          
      
-        
      
       
     
      
   
      
-- 
cgit v1.2.3


From cb8606f2c84adb57c82dd7bd401574a2376ff952 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 27 Jan 2012 22:52:45 -0800
Subject: adding wells and close icon to the docs under misc in components,
 with a new subnav style

---
 docs/base-css.html | 53 -----------------------------------------------------
 1 file changed, 53 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 7552fb9b9..167cb5e69 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -388,59 +388,6 @@
     
   
      
         
           
      
             #
      
         <pre class="prettyprint">
         
-          
      Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.
      
+          
      Using the google-code-prettify library, your blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.
      
 
      <div>
   <h1>Heading</h1>
   <p>Something right here…</p>
-- 
cgit v1.2.3


From a5c1d1f1828c333e373cdc5da5da2f6d946ad45e Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 24 Jan 2012 20:45:38 -0800
Subject: adding actual images to carousel to ensure you can see things are
 animating; updated styles of carousel controls to work on light and dark
 backgrounds and use opacity for effects

---
 docs/base-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 6847c0616..27251d824 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -368,7 +368,7 @@
       
      
         <pre class="prettyprint">
         
-          
      Using the google-code-prettify library, your blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.
      
+          
      Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.
      
 
      <div>
   <h1>Heading</h1>
   <p>Something right here…</p>
-- 
cgit v1.2.3


From 6ab56051fdf916f03efb8aa6675e50bdd1cc3155 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 24 Jan 2012 23:35:34 -0800
Subject: fix up docs css for responsive and subnav, fix forms error states

---
 docs/base-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 27251d824..6847c0616 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -368,7 +368,7 @@
       
      
         <pre class="prettyprint">
         
-          
      Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.
      
+          
      Using the google-code-prettify library, your blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.
      
 
      <div>
   <h1>Heading</h1>
   <p>Something right here…</p>
-- 
cgit v1.2.3


From b8fa6cfacf61a02ab769b9031253c7b06111fa7c Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 01:22:29 -0800
Subject: move css builder and downloader to dedicated page, start to update
 remaining sections on LESS docs page

---
 docs/base-css.html | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 6847c0616..75c7efe5e 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -51,6 +51,9 @@
             
    • 
               Using LESS
             
      • 
+            
    • 
+              Download
+            
      • 
           
         
       
@@ -65,11 +68,11 @@
   
      On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.
      
   
      
     
   
      
 
-- 
cgit v1.2.3


From b01de5fc56ab031df8a08be9ce720c68ced7a5c1 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 09:51:03 -0800
Subject: updated icons to require a base class .icon

---
 docs/base-css.html | 208 ++++++++++++++++++++++++++---------------------------
 1 file changed, 104 insertions(+), 104 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 75c7efe5e..6b6bd5c51 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1284,119 +1284,119 @@
     
      Icons Graciously provided by Glyphicons
      
   
   
      
-    
      
-      
      
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-      
      
-    
      
-    
      
+    
      
       
      
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
       
      
     
      
-    
      
+    
      
       
      
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+        
+        
+        
       
      
     
      
-    
      
+    
      
       
      
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
       
      
     
      
-    
      
+    
      
       
      
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
       
      
     
      
-    
      
-      
      Light red background color is only used to show the dimensions of the icons in the docs.
      
-    
      
+  
      
+  
      
+    Heads up! On hover we show a light red background color to highlight the size of the icon. This won't appear in normal usage of icons.
   
      
 
   
      
@@ -1409,11 +1409,11 @@
     
      
     
      
       
      How to use
      
-      
      With v2.0.0, the <i> tag is essentially dedicated to iconography. To use the icons, you can place the follow code wherever you like one to appear:
      
+      
      With v2.0.0, we have opted to use an <i> tag for all our icons with a base class of .icon. To use, place the following code just about anywhere:
      
 
      -<i class="chevron-left"></i>
+<i class="icon search"></i>
 
      
-      
      There are over 100 classes to choose from for your icons. Just add an <i> tag with the right class and you're set. You can find the full list in sprites.less or right here in this document.
      
+      
      There are over 100 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.
      
     
      
     
      
       
      Use cases
      
-- 
cgit v1.2.3


From 9553b1e3e9457a48b6da3724c906a36f935aa526 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 10:02:52 -0800
Subject: update docs to include separate responsive css, update docs to
 highlight proper file name, updated makefile to build responsive separately

---
 docs/base-css.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 6b6bd5c51..790243426 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -14,6 +14,7 @@
 
     
     
+    
     
     
 
-- 
cgit v1.2.3


From 1fa3eab20c827d0300cd4a4bb50e2c28e16a2872 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 10:19:29 -0800
Subject: fix location of favicon

---
 docs/base-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 790243426..8013ee8aa 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -19,7 +19,7 @@
     
 
     
-    
+    
     
     
     
-- 
cgit v1.2.3


From 97bad784b5b8fe4ea871a7d4d8c3f5714c26e2ee Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 10:50:08 -0800
Subject: update remaining icons in docs

---
 docs/base-css.html | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 8013ee8aa..5d6772701 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1434,20 +1434,20 @@
     
      
       
      Use them in buttons, or in button groups for a toolbar style presentation.
      
       
      
-         Refresh
-         Settings
+         Refresh
+         Settings
       
      
       
      
         
      
-          
-          
-          
+          
+          
+          
         
      
         
      
-          
-          
-          
-          
+          
+          
+          
+          
         
      
       
      
     
      
@@ -1455,9 +1455,9 @@
       
      Or, use them in navigation.
      
       
      
         
       
       
     
      
-- 
cgit v1.2.3


From e49e49ff9557676d9018b410cea14a7f9f399733 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 10:51:26 -0800
Subject: fix mention of old vertical forms class'

---
 docs/base-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 5d6772701..1a9c4e15a 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -868,7 +868,7 @@
     
      
       
      
         Vertical (default).vertical-form (not required).form-vertical (not required)
         Stacked, left-aligned labels over controls
       
      
       
      
       
      
         
-          Notice
+          Info
         
         
-          <span class="label notice">Notice</span>
+          <span class="label info">Info</span>
         
       
      
           
 
       
      
 
-  
-  
      Inline labels for special attention
      
-  
-    
-      
-        
-        
-      
-    
-    
-      
-        
-        
-      
-      
-        
-        
-      
-      
-        
-        
-      
-      
-        
-        
-      
-      
-        
-        
-      
-    
-  
      LabelsMarkup
      
-          Default
-        
-          <span class="label">Default</span>
-        
      
-          New
-        
-          <span class="label success">New</span>
-        
      
-          Warning
-        
-          <span class="label warning">Warning</span>
-        
      
-          Important
-        
-          <span class="label important">Important</span>
-        
      
-          Info
-        
-          <span class="label info">Info</span>
-        
      
-
 
 
 
-- 
cgit v1.2.3


From d448e6921e6fc39e4fe7f484da004b2196517478 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 28 Jan 2012 00:23:30 -0800
Subject: rewrite the code section of the type docs

---
 docs/base-css.html | 80 ++++++++++++++++++++++++++----------------------------
 1 file changed, 38 insertions(+), 42 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 167cb5e69..222b5c81d 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -71,6 +71,7 @@
   
      
     
      
   
+
 
 
-  
-
-  
      Code Inline and block
      
-  
-    
-      
-        
-        
-      
-    
-    
-      
-        
-        
-      
-      
-        
-        
-      
-      
-        
-        
-      
-    
-  
      ElementResult
      <code>In a line of text like this, your wrapped code will look like this <html> element.
      <pre>
-
      <div>
-  <h1>Heading</h1>
-  <p>Something right here…</p>
-</div>
      
-          
      Note: Be sure to keep code within <pre> tags as close to the left as possible; it will render all tabs.
      
-        
      <pre class="prettyprint">
-          
      Using the google-code-prettify library, your blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.
      
-
      <div>
-  <h1>Heading</h1>
-  <p>Something right here…</p>
-</div>
      
-
      <div>
-  <h1>Heading</h1>
-  <p>Something right here…</p>
-</div>
      
-          
      Download google-code-prettify and view the readme for how to use.
      
-        
      
 
+
+
      
+  
      
+    
      Code Inline and block code snippets
      
+  
      
+  
      
+    
      
+      
      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 turn any carets into their unicode characters for proper rendering.
      
+
      +<pre>
+  &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.
      
+    
      
+    
      
+      
      Google Prettify
      
+      
      Take the same <pre> element and add two optional classes for enhanced rendering.
      
+
      +<pre class="prettyprint
+     linenums">
+  &lt;p&gt;Sample text here...&lt;/p&gt;
+</pre>
+
      
+      
      Download google-code-prettify and view the readme for how to use.
      
+    
      
+  
      
 
      
 
 
-- 
cgit v1.2.3


From 873be0e4f2a7e961998a8726e9953ae5111b3d85 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 28 Jan 2012 00:25:54 -0800
Subject: drop span2-4 on form examples to 1-3

---
 docs/base-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 222b5c81d..740e0e143 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1066,9 +1066,9 @@ For example, <code>section</code> should be wrapped as inline.
           
      
             
             
      
+              
               
               
-              
               
      Use the same .span* classes from the grid system for input sizes.
      
             
      
           
      
-- 
cgit v1.2.3


From 2bfda031cebcde7361797dd54badeb91d4cb98cf Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 28 Jan 2012 12:43:19 -0800
Subject: darken buttons, uncomment out firefox keyframes from progress bars

---
 docs/base-css.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 740e0e143..10f3db03d 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1128,11 +1128,11 @@ For example, <code>section</code> should be wrapped as inline.
             
             
      
               
               
             
      
-- 
cgit v1.2.3


From 23e076c1bb73c4950d473cb36218937b2607bc13 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 28 Jan 2012 15:09:23 -0800
Subject: add in a navbar button for toggling the nav items

---
 docs/base-css.html | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 10f3db03d..aa0ac664f 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -33,6 +33,11 @@
     
      
       
      
         
      
+          
+            
+            
+            
+          
           Bootstrap
           
        
             
      • 
-- 
cgit v1.2.3


From b8a683d7f250a11d349a3e5de0d75ace9d67df0c Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sat, 28 Jan 2012 15:42:07 -0800
Subject: turn off brand hover for now + get nav toggling in mobile

---
 docs/base-css.html | 54 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index aa0ac664f..c68391261 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -26,42 +26,44 @@
   
 
   
-  
-  
+
+
   
     
        
       
        
         
        
-          
+          
             
             
             
           
           Bootstrap
-          
+          
        
+            
+          
        
         
        
       
        
     
        
-- 
cgit v1.2.3


From 4fa931e403ec3ae2f8f7f690c6c4040365f68ba9 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 28 Jan 2012 18:11:31 -0800
Subject: fix the navbar click and a few jank responsive problems

---
 docs/base-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index c68391261..4651e9789 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1497,7 +1497,7 @@ For example, <code>section</code> should be wrapped as inline.
           
        
             
        
               
-              
+              
             
        
           
        
         
      
-- 
cgit v1.2.3


From 7bf27674523c35f8803311a964dc72a7093351c0 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 29 Jan 2012 00:07:01 -0800
Subject: remove form docs from the styles and markup, it's no longer needed

---
 docs/base-css.html | 59 ++++++++++++++++++++++++++----------------------------
 1 file changed, 28 insertions(+), 31 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 4651e9789..3b4032805 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -952,22 +952,20 @@ For example, <code>section</code> should be wrapped as inline.
       
     
      
     
      
-      
      
-        
      What's included
      
-        
      Shown on the left are all the default form controls we support. Here's the bulleted list:
      
-        
        
-          
      • text inputs (text, password, email, etc)
        • 
-          
      • checkbox
        • 
-          
      • radio
        • 
-          
      • select
        • 
-          
      • multiple select
        • 
-          
      • file input
        • 
-          
      • textarea
        • 
-        
      
-        
      
-        
      New defaults with v2.0
      
-        
      Up to v1.4, Bootstrap's default form styles used the horizontal layout. With Bootstrap 2, we removed that constraint to have smarter, more scalable defaults for any form.
      
-      
      
+      
      What's included
      
+      
      Shown on the left are all the default form controls we support. Here's the bulleted list:
      
+      
        
+        
      • text inputs (text, password, email, etc)
        • 
+        
      • checkbox
        • 
+        
      • radio
        • 
+        
      • select
        • 
+        
      • multiple select
        • 
+        
      • file input
        • 
+        
      • textarea
        • 
+      
      
+      
      
+      
      New defaults with v2.0
      
+      
      Up to v1.4, Bootstrap's default form styles used the horizontal layout. With Bootstrap 2, we removed that constraint to have smarter, more scalable defaults for any form.
      
     
      
   
      
 
@@ -1047,19 +1045,17 @@ For example, <code>section</code> should be wrapped as inline.
       
     
     
      
-      
      
-        
      Redesigned browser states
      
-        
      Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in it's place for :focus.
      
-        
      
-        
      Form validation
      
-        
      It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding .control-group.
      
+      
      Redesigned browser states
      
+      
      Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in it's place for :focus.
      
+      
      
+      
      Form validation
      
+      
      It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding .control-group.
      
 
       <fieldset
   class="control-group error">
   …
 </fieldset>
 
      
-      
      
     
      
   
 
@@ -1152,14 +1148,15 @@ For example, <code>section</code> should be wrapped as inline.
       
     
     
      
-      
      
-        
      Prepend & append inputs
      
-        
      Input groups—with appended or prepended text—provide an easy way to give more context for your inputs. Great examples include the @ sign for Twitter usernames or $ for finances.
      
-        
      
-        
      Checkboxes and radios
      
-        
      Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <label class="checkbox"> that wraps the <input type="checkbox">.
      
-        
      Inline checkboxes and radios are also supported. Just add .inline to any .checkbox or .radio and you're done.
      
-      
      
+      
      Prepend & append inputs
      
+      
      Input groups—with appended or prepended text—provide an easy way to give more context for your inputs. Great examples include the @ sign for Twitter usernames or $ for finances.
      
+      
      
+      
      Checkboxes and radios
      
+      
      Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <label class="checkbox"> that wraps the <input type="checkbox">.
      
+      
      Inline checkboxes and radios are also supported. Just add .inline to any .checkbox or .radio and you're done.
      
+      
      
+      
      Inline forms and append/prepend
      
+      
      To use prepend or append inputs in an inline form, be sure to place the .add-on and input on the same line, without spaces.
      
     
      
   
 
-- 
cgit v1.2.3


From 8c763589a2058785936a33088935c50f622859de Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 29 Jan 2012 13:09:10 -0800
Subject: update text on icons note

---
 docs/base-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 3b4032805..0b2c4547e 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1407,7 +1407,7 @@ For example, <code>section</code> should be wrapped as inline.
     
   
   
      
-    Heads up! Icon classes are echoed via CSS :after and on hover in the docs we show a light red background color show the icon's size.
+    Heads up! Icon classes are echoed via CSS :after. In the docs, we show a light red background color on hover to hightlight the icon's size.
   
      
 
   
      
-- 
cgit v1.2.3


From 278858e70698f0dcf8651cb59b13e48fe756d8bd Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 29 Jan 2012 13:25:13 -0800
Subject: fix form styles on prepend/append for consistency, update code docs
 with examples of the code snippets

---
 docs/base-css.html | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 0b2c4547e..0406ff229 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -372,6 +372,9 @@ For example, <code>section</code> should be wrapped as inline.
     
      
       
      Basic block
      
       
      Use <pre> for multiple lines of code. Be sure to turn any carets into their unicode characters for proper rendering.
      
+
      +<p>Sample text here...</p>
+
      
 
       <pre>
   &lt;p&gt;Sample text here...&lt;/p&gt;
@@ -383,6 +386,9 @@ For example, <code>section</code> should be wrapped as inline.
       
      Google Prettify
      
       
      Take the same <pre> element and add two optional classes for enhanced rendering.
      
 
      +<p>Sample text here...</p>
+
      
+
       <pre class="prettyprint
      linenums">
   &lt;p&gt;Sample text here...&lt;/p&gt;
-- 
cgit v1.2.3


From 9e7f5025b494927e9ffc88119b0b9426f7487a62 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 29 Jan 2012 14:07:14 -0800
Subject: update collapsible nav in navbar

---
 docs/base-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 0406ff229..291feb6e1 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -39,7 +39,7 @@
             
           
           Bootstrap
-          
      
+          
      
             
        
               
      • 
                 Overview
-- 
cgit v1.2.3


From 702d3b6dfe7a150deb090f70d7d9c2a2964a3eb2 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 29 Jan 2012 16:35:55 -0800
Subject: fix broken navbar collapse

---
 docs/base-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 291feb6e1..0406ff229 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -39,7 +39,7 @@
             
           
           Bootstrap
-          
        
+          
        
             
          
               
        • 
                 Overview
-- 
cgit v1.2.3


From ae7f94eeff733584cbdc80a2d13a85f136a7744e Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 00:39:44 -0800
Subject: overhaul grid mixins and variables, standardize fluid grid system and
 enable it across responsive layouts

---
 docs/base-css.html | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 0406ff229..72eea8d67 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -62,6 +62,10 @@
               
        • 
                 Customize
               
          • 
+              
        • 
+              
        • 
+                Examples
+              
          • 
             
        
           
        
         
        
@@ -1078,6 +1082,27 @@ For example, <code>section</code> should be wrapped as inline.
               
               
               
+              
+              
+              
               
        Use the same .span* classes from the grid system for input sizes.
        
             
      
           
      
-- 
cgit v1.2.3


From 8f448610a944efd134170f44e305ec6710bcff1a Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 01:09:34 -0800
Subject: rename vertical-divider to divider-vertical, add more space around
 the divider

---
 docs/base-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 72eea8d67..22d6262ff 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -59,10 +59,10 @@
               
    • 
                 Using LESS
               
      • 
+              
    • 
               
    • 
                 Customize
               
      • 
-              
    • 
               
    • 
                 Examples
               
      • 
-- 
cgit v1.2.3


From 175fd98a7c4668dbb5441ebf3ebc616b29bd8210 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 01:25:02 -0800
Subject: fix forms typo on error state

---
 docs/base-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 22d6262ff..b76ace1e2 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1059,7 +1059,7 @@ For example, <code>section</code> should be wrapped as inline.
       
      Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in it's place for :focus.
      
       
      
       
      Form validation
      
-      
      It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding .control-group.
      
+      
      It also includes validation styles for errors, warnings, and success. To use, add the error class to the surrounding .control-group.
      
 
       <fieldset
   class="control-group error">
-- 
cgit v1.2.3


From 2d40b07afc62ce9d899a290ab33222fd18287190 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 08:15:28 -0800
Subject: adding warning (orange) button, fix responsive navbar problem

---
 docs/base-css.html | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index b76ace1e2..5df63b917 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1229,6 +1229,11 @@ For example, <code>section</code> should be wrapped as inline.
         .success
         Indicates a successful or positive action
       
+      
+        Warning
+        .warning
+        Indicates caution should be taken with this action
+      
       
         Danger
         .danger
-- 
cgit v1.2.3


From 0f3a073b8dca534e78c09b71999d5a2632e2245d Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 21:15:57 -0800
Subject: *really* refactor the buttons and update them all over the docs

---
 docs/base-css.html | 68 +++++++++++++++++++++++++++---------------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 5df63b917..ddbbad174 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -832,11 +832,6 @@ For example, <code>section</code> should be wrapped as inline.
         .form-vertical (not required)
         Stacked, left-aligned labels over controls
       
-      
-        Horizontal
-        .form-horizontal
-        Float left, right-aligned labels on same line as controls
-      
       
         Inline
         .form-inline
@@ -847,6 +842,11 @@ For example, <code>section</code> should be wrapped as inline.
         .form-search
         Extra-rounded text input for a typical search aesthetic
       
+      
+        Horizontal
+        .form-horizontal
+        Float left, right-aligned labels on same line as controls
+      
     
   
 
@@ -955,7 +955,7 @@ For example, <code>section</code> should be wrapped as inline.
             
      
           
           
      
-            
+            
             
           
      
         
@@ -1048,7 +1048,7 @@ For example, <code>section</code> should be wrapped as inline.
             
           
           
      
-            
+            
             
           
      
         
@@ -1172,7 +1172,7 @@ For example, <code>section</code> should be wrapped as inline.
             
           
           
      
-            
+            
             
           
      
         
@@ -1215,28 +1215,28 @@ For example, <code>section</code> should be wrapped as inline.
         Standard gray button with gradient
       
       
-        Primary
-        .primary
+        Primary
+        .btn-primary
         Provides extra visual weight and identifies the primary action in a set of buttons
       
       
-        Info
-        .info
+        Info
+        .btn-info
         Used as an alternate to the default styles
       
       
-        Success
-        .success
+        Success
+        .btn-success
         Indicates a successful or positive action
       
       
-        Warning
-        .warning
+        Warning
+        .btn-warning
         Indicates caution should be taken with this action
       
       
-        Danger
-        .danger
+        Danger
+        .btn-danger
         Indicates a dangerous or potentially negative action
       
     
@@ -1261,24 +1261,24 @@ For example, <code>section</code> should be wrapped as inline.
       
      Multiple sizes
      
       
      Fancy larger or smaller buttons? Have at it!
      
       
      
-        Primary action
-        Action
+        Primary action
+        Action
       
      
       
      
-        Primary action
-        Action
+        Primary action
+        Action
       
      
     
     
      
       
      Disabled state
      
-      
      For disabled buttons, use .disabled for links and :disabled for <button> elements.
      
+      
      For disabled buttons, use .btn-disabled for links and :disabled for <button> elements.
      
       
      
-        Primary action
-        Action
+        Primary action
+        Action
       
      
       
      
-        
-        
+        
+        
       
      
     
      
     
      
@@ -1491,8 +1491,8 @@ For example, <code>section</code> should be wrapped as inline.
           
         
      
         
      
-           User
-          
+           User
+          
           
        
             
      •  Edit
        • 
             
      •  Delete
        • 
@@ -1504,13 +1504,13 @@ For example, <code>section</code> should be wrapped as inline.
       
      
       
      
          Refresh
-         Checkout
-         Delete
+         Checkout
+         Delete
       
      
       
      
-         Comment
-         Settings
-         More Info
+         Comment
+         Settings
+         More Info
       
      
     
     
      
-- 
cgit v1.2.3


From 31911659a200d39d8494f35f8fd71863ac1226d0 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 21:29:50 -0800
Subject: refactor the navs to use prefixed classes, because you know,
 consistency is beast mode

---
 docs/base-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index ddbbad174..0f97a036a 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -80,7 +80,7 @@
   
      Base CSS
      
   
      On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.
      
   
      
-    
        
+    
          
       
        • Typography
          • 
       
        • Code
          • 
       
        • Tables
          • 
-- 
cgit v1.2.3


From 47a68ae3aa8cad828eebe529403b46210c9d9d16 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 22:57:00 -0800
Subject: update icons everywhere to be scoped per other components, fix broken
 elements on js docs page

---
 docs/base-css.html | 297 +++++++++++++++++++++++++++--------------------------
 1 file changed, 149 insertions(+), 148 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 0f97a036a..c71874b3a 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1303,142 +1303,142 @@ For example, <code>section</code> should be wrapped as inline.
   
          
     
          
       
          
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
       
          
     
          
     
          
       
          
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
       
          
     
          
     
          
       
          
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
       
          
     
          
     
          
       
          
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
       
          
     
          
   
          
@@ -1452,17 +1452,18 @@ For example, <code>section</code> should be wrapped as inline.
     
          
       
          Built as a sprite
          
       
          Instead of making every icon an extra request, we've compiled them into a sprite—a bunch of images in one file that uses CSS to position the images with background-position. This is the same method we use on Twitter.com and it has worked well for us.
          
-      
          Glyphicons has granted us use of the Halflings set in our open-source toolkit so long as we provide a link and credit. Please consider doing the same in your projects.
          
+      
          All icons classes are prefixed with .i- for proper namespacing and scoping, much like our other components. This will help avoid conflicts with other tools.
          
+      
          Glyphicons has granted us use of the Halflings set in our open-source toolkit so long as we provide a link and credit here in the docs. Please consider doing the same in your projects.
          
     
          
     
          
       
          How to use
          
-      
          With v2.0.0, we have opted to use an <i> tag for all our icons with a base class of .icon. To use, place the following code just about anywhere:
          
+      
          With v2.0.0, we have opted to use an <i> tag for all our icons with a base class of .i. To use, place the following code just about anywhere:
          
 
          -<i class="icon search"></i>
+<i class="i i-search"></i>
 
          
       
          There are also styles available for inverted (white) icons, made ready with one extra class:
          
 
          -<i class="icon white search"></i>
+<i class="i i-search i-white"></i>
 
          
       
          There are 120 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.
          
     
          
@@ -1485,41 +1486,41 @@ For example, <code>section</code> should be wrapped as inline.
     
          
       
          
         
          
-          
-          
-          
-          
+          
+          
+          
+          
         
          
         
          
            User
           
           
         
          
       
          
       
          
-         Refresh
-         Checkout
-         Delete
+         Refresh
+         Checkout
+         Delete
       
          
       
          
-         Comment
-         Settings
-         More Info
+         Comment
+         Settings
+         More Info
       
          
     
          
     
          
       
          
-        
           
     
          
@@ -1529,7 +1530,7 @@ For example, <code>section</code> should be wrapped as inline.
           
           
          
             
          
-              
+              
               
             
          
           
          
-- 
cgit v1.2.3


From d533310bd2fa157edb076f9047af8f1cff0fca05 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 23:24:35 -0800
Subject: once more, overhaul the icons and use the css regex selector on our
 icons

---
 docs/base-css.html | 288 ++++++++++++++++++++++++++---------------------------
 1 file changed, 144 insertions(+), 144 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index c71874b3a..654775fc1 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1303,142 +1303,142 @@ For example, <code>section</code> should be wrapped as inline.
   
          
     
          
       
          
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
       
          
     
          
     
          
       
          
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
       
          
     
          
     
          
       
          
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
       
          
     
          
     
          
       
          
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
       
          
     
          
   
          
@@ -1457,13 +1457,13 @@ For example, <code>section</code> should be wrapped as inline.
     
      
     
      
       
      How to use
      
-      
      With v2.0.0, we have opted to use an <i> tag for all our icons with a base class of .i. To use, place the following code just about anywhere:
      
+      
      With v2.0.0, we have opted to use an <i> tag for all our icons, but they have no case class—only a shared prefix. To use, place the following code just about anywhere:
      
 
      -<i class="i i-search"></i>
+<i class="i-search"></i>
 
      
       
      There are also styles available for inverted (white) icons, made ready with one extra class:
      
 
      -<i class="i i-search i-white"></i>
+<i class="i-search i-white"></i>
 
      
       
      There are 120 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.
      
     
      
@@ -1486,40 +1486,40 @@ For example, <code>section</code> should be wrapped as inline.
     
      
       
      
         
      
-          
-          
-          
-          
+          
+          
+          
+          
         
      
         
      
            User
           
           
         
      
       
      
       
      
-         Refresh
-         Checkout
-         Delete
+         Refresh
+         Checkout
+         Delete
       
      
       
      
-         Comment
-         Settings
-         More Info
+         Comment
+         Settings
+         More Info
       
      
     
      
     
      
       
      
         
       
       
@@ -1530,7 +1530,7 @@ For example, <code>section</code> should be wrapped as inline.
           
           
      
             
      
-              
+              
               
             
      
           
      
-- 
cgit v1.2.3


From b7713b83fa25f4b28869fe846b04baac00ca781b Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 31 Jan 2012 00:11:19 -0800
Subject: chance icon class

---
 docs/base-css.html | 296 ++++++++++++++++++++++++++---------------------------
 1 file changed, 148 insertions(+), 148 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 654775fc1..298312edd 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -34,9 +34,9 @@
       
      
         
      
           
-            
-            
-            
+            
+            
+            
           
           Bootstrap
           
      
@@ -931,7 +931,7 @@ For example, <code>section</code> should be wrapped as inline.
             
      
           
      
           
      
-            
+            
             
      
               
             
      
           
      
-- 
cgit v1.2.3


From a6253f0937a5d1f0bd18655729bff03bd5373f17 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 31 Jan 2012 00:15:43 -0800
Subject: fix disabled button docs

---
 docs/base-css.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 298312edd..90240747b 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1273,8 +1273,8 @@ For example, <code>section</code> should be wrapped as inline.
       
      Disabled state
      
       
      For disabled buttons, use .btn-disabled for links and :disabled for <button> elements.
      
       
      
-        Primary action
-        Action
+        Primary action
+        Action
       
      
       
      
         
-- 
cgit v1.2.3


From d70ba6c5e66b27acfc46121bf2293773451a339e Mon Sep 17 00:00:00 2001
From: nkryptic 
Date: Tue, 31 Jan 2012 03:54:07 -0500
Subject: add form help-* documentation

---
 docs/base-css.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 90240747b..2e4e116db 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1155,7 +1155,7 @@ For example, <code>section</code> should be wrapped as inline.
                 
                 Option three can—yes, you guessed it—also be checked and included in form results
               
-              
      Note: Labels surround all the options for much larger click areas and a more usable form.
      
+              
      Note: Labels surround all the options for much larger click areas and a more usable form.
      
             
      
           
      
           
      
@@ -1188,6 +1188,9 @@ For example, <code>section</code> should be wrapped as inline.
       
      
       
      Inline forms and append/prepend
      
       
      To use prepend or append inputs in an inline form, be sure to place the .add-on and input on the same line, without spaces.
      
+      
      
+      
      Form help text
      
+      
      To add help text for your form inputs, include inline help text with <span class="help-inline"> or a help text block with <p class="help-block"> after the input element.
      
     
      
   
      
 
-- 
cgit v1.2.3