From ec8619a9808b9b6e721334af8e6b5248ccbea8b5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Sep 2011 17:21:43 -0700 Subject: update docs to remove old stuff, update to all new classes; no more backwards compatibility --- docs/index.html | 236 ++++++++++++++++++++++++++++----------------------- docs/javascript.html | 8 +- 2 files changed, 132 insertions(+), 112 deletions(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index f99b756fe..5c5162471 100644 --- a/docs/index.html +++ b/docs/index.html @@ -6,7 +6,7 @@ - + @@ -37,22 +37,42 @@ -
+
Bootstrap @@ -718,102 +738,6 @@ - -
- - -
-
-

Media grid

-

Display thumbnails of varying sizes on pages with a low HTML footprint and minimal styles.

-
-
-

Example thumbnails

-

Thumbnails in the .media-grid can be any size, but they work best when mapped directly to the built-in Bootstrap grid system. Image widths like 90, 210, and 330 combine with a few pixels of padding to equal the .span2, .span4, and .span6 column sizes.

-

Large

- -

Medium

- -

Small

- -

Coding them

-

Media grids are easy to use and rather simple on the markup side. Their dimensions are purely based on the size of the images included.

-
-<ul class="media-grid">
-  <li>
-    <a href="#">
-      <img class="thumbnail" src="http://placehold.it/330x230" alt="">
-    </a>
-  </li>
-  <li>
-    <a href="#">
-      <img class="thumbnail" src="http://placehold.it/330x230" alt="">
-    </a>
-  </li>
-</ul>
-
-
-
-
- - -
@@ -1295,6 +1219,102 @@ + +
+ + +
+
+

Media grid

+

Display thumbnails of varying sizes on pages with a low HTML footprint and minimal styles.

+
+
+

Example thumbnails

+

Thumbnails in the .media-grid can be any size, but they work best when mapped directly to the built-in Bootstrap grid system. Image widths like 90, 210, and 330 combine with a few pixels of padding to equal the .span2, .span4, and .span6 column sizes.

+

Large

+ +

Medium

+ +

Small

+ +

Coding them

+

Media grids are easy to use and rather simple on the markup side. Their dimensions are purely based on the size of the images included.

+
+<ul class="media-grid">
+  <li>
+    <a href="#">
+      <img class="thumbnail" src="http://placehold.it/330x230" alt="">
+    </a>
+  </li>
+  <li>
+    <a href="#">
+      <img class="thumbnail" src="http://placehold.it/330x230" alt="">
+    </a>
+  </li>
+</ul>
+
+
+
+
+ + + @@ -1378,6 +1245,7 @@

Tabs and pills

Create simple secondary navigation with a <ul>. Swap between tabs or pills by adding the appropriate class.

Great for sub-sections of content like our account settings pages and user timelines for toggling between pages of like content. Available in tabbed or pill styles.

+

Get the javascript »

    @@ -1929,6 +1797,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita +
-- cgit v1.2.3 From ecdba931ec4a6eced099026c1aeab503567a4e0a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Sep 2011 01:41:03 -0700 Subject: remove that test gradient --- docs/index.html | 3 --- 1 file changed, 3 deletions(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index 75a18ea40..d24bb1afd 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1796,9 +1796,6 @@ Lorem ipsum dolar sit amet illo error ipsum verita - -
-
-- cgit v1.2.3 From 0a6d8c30db0600ab8d33e14ead0ff120cd03ac9d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Sep 2011 02:21:02 -0700 Subject: adding button groups and toolbars like a boss --- docs/index.html | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 80 insertions(+), 5 deletions(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index d24bb1afd..137144991 100644 --- a/docs/index.html +++ b/docs/index.html @@ -898,7 +898,7 @@

-
+

Search form

@@ -911,7 +911,7 @@
- +

Inline form

@@ -928,7 +928,7 @@
- +

Horizontal form

@@ -1032,7 +1032,7 @@
-
+

Vertical form

@@ -1075,7 +1075,82 @@
-
+ + +
+
+

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!

+ + +

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

+ +

Buttons

+
+   +
+
+
+ +
+
+

Button groups

+
+
+

Example

+
+
+ Left + Middle + Right +
+
+
+
+
+ 1 + 2 + 3 + 4 + 5 +
+
+ 6 + 7 + 8 +
+
+ 9 +
+
+ 10 +
+
+
+
+
+ -- cgit v1.2.3 From c9669be1ec2862b88ffdb296191e82fed79f56a4 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 5 Oct 2011 00:14:55 -0700 Subject: get modal working with new data-attrs --- docs/javascript.html | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'docs') diff --git a/docs/javascript.html b/docs/javascript.html index d5eb98739..9f2b13876 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -12,7 +12,7 @@ - + @@ -182,7 +182,7 @@ $('#my-modal').bind('hidden', function () { - - @@ -221,7 +219,7 @@ $('#my-modal').bind('hidden', function () {
 <ul class="tabs">
   <li class="active"><a href="#">Home</a></li>
-  <li class="dropdown" data-dropdown="dropdown" >
+  <li class="dropdown" data-dropdown="true" >
     <a href="#" class="dropdown-toggle">Dropdown</a>
     <ul class="dropdown-menu">
       <li><a href="#">Secondary link</a></li>
@@ -231,7 +229,6 @@ $('#my-modal').bind('hidden', function () {
     </ul>
   </li>
 </ul>
-

Notice If your ui has several dropdowns, consider adding the data-dropdown attribute to a more significant container element like .tabs or .topbar.

Methods

$().dropdown()

@@ -239,7 +236,7 @@ $('#my-modal').bind('hidden', function () {

Demo

-
+
Project Name @@ -252,7 +249,7 @@ $('#my-modal').bind('hidden', function () { -
+
-

Unstyled <.unstyled>

+

Unstyled <ul.unstyled>

  • Lorem ipsum dolor sit amet
  • Consectetur adipiscing elit
  • @@ -570,120 +611,96 @@ -
    -
    -

    Code

    -

    - <code> - <pre> -

    -

    Pimp your code in style with two simple tags. For even more awesomeness through javascript, drop in Google's code prettify library and you're set.

    -
    -
    -

    Presenting code

    -

    Code, blocks of or just snippets inline, can be displayed with style just by wrapping in the right tag. For blocks of code spanning multiple lines, use the <pre> element. For inline code, use the <code> element.

    - - - - - - - - - - - - - - - + + +
    ElementResult
    <code>In a line of text like this, your wrapped code will look like this <html> element.
    <pre> + +

    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.

    +

    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.

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

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

    -
    - - +

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

    +
    -
    -
    -

    Inline labels

    -

    - <span class="label"> -

    -

    Call attention to or flag any phrase in your body text.

    -
    -
    -

    Label anything

    -

    Ever needed one of those fancy New! or Important flags when writing code? Well, now you have them. Here's what's included by default:

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

    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> +
    -- cgit v1.2.3 From b91d210a3cdb29d022f20646ed61e663ceea18dd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Oct 2011 14:43:43 -0700 Subject: overhauled tables section of docs to minize copy and emphasize code --- docs/index.html | 279 ++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 178 insertions(+), 101 deletions(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index 2e0036bb0..68cdd4a2c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -638,10 +638,14 @@ <pre class="prettyprint"> -

    Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting.

    +

    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.

    @@ -712,130 +716,204 @@ - + +

    Table markup

    -
    -

    Building tables

    -

    - <table> - <thead> - <tbody> - <tr> - <th> - <td> - <colspan> - <caption> -

    -

    Tables are great—for a lot of things. Great tables, however, need a bit of markup love to be useful, scalable, and readable (at the code level). Here are a few tips to help.

    -

    Always wrap your column headers in a <thead> such that hierarchy is <thead> > <tr> > <th>.

    -

    Similar to the column headers, all your table’s body content should be wrapped in a <tbody> so your hierarchy is <tbody> > <tr> > <td>.

    -
    -
    -

    Example: 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 NameLanguageTagDescription
    1SomeOneEnglish + <table> + + Wrapping element for displaying data in a tabular format +
    2JoeSixpackEnglish + <thead> + + Container element for table header rows (<tr>) to label table columns +
    3StuDentCode + <tbody> + + Container element for table rows (<tr>) in the body of the table +
    -
    -<table>
    -  ...
    -</table>
    -

    Example: Zebra-striped

    -

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

    - - - - - - + + - - - - - - + + - - - - + + - - - - + +
    #First NameLast NameLanguage + <tr> + + Container element for a set of table cells (<td> or <th>) that appears on a single row +
    1SomeOneEnglish + <td> + + Default table cell +
    2JoeSixpackEnglish + <th> + + Special table cell for column (or row, depending on scope and placement) labels
    + Must be used within a <thead> +
    3StuDentCode + <caption> + + Description or summary of what the table holds, especially useful for screen readers +
    -

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

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

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

    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 >
    @@ -846,8 +924,7 @@
     <table class="zebra-striped">
       ...
     </table>
    -
    -
    + -- cgit v1.2.3 From ae5c5e10635049c65d73454ca9486539bdf324d4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Oct 2011 20:44:52 -0700 Subject: update docs to change topbar to navbar --- docs/index.html | 18 +++++++++--------- docs/javascript.html | 24 ++++++++++++------------ 2 files changed, 21 insertions(+), 21 deletions(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index 68cdd4a2c..7fe5ce1ca 100644 --- a/docs/index.html +++ b/docs/index.html @@ -25,7 +25,7 @@ -
-
-
+
+

What is it

-

Our topbar is a fixed bar that houses a website’s logo or name, primary navigation, and search form.

+

Our navbar is a fixed bar that houses a website’s logo or name, primary navigation, and search form.

Customizable

-

All elements within, and the entire topbar as well, are optional. You can choose to include a logo/name, nav, search, and a secondary nav—or any combination of that.

+

All elements within, and the entire navbar as well, are optional. You can choose to include a logo/name, nav, search, and a secondary nav—or any combination of that.

Dropdowns included

As part of the main navigation, we’ve included the ability for you to add dropdowns to your nav. Check out the secondary nav above (right aligned) to see how it’s done. Dropdowns <li> tags also support .active for showing current page selection.

-

Note: When using the topbar on any page, be sure to account for the overlap it causes by adding padding-top: 40px; to your <body>.

+

Note: When using the navbar on any page, be sure to account for the overlap it causes by adding padding-top: 40px; to your <body>.


@@ -1875,11 +1875,11 @@ Lorem ipsum dolar sit amet illo error ipsum verita bootstrap-dropdown.js - This plugin is for adding dropdown interaction to the bootstrap topbar or tabbed navigations. + This plugin is for adding dropdown interaction to the bootstrap navbar or tabbed navigations. bootstrap-scrollspy.js - The ScrollSpy plugin is for adding an auto updating nav based on scroll position to the bootstrap topbar. + The ScrollSpy plugin is for adding an auto updating nav based on scroll position to the bootstrap navbar. bootstrap-tabs.js diff --git a/docs/javascript.html b/docs/javascript.html index da623c2f8..68a3d0cd4 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -25,7 +25,7 @@ - @@ -127,7 +187,7 @@ -
+
diff --git a/docs/index.html b/docs/index.html index 8f7963afd..8d5448ce1 100644 --- a/docs/index.html +++ b/docs/index.html @@ -35,11 +35,71 @@ Bootstrap @@ -253,5 +313,6 @@ + diff --git a/docs/javascript.html b/docs/javascript.html index 0350103fa..216bcdef5 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -35,11 +35,71 @@ Bootstrap diff --git a/docs/less.html b/docs/less.html index 05398e966..cecf22da4 100644 --- a/docs/less.html +++ b/docs/less.html @@ -34,11 +34,71 @@ Bootstrap diff --git a/docs/scaffolding.html b/docs/scaffolding.html index b868fd215..546a2755a 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -34,11 +34,71 @@ Bootstrap @@ -361,66 +421,6 @@ + + + + + + + -- cgit v1.2.3 From fc053ac8b27611e3dc7fae769ce28f154250d50e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 13 Jan 2012 10:07:56 -0800 Subject: update dropdowns spacing and docs section spacing --- docs/assets/css/docs.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 134224e56..ca1c5cb83 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -35,8 +35,11 @@ body > .navbar-fixed .brand:hover { /* Space out sub-sections more -------------------------------------------------- */ +section { + padding-top: 60px; +} .page-header { - margin: 45px 0 18px; + margin: 18px 0; border-bottom: 1px solid #eee; } .page-header h1 { -- 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 ++-- docs/components.html | 2 +- docs/index.html | 2 +- docs/javascript.html | 2 +- docs/less.html | 2 +- docs/scaffolding.html | 2 +- docs/upgrading.html | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) (limited to 'docs') 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.

diff --git a/docs/components.html b/docs/components.html index fa3dc5a20..55a007f90 100644 --- a/docs/components.html +++ b/docs/components.html @@ -40,7 +40,7 @@ diff --git a/docs/index.html b/docs/index.html index 5d8e61ded..fc1eb498c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -41,7 +41,7 @@ diff --git a/docs/javascript.html b/docs/javascript.html index 58cc13e8c..ce47c1974 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -41,7 +41,7 @@ diff --git a/docs/less.html b/docs/less.html index 8831ce094..d99a7903e 100644 --- a/docs/less.html +++ b/docs/less.html @@ -40,7 +40,7 @@ diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 57b90d096..145dd5584 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -40,7 +40,7 @@ diff --git a/docs/upgrading.html b/docs/upgrading.html index 376aae856..1b4864ec7 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -40,7 +40,7 @@ -- 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 +- docs/components.html | 2 +- docs/index.html | 2 +- docs/javascript.html | 2 +- docs/less.html | 2 +- docs/scaffolding.html | 2 +- docs/upgrading.html | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'docs') 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 @@
+
@@ -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 @@ -
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.

-
diff --git a/docs/index.html b/docs/index.html index ffdac0b3f..cb924bae6 100644 --- a/docs/index.html +++ b/docs/index.html @@ -268,7 +268,7 @@ ================================================== -->

Get started in no time.

-
Button
+
@@ -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 72117c3f9751d9ccb7bebf76f8a5776c99a51857 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 24 Jan 2012 13:57:44 -0800 Subject: add i18n for less.mustache --- docs/templates/pages/less.mustache | 138 ++++++++++++++++++------------------- 1 file changed, 69 insertions(+), 69 deletions(-) (limited to 'docs') diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 568e857be..d6376ae2f 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -1,8 +1,8 @@
-

Using LESS with Bootstrap

-

Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.

+

{{_i}}Using LESS with Bootstrap{{/i}}

+

{{_i}}Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.{{/i}}

@@ -10,35 +10,35 @@
-

Why LESS?

-

Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.

+

{{_i}}Why LESS?{{/i}}

+

{{_i}}Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.{{/i}}

-

What's included?

-

As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.

+

{{_i}}What's included?{{/i}}

+

{{_i}}As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.{{/i}}

-

Learn more

+

{{_i}}Learn more{{/i}}

LESS CSS -

Visit the official website at http://lesscss.org to learn more.

+

{{_i}}Visit the official website at http://lesscss.org to learn more.{{/i}}

-

Variables

-

Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.

+

{{_i}}Variables{{/i}}

+

{{_i}}Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.{{/i}}

-

Mixins

-

Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.

+

{{_i}}Mixins{{/i}}

+

{{_i}}Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.{{/i}}

-

Operations

-

Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.

+

{{_i}}Operations{{/i}}

+

{{_i}}Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.{{/i}}

@@ -47,35 +47,35 @@ -

Hyperlinks

+

{{_i}}Hyperlinks{{/i}}

diff --git a/docs/javascript.html b/docs/javascript.html index afe9c329e..64159ede7 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -284,7 +284,7 @@

Call the modal via javascript:

$('#myModal').modal(options)

Options

- +
@@ -349,7 +349,7 @@ $('#myModal').modal({
$('#myModal').modal('hide')

Events

Bootstrap's modal class exposes a few events for hooking into modal functionality.

-
Name
+
@@ -666,7 +666,7 @@ $('#myModal').on('hidden', function () { </script>

Events

-
Event
+
@@ -719,7 +719,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

Trigger the tooltip via javascript:

$('#example').tooltip(options)

Options

-
Event
+
@@ -813,7 +813,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

Enable popovers via javascript:

$('#example').popover(options)

Options

-
Name
+
@@ -932,7 +932,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
$(".alert-message").alert('close')

Events

Bootstrap's alert class exposes a few events for hooking into alert functionality.

-
Name
+
@@ -975,7 +975,7 @@ $('#my-alert').bind('closed', function () {

Example uses

Use the buttons plugin for states and toggles.

-
Event
+
@@ -1115,7 +1115,7 @@ $('#my-alert').bind('closed', function () {

Enable via javascript:

$(".collapse").collapse()

Options

-
Stateful
+
@@ -1165,7 +1165,7 @@ $('#myCollapsible').collapse({

Bootstrap's collapse class exposes a few events for hooking into collapse functionality.

-
Name
+
@@ -1251,7 +1251,7 @@ $('#myCollapsible').on('hidden', function () {

Call via javascript:

$('.carousel').carousel()

Options

-
Event
+
@@ -1300,7 +1300,7 @@ $('#myCollapsible').on('hidden', function () {

Cycles to the next item.

Events

Bootstrap's modal class exposes a few events for hooking into modal functionality.

-
Name
+
@@ -1348,7 +1348,7 @@ $('#myCollapsible').on('hidden', function () {

Call the typeahead via javascript:

$('.typeahead').typeahead()

Options

-
Event
+
diff --git a/docs/less.html b/docs/less.html index f3bfa3059..357f242b1 100644 --- a/docs/less.html +++ b/docs/less.html @@ -160,7 +160,7 @@

Hyperlinks

-
Name
+
@@ -185,7 +185,7 @@

Grayscale colors

-
Variable
+
@@ -216,7 +216,7 @@

Accent colors

-
@black
+
@@ -254,7 +254,7 @@

Grid system

-
@blue
+
@@ -277,7 +277,7 @@

Typography

-
@gridColumns
+
@@ -302,7 +302,7 @@

Visuals

-
@baseFontSize
+
@@ -453,7 +453,7 @@

Compiling Less

After modifying the .less files in /lib/, you'll need to recompile them in order to regenerate the bootstrap-*.*.*.css and bootstrap-*.*.*.min.css files. If you're submitting a pull request to GitHub, you must always recompile.

Ways to compile

-
@primaryButtonColor
+
diff --git a/docs/scaffolding.html b/docs/scaffolding.html index b2b4b5647..eab6fedf5 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -223,7 +223,7 @@

Grid customization

-
Method
+
@@ -335,7 +335,7 @@

Supported devices

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

-
Variable
+
-- cgit v1.2.3 From ed9903f797fa6d94789d05c234164bd378a1f3df Mon Sep 17 00:00:00 2001 From: Paul Kauders Date: Sun, 15 Jan 2012 07:46:25 -0600 Subject: Fix typo in Responsive design content --- docs/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index cb924bae6..40ffce106 100644 --- a/docs/index.html +++ b/docs/index.html @@ -215,7 +215,7 @@

Responsive design

-

With Bootstrap 2, we've gone fully responsive. Our components are scale according to a range of resolutions and devices to provide a consistent experience, no matter what.

+

With Bootstrap 2, we've gone fully responsive. Our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.

-- cgit v1.2.3 From 8ceea1f559fb432fc12df32153911de89caea36f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Jan 2012 11:26:06 -0800 Subject: fix some ie7 bugs, improve dropdowns for ie due to lack of a shadow, fix pager example code --- docs/assets/css/docs.css | 20 +++++++++----------- docs/components.html | 4 ++-- docs/index.html | 7 +++---- 3 files changed, 14 insertions(+), 17 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 2f45032f2..416b1830c 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -130,6 +130,7 @@ section { /* Quick links -------------------------------------------------- */ .quick-links { + min-height: 30px; padding: 5px 20px; margin: 45px 0; list-style: none; @@ -141,11 +142,11 @@ section { -webkit-box-shadow: inset 0 1px 0 rgba(0,0,0,.03); -moz-box-shadow: inset 0 1px 0 rgba(0,0,0,.03); box-shadow: inset 0 1px 0 rgba(0,0,0,.03); + overflow: hidden; } .quick-links li { display: inline; margin: 0 5px; - line-height: 30px; } .quick-links .divider { color: #999; @@ -258,7 +259,7 @@ section { -ms-box-sizing: border-box; /* IE8 */ box-sizing: border-box; /* CSS3 spec*/ /* Hacks for IE7 to make this work just okay enough to function */ - *width: 90%; + *width: 270px; *height: 24px; } @@ -386,7 +387,7 @@ section { .popover-well .popover-menu-wrapper { height: 80px; } -img.large-bird { +.large-bird { margin: 5px 0 0 310px; opacity: .1; } @@ -467,9 +468,6 @@ form.well { /* Icons ------------------------- */ -.the-icons { - -} .the-icons i { display: block; margin-bottom: 5px; @@ -483,11 +481,11 @@ form.well { width: 100px; } -#javascript input[type='checkbox'] { -display: inline; -margin-left: 6px; -position: relative; -top: -1px; +#javascript input[type=checkbox] { + position: relative; + top: -1px; + display: inline; + margin-left: 6px; } diff --git a/docs/components.html b/docs/components.html index e88bd777c..83a024456 100644 --- a/docs/components.html +++ b/docs/components.html @@ -958,10 +958,10 @@
 <ul class="pager">
-  <li>
+  <li class="previous">
     <a href="#">&larr; Older</a>
   </li>
-  <li>
+  <li class="next">
     <a href="#">Newer &rarr;</a>
   </li>
 </ul>
diff --git a/docs/index.html b/docs/index.html
index cb924bae6..736352b43 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -119,7 +119,6 @@
             

Download on GitHub Get started → - Currently v2.0.0

@@ -145,10 +144,10 @@
  • Changelog
  • ·
  • - +
  • - +
  • Emphasis, address, and abbreviation

    -
    Label
    +
    @@ -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 @@ -
    Name
    +
    diff --git a/docs/index.html b/docs/index.html index c30417c8f..ce56a04ef 100644 --- a/docs/index.html +++ b/docs/index.html @@ -267,7 +267,7 @@ ================================================== -->

    Get started in no time.

    -
    Button
    +
    - - - + + + @@ -569,14 +569,14 @@ -

    2. Striped table

    +

    2. {{_i}}Striped table{{/i}}

    -

    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.

    +

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

    +

    {{_i}}Note: Sprited tables use the :nth-child CSS selector and is not available in IE7-IE8.{{/i}}

     <table class="table table-striped">
    -  ...
    +  …
     </table>
    @@ -584,9 +584,9 @@
    - - - + + + @@ -614,13 +614,13 @@ -

    3. Bordered table

    +

    3. {{_i}}Bordered table{{/i}}

    -

    Add borders around the entire table and rounded corners for aesthetic purposes.

    +

    {{_i}}Add borders around the entire table and rounded corners for aesthetic purposes.{{/i}}

     <table class="table table-bordered">
    -  ...
    +  …
     </table>
    @@ -628,9 +628,9 @@
    - - - + + + @@ -662,13 +662,13 @@ -

    4. Condensed table

    +

    4. {{_i}}Condensed table{{/i}}

    -

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

    +

    {{_i}}Make your tables more compact by adding the .table-condensed class to cut table cell padding in half (from 8px to 4px).{{/i}}

     <table class="table table-condensed">
    -  ...
    +  …
     </table>
    @@ -676,9 +676,9 @@
    - - - + + + @@ -707,10 +707,10 @@ -

    5. Striped table w/ TableSorter.js

    +

    5. {{_i}}Striped table w/ TableSorter.js{{/i}}

    -

    Include the jQuery Tablesorter plugin and automaically get clear styles for sorted columns.

    +

    {{_i}}Include the jQuery Tablesorter plugin and automatically get clear styles for sorted columns.{{/i}}

     <script src="jquery.tablesorter.js"></script>
     <script >
    @@ -722,7 +722,7 @@
       });
     </script>
     <table class="table table-striped">
    -  ...
    +  …
     </table>
    @@ -730,9 +730,9 @@
    - - - + + + @@ -762,14 +762,14 @@
    diff --git a/docs/javascript.html b/docs/javascript.html index a132a4011..fb854d281 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -284,7 +284,7 @@

    Call the modal via javascript:

    $('#myModal').modal(options)

    Options

    - +
    @@ -349,7 +349,7 @@ $('#myModal').modal({
    $('#myModal').modal('hide')

    Events

    Bootstrap's modal class exposes a few events for hooking into modal functionality.

    -
    Name
    +
    @@ -666,7 +666,7 @@ $('#myModal').on('hidden', function () { </script>

    Events

    -
    Event
    +
    @@ -719,7 +719,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

    Trigger the tooltip via javascript:

    $('#example').tooltip(options)

    Options

    -
    Event
    +
    @@ -813,7 +813,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

    Enable popovers via javascript:

    $('#example').popover(options)

    Options

    -
    Name
    +
    @@ -933,7 +933,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
    $(".alert-message").alert('close')

    Events

    Bootstrap's alert class exposes a few events for hooking into alert functionality.

    -
    Name
    +
    @@ -976,7 +976,7 @@ $('#my-alert').bind('closed', function () {

    Example uses

    Use the buttons plugin for states and toggles.

    -
    Event
    +
    @@ -1125,7 +1125,7 @@ $('#my-alert').bind('closed', function () {

    Enable via javascript:

    $(".collapse").collapse()

    Options

    -
    Stateful
    +
    @@ -1175,7 +1175,7 @@ $('#myCollapsible').collapse({

    Bootstrap's collapse class exposes a few events for hooking into collapse functionality.

    -
    Name
    +
    @@ -1261,7 +1261,7 @@ $('#myCollapsible').on('hidden', function () {

    Call via javascript:

    $('.carousel').carousel()

    Options

    -
    Event
    +
    @@ -1310,7 +1310,7 @@ $('.myCarousel').carousel({

    Cycles to the next item.

    Events

    Bootstrap's modal class exposes a few events for hooking into modal functionality.

    -
    Name
    +
    @@ -1358,7 +1358,7 @@ $('.myCarousel').carousel({

    Call the typeahead via javascript:

    $('.typeahead').typeahead()

    Options

    -
    Event
    +
    diff --git a/docs/less.html b/docs/less.html index 6e43d95bd..09ff3e8e1 100644 --- a/docs/less.html +++ b/docs/less.html @@ -160,7 +160,7 @@

    Hyperlinks

    -
    Name
    +
    @@ -185,7 +185,7 @@

    Grayscale colors

    -
    Variable
    +
    @@ -216,7 +216,7 @@

    Accent colors

    -
    @black
    +
    @@ -254,7 +254,7 @@

    Grid system

    -
    @blue
    +
    @@ -277,7 +277,7 @@

    Typography

    -
    @gridColumns
    +
    @@ -302,7 +302,7 @@

    Visuals

    -
    @baseFontSize
    +
    @@ -453,7 +453,7 @@

    Compiling Less

    After modifying the .less files in /lib/, you'll need to recompile them in order to regenerate the bootstrap-*.*.*.css and bootstrap-*.*.*.min.css files. If you're submitting a pull request to GitHub, you must always recompile.

    Ways to compile

    -
    @primaryButtonColor
    +
    diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 77b94d8ce..f068c837c 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -223,7 +223,7 @@

    Grid customization

    -
    Method
    +
    @@ -335,7 +335,7 @@

    Supported devices

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

    -
    Variable
    +
    -- cgit v1.2.3 From 9c940784153257efcadc1aa420c57caa86e664bf Mon Sep 17 00:00:00 2001 From: Scott Watermasysk Date: Wed, 18 Jan 2012 14:53:59 -0500 Subject: Added missing 'data-dismiss="modal"' on the first example model source. --- docs/javascript.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/javascript.html b/docs/javascript.html index fb854d281..8accce210 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -240,7 +240,7 @@
    -
    +

    @fat

    Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat. @@ -576,11 +576,30 @@ $('#myModal').on('hidden', function () {


    Using bootstrap-scrollspy.js

    Call the scrollspy via javascript:

    -
    $('#navbar').dropdown()
    +
    $('#navbar').scrollspy()

    Markup

    To easily add scrollspy behavior to your topbar navigation, just add data-spy="scroll" to the element you want to spy on (most typically this would be the body).

    <body data-spy="scroll" >...</body>

    Notice Navbar anchor tags must have resolvable id targets. For example, a <a href="#home">home</a> must correspond to something in the dom like <div id="home"></div>. +

    Options

    +
    Label
    + + + + + + + + + + + + + + + + +
    Nametypedefaultdescription
    offsetnumber10Pixels to offset from top when calculating position of scroll.
    -- cgit v1.2.3 From 373a54187ed5d1f5d00d725e6ef6b84d506f07a8 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 21 Jan 2012 23:02:29 -0800 Subject: add ability to cycle carousel to a particular frame --- docs/javascript.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs') diff --git a/docs/javascript.html b/docs/javascript.html index 1b8af662a..7f589de4c 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1323,6 +1323,8 @@ $('.myCarousel').carousel({

    Cycles through the carousel items from left to right.

    .carousel('pause')

    Stops the carousel from cycling through items.

    +

    .carousel(number)

    +

    Cycles the carousel to a particular frame (0 based, similar to an array).

    .carousel('prev')

    Cycles to the previous item.

    .carousel('next')

    -- cgit v1.2.3 From c3625ebb238edbfc4b352a97b964727a919b8599 Mon Sep 17 00:00:00 2001 From: Chris Gunther Date: Sun, 22 Jan 2012 11:46:44 -0500 Subject: Move placement of ID in docs example for dropdowns The ID specified by an href or data-target attribute should match the li.dropdown, not the ul.dropdown-menu --- docs/javascript.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/javascript.html b/docs/javascript.html index 7f589de4c..9c7b21779 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -489,12 +489,12 @@ $('#myModal').on('hidden', function () {
     <ul class="nav pills">
       <li class="active"><a href="#">Regular link</a></li>
    -  <li class="dropdown">
    +  <li class="dropdown" id="menu1">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#menu1">
           Dropdown
           <b class="caret"></b>
         </a>
    -    <ul id="menu1" class="dropdown-menu">
    +    <ul class="dropdown-menu">
           <li><a href="#">Action</a></li>
           <li><a href="#">Another action</a></li>
           <li><a href="#">Something else here</a></li>
    -- 
    cgit v1.2.3
    
    
    From 0523c053a79430b3dab775fab2d572841f743c5a Mon Sep 17 00:00:00 2001
    From: Olivier Laviale 
    Date: Sun, 22 Jan 2012 21:45:20 +0100
    Subject: Fixed typo
    
    ---
     docs/components.html | 2 +-
     1 file changed, 1 insertion(+), 1 deletion(-)
     mode change 100644 => 100755 docs/components.html
    
    (limited to 'docs')
    
    diff --git a/docs/components.html b/docs/components.html
    old mode 100644
    new mode 100755
    index 7d0593874..984e8c76d
    --- a/docs/components.html
    +++ b/docs/components.html
    @@ -1128,7 +1128,7 @@
           

    Rewritten base class

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

    Single alert message

    -

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

    +

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


    Goes great with javascript

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

    -- 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') 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 ++++++++++------------------------------------ docs/components.html | 80 +++++++++++++------------------------------------ docs/index.html | 69 ++++++------------------------------------ docs/javascript.html | 83 ++++++++++++++------------------------------------- docs/less.html | 69 ++++++------------------------------------ docs/scaffolding.html | 74 +++++++++------------------------------------ 6 files changed, 91 insertions(+), 360 deletions(-) (limited to 'docs') 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.

    +
    diff --git a/docs/components.html b/docs/components.html index 984e8c76d..47efee5ac 100755 --- a/docs/components.html +++ b/docs/components.html @@ -34,71 +34,20 @@ Bootstrap @@ -112,6 +61,17 @@

    Components

    Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.

    +
    diff --git a/docs/index.html b/docs/index.html index ce56a04ef..eee32e0d4 100644 --- a/docs/index.html +++ b/docs/index.html @@ -35,71 +35,20 @@ Bootstrap diff --git a/docs/javascript.html b/docs/javascript.html index 6a240c4d4..0a0a0c9ef 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -35,71 +35,20 @@ Bootstrap @@ -112,6 +61,20 @@

    Javascript for Bootstrap

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

    diff --git a/docs/less.html b/docs/less.html index 09ff3e8e1..0348c0caf 100644 --- a/docs/less.html +++ b/docs/less.html @@ -34,71 +34,20 @@ Bootstrap diff --git a/docs/scaffolding.html b/docs/scaffolding.html index f068c837c..4a27104c3 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -34,71 +34,20 @@ Bootstrap @@ -112,6 +61,11 @@

    Scaffolding

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

    +
    -- cgit v1.2.3 From ea8f5883fd58ff5e356944e4a93543c05abf2220 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 23 Jan 2012 12:04:48 -0800 Subject: clean up subnav aesthetics --- docs/assets/css/docs.css | 34 ++++++++++++++++++++++++++++++++-- docs/components.html | 4 ++-- 2 files changed, 34 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 416b1830c..e7714fd5c 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -115,8 +115,8 @@ section { ------------------------- */ /* supporting docs pages */ .subhead { - padding-bottom: 14px; - border-bottom: 3px solid #e5e5e5; + padding-bottom: 0; + border-bottom: 0; } .subhead h1, .subhead p { @@ -126,6 +126,36 @@ section { font-size: 45px; } +/* Subnav */ +.subhead .nav { + padding: 0 10px; + background-color: #eeeeee; /* Old browsers */ + background-repeat: repeat-x; /* Repeat the gradient */ + background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */ + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(100%,#eeeeee)); /* Chrome,Safari4+ */ + background-image: -webkit-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Chrome 10+,Safari 5.1+ */ + background-image: -ms-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* IE10+ */ + background-image: -o-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Opera 11.10+ */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */ + background-image: linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* W3C */ + border: 1px solid #eee; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.subhead .nav a { + margin: 0; + padding-top: 11px; + padding-bottom: 11px; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.subhead .nav .active a { + background-color: #fff; + color: #333; +} + /* Quick links -------------------------------------------------- */ diff --git a/docs/components.html b/docs/components.html index 47efee5ac..8cd76bedc 100755 --- a/docs/components.html +++ b/docs/components.html @@ -63,13 +63,13 @@

    Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.

    -- cgit v1.2.3 From 1954cf001926a94f7a4d51f16beaf9f2ba671d13 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 23 Jan 2012 13:46:26 -0800 Subject: comment in forms' --- docs/assets/css/docs.css | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index e7714fd5c..69d9dac56 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -448,6 +448,7 @@ h2 + .row { margin: -18px 0 27px; font-size: 18px; font-weight: 300; + line-height: 24px; color: #999; text-align: center; } @@ -563,6 +564,18 @@ form.well { margin: 0 auto 10px; } + /* Subnav */ + .subhead .nav { + padding: 0; + background: none; + } + .subhead .nav > li { + float: none; + } + .subhead .nav li + li a { + border-top: 1px solid #eee; + } + /* Don't space out quick links so much */ .quick-links { margin: 40px 0 0; -- 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/assets/js/application.js | 87 +- docs/base-css.html | 61 +- docs/build/index.js | 27 + docs/build/node_modules/.bin/hulk | 1 + docs/build/node_modules/hogan.js/.git_ignore | 1 + docs/build/node_modules/hogan.js/.gitmodules | 3 + docs/build/node_modules/hogan.js/LICENSE | 177 ++ docs/build/node_modules/hogan.js/Makefile | 62 + docs/build/node_modules/hogan.js/README.md | 93 + docs/build/node_modules/hogan.js/bin/hulk | 93 + docs/build/node_modules/hogan.js/lib/compiler.js | 348 +++ docs/build/node_modules/hogan.js/lib/hogan.js | 20 + docs/build/node_modules/hogan.js/lib/template.js | 233 ++ docs/build/node_modules/hogan.js/package.json | 20 + .../node_modules/hogan.js/test/html/list.html | 8 + docs/build/node_modules/hogan.js/test/index.html | 13 + docs/build/node_modules/hogan.js/test/index.js | 848 +++++++ docs/build/node_modules/hogan.js/test/mustache.js | 90 + docs/build/node_modules/hogan.js/test/spec.js | 77 + docs/build/node_modules/hogan.js/test/spec/Changes | 31 + .../node_modules/hogan.js/test/spec/README.md | 65 + .../build/node_modules/hogan.js/test/spec/Rakefile | 27 + .../node_modules/hogan.js/test/spec/TESTING.md | 46 + .../hogan.js/test/spec/specs/comments.json | 1 + .../hogan.js/test/spec/specs/comments.yml | 103 + .../hogan.js/test/spec/specs/delimiters.json | 1 + .../hogan.js/test/spec/specs/delimiters.yml | 158 ++ .../hogan.js/test/spec/specs/interpolation.json | 1 + .../hogan.js/test/spec/specs/interpolation.yml | 230 ++ .../hogan.js/test/spec/specs/inverted.json | 1 + .../hogan.js/test/spec/specs/inverted.yml | 193 ++ .../hogan.js/test/spec/specs/partials.json | 1 + .../hogan.js/test/spec/specs/partials.yml | 109 + .../hogan.js/test/spec/specs/sections.json | 1 + .../hogan.js/test/spec/specs/sections.yml | 256 +++ .../hogan.js/test/spec/specs/~lambdas.json | 1 + .../hogan.js/test/spec/specs/~lambdas.yml | 149 ++ .../hogan.js/test/templates/list.mustache | 8 + docs/build/node_modules/hogan.js/tools/release.js | 74 + .../node_modules/hogan.js/tools/web_templates.js | 32 + .../build/node_modules/hogan.js/web/1.0.0/hogan.js | 500 ++++ .../node_modules/hogan.js/web/1.0.0/hogan.min.js | 14 + .../hogan.js/web/builds/1.0.0/hogan.js | 500 ++++ .../hogan.js/web/builds/1.0.0/hogan.min.js | 14 + .../hogan.js/web/builds/1.0.3/hogan.js | 545 +++++ .../hogan.js/web/builds/1.0.3/hogan.min.js | 5 + .../hogan.js/web/builds/1.0.5/hogan-1.0.5.amd.js | 576 +++++ .../web/builds/1.0.5/hogan-1.0.5.common.js | 576 +++++ .../hogan.js/web/builds/1.0.5/hogan-1.0.5.js | 572 +++++ .../web/builds/1.0.5/hogan-1.0.5.min.amd.js | 5 + .../web/builds/1.0.5/hogan-1.0.5.min.common.js | 5 + .../hogan.js/web/builds/1.0.5/hogan-1.0.5.min.js | 5 + .../web/builds/1.0.5/hogan-1.0.5.min.mustache.js | 5 + .../web/builds/1.0.5/hogan-1.0.5.mustache.js | 619 +++++ .../hogan.js/web/builds/1.0.5/template-1.0.5.js | 233 ++ .../web/builds/1.0.5/template-1.0.5.min.js | 5 + docs/build/node_modules/hogan.js/web/favicon.ico | Bin 0 -> 1150 bytes .../node_modules/hogan.js/web/images/logo.png | Bin 0 -> 3389 bytes .../node_modules/hogan.js/web/images/noise.png | Bin 0 -> 10378 bytes .../hogan.js/web/images/small-hogan-icon.png | Bin 0 -> 472 bytes .../node_modules/hogan.js/web/images/stripes.png | Bin 0 -> 115 bytes .../node_modules/hogan.js/web/index.html.mustache | 139 ++ .../hogan.js/web/stylesheets/layout.css | 206 ++ .../hogan.js/web/stylesheets/skeleton.css | 236 ++ .../node_modules/hogan.js/wrappers/amd.js.mustache | 21 + .../hogan.js/wrappers/common.js.mustache | 21 + .../node_modules/hogan.js/wrappers/js.mustache | 17 + .../hogan.js/wrappers/mustache.js.mustache | 64 + docs/build/package.json | 6 + docs/components.html | 51 +- docs/index.html | 402 ++-- docs/javascript.html | 2426 ++++++++++---------- docs/less.html | 41 +- docs/scaffolding.html | 53 +- docs/templates/layout.mustache | 144 ++ docs/templates/pages/base-css.mustache | 1427 ++++++++++++ docs/templates/pages/components.mustache | 1176 ++++++++++ docs/templates/pages/index.mustache | 188 ++ docs/templates/pages/javascript.mustache | 1299 +++++++++++ docs/templates/pages/less.mustache | 406 ++++ docs/templates/pages/scaffolding.mustache | 311 +++ docs/templates/pages/upgrading.mustache | 86 + docs/upgrading.html | 60 +- 83 files changed, 15148 insertions(+), 1561 deletions(-) create mode 100644 docs/build/index.js create mode 120000 docs/build/node_modules/.bin/hulk create mode 100644 docs/build/node_modules/hogan.js/.git_ignore create mode 100644 docs/build/node_modules/hogan.js/.gitmodules create mode 100644 docs/build/node_modules/hogan.js/LICENSE create mode 100644 docs/build/node_modules/hogan.js/Makefile create mode 100644 docs/build/node_modules/hogan.js/README.md create mode 100755 docs/build/node_modules/hogan.js/bin/hulk create mode 100644 docs/build/node_modules/hogan.js/lib/compiler.js create mode 100644 docs/build/node_modules/hogan.js/lib/hogan.js create mode 100644 docs/build/node_modules/hogan.js/lib/template.js create mode 100644 docs/build/node_modules/hogan.js/package.json create mode 100644 docs/build/node_modules/hogan.js/test/html/list.html create mode 100644 docs/build/node_modules/hogan.js/test/index.html create mode 100644 docs/build/node_modules/hogan.js/test/index.js create mode 100644 docs/build/node_modules/hogan.js/test/mustache.js create mode 100644 docs/build/node_modules/hogan.js/test/spec.js create mode 100644 docs/build/node_modules/hogan.js/test/spec/Changes create mode 100644 docs/build/node_modules/hogan.js/test/spec/README.md create mode 100644 docs/build/node_modules/hogan.js/test/spec/Rakefile create mode 100644 docs/build/node_modules/hogan.js/test/spec/TESTING.md create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/comments.json create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/comments.yml create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/delimiters.json create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/delimiters.yml create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/interpolation.json create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/interpolation.yml create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/inverted.json create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/inverted.yml create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/partials.json create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/partials.yml create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/sections.json create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/sections.yml create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/~lambdas.json create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/~lambdas.yml create mode 100644 docs/build/node_modules/hogan.js/test/templates/list.mustache create mode 100644 docs/build/node_modules/hogan.js/tools/release.js create mode 100644 docs/build/node_modules/hogan.js/tools/web_templates.js create mode 100644 docs/build/node_modules/hogan.js/web/1.0.0/hogan.js create mode 100644 docs/build/node_modules/hogan.js/web/1.0.0/hogan.min.js create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.0/hogan.js create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.0/hogan.min.js create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.3/hogan.js create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.3/hogan.min.js create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.5/hogan-1.0.5.amd.js create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.5/hogan-1.0.5.common.js create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.5/hogan-1.0.5.js create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.5/hogan-1.0.5.min.amd.js create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.5/hogan-1.0.5.min.common.js create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.5/hogan-1.0.5.min.js create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.5/hogan-1.0.5.min.mustache.js create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.5/hogan-1.0.5.mustache.js create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.5/template-1.0.5.js create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.5/template-1.0.5.min.js create mode 100644 docs/build/node_modules/hogan.js/web/favicon.ico create mode 100644 docs/build/node_modules/hogan.js/web/images/logo.png create mode 100644 docs/build/node_modules/hogan.js/web/images/noise.png create mode 100644 docs/build/node_modules/hogan.js/web/images/small-hogan-icon.png create mode 100644 docs/build/node_modules/hogan.js/web/images/stripes.png create mode 100755 docs/build/node_modules/hogan.js/web/index.html.mustache create mode 100755 docs/build/node_modules/hogan.js/web/stylesheets/layout.css create mode 100755 docs/build/node_modules/hogan.js/web/stylesheets/skeleton.css create mode 100644 docs/build/node_modules/hogan.js/wrappers/amd.js.mustache create mode 100644 docs/build/node_modules/hogan.js/wrappers/common.js.mustache create mode 100644 docs/build/node_modules/hogan.js/wrappers/js.mustache create mode 100644 docs/build/node_modules/hogan.js/wrappers/mustache.js.mustache create mode 100644 docs/build/package.json mode change 100755 => 100644 docs/components.html create mode 100644 docs/templates/layout.mustache create mode 100644 docs/templates/pages/base-css.mustache create mode 100644 docs/templates/pages/components.mustache create mode 100644 docs/templates/pages/index.mustache create mode 100644 docs/templates/pages/javascript.mustache create mode 100644 docs/templates/pages/less.mustache create mode 100644 docs/templates/pages/scaffolding.mustache create mode 100644 docs/templates/pages/upgrading.mustache (limited to 'docs') diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index ba5a26947..93f7ea719 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -117,37 +117,66 @@ $(function(){ }) +// JS for javascript demos +$(function () { + // tooltip demo + $('.tooltip-demo.well').tooltip({ + selector: "a[rel=tooltip]" + }) + $('.tooltip-test').tooltip() + + // popover demo + $("a[rel=popover]") + .popover() + .click(function(e) { + e.preventDefault() + }) + + // button state demo + $('#fat-btn') + .click(function () { + var btn = $(this) + btn.button('loading') + setTimeout(function () { + btn.button('reset') + }, 3000) + }) + + // carousel demo + $('#myCarousel').carousel() +}) + // Modified from the original jsonpi https://github.com/benvinegar/jquery-jsonpi // by the talented Ben Vinegar !function($) { - $.ajaxTransport('jsonpi', function(opts, originalOptions, jqXHR) { - var url = opts.url; - - return { - send: function(_, completeCallback) { - var name = 'jQuery_iframe_' + jQuery.now(), - iframe, form; - - iframe = $(' - -
  • - -
  • + +
  • ·
  • + +
  • + +
  • + -
    -

    Built with Bootstrap.

    - - +
    +

    Built with Bootstrap.

    + + -

    Designed for everyone, everywhere.

    - -
    -
    - -

    Built for and by nerds

    -

    Like you, we love building awesome products on the web. We love it so much, we decided to help people just like us do it easier, better, and faster. Bootstrap is built for you.

    -
    -
    - -

    For all skill levels

    -

    Bootstrap is designed to help people of all skill level—designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.

    -
    -
    - -

    Cross-everything

    -

    Originally built with only modern browsers in mind, Bootstrap has evolved to include support for all major browsers (even IE7!) and, with Bootstrap 2, tablets and smartphones, too.

    -
    -
    -
    -
    - -

    12-column grid

    -

    Grid systems aren't everything, but having a durable and flexible one at the core of your work can make development much simpler. Use our built-in grid classes or roll your own.

    -
    -
    - -

    Responsive design

    -

    With Bootstrap 2, we've gone fully responsive. Our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.

    -
    -
    - -

    Styleguide docs

    -

    Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.

    -
    -
    -
    -
    - -

    Growing library

    -

    Despite being only 7kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.

    -
    -
    - -

    Custom jQuery plugins

    -

    What good is an awesome design component without easy-to-use, proper, and extensible interactions? With Bootstrap, you get custom-built jQuery plugins to bring your projects to life.

    -
    -
    - -

    Built on LESS

    -

    Where vanilla CSS falters, LESS excels. Variables, nesting, operations, and mixins in LESS makes coding CSS faster and more efficient with minimal overhead.

    -
    -
    -
    -
    - -

    HTML5

    -

    Built to support new HTML5 elements and syntax.

    -
    -
    - -

    CSS3

    -

    Progressively enhanced components for ultimate style.

    -
    -
    - -

    Open-source

    -

    Built for and maintained by the community via GitHub.

    -
    -
    - -

    Made at Twitter

    -

    Brought to you by an experienced engineer and designer.

    -
    -
    - - - -

    Get started in no time.

    - - - - - - - - - -
    -

    Hotlink the CSS

    -

    For the quickest and easiest start, just copy this snippet into your webpage.

    - - - -
    -

    Use it with LESS

    -

    A fan of using LESS? No problem, just clone the repo and add these lines:

    -
    - -
    -
    -

    Fork on GitHub

    -

    Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.

    -

    Bootstrap on GitHub »

    -

    Currently v2.0.0

    -
    -
    -
    +

    Designed for everyone, everywhere.

    + +
    +
    + +

    Built for and by nerds

    +

    Like you, we love building awesome products on the web. We love it so much, we decided to help people just like us do it easier, better, and faster. Bootstrap is built for you.

    +
    +
    + +

    For all skill levels

    +

    Bootstrap is designed to help people of all skill level—designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.

    +
    +
    + +

    Cross-everything

    +

    Originally built with only modern browsers in mind, Bootstrap has evolved to include support for all major browsers (even IE7!) and, with Bootstrap 2, tablets and smartphones, too.

    +
    +
    +
    +
    + +

    12-column grid

    +

    Grid systems aren't everything, but having a durable and flexible one at the core of your work can make development much simpler. Use our built-in grid classes or roll your own.

    +
    +
    + +

    Responsive design

    +

    With Bootstrap 2, we've gone fully responsive. Our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.

    +
    +
    + +

    Styleguide docs

    +

    Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.

    +
    +
    +
    +
    + +

    Growing library

    +

    Despite being only 7kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.

    +
    +
    + +

    Custom jQuery plugins

    +

    What good is an awesome design component without easy-to-use, proper, and extensible interactions? With Bootstrap, you get custom-built jQuery plugins to bring your projects to life.

    +
    +
    + +

    Built on LESS

    +

    Where vanilla CSS falters, LESS excels. Variables, nesting, operations, and mixins in LESS makes coding CSS faster and more efficient with minimal overhead.

    +
    +
    +
    +
    + +

    HTML5

    +

    Built to support new HTML5 elements and syntax.

    +
    +
    + +

    CSS3

    +

    Progressively enhanced components for ultimate style.

    +
    +
    + +

    Open-source

    +

    Built for and maintained by the community via GitHub.

    +
    +
    + +

    Made at Twitter

    +

    Brought to you by an experienced engineer and designer.

    +
    +
    + +

    Get started in no time.

    + + + + + + + + + +
    +

    Hotlink the CSS

    +

    For the quickest and easiest start, just copy this snippet into your webpage.

    +
    + +
    +
    +

    Use it with LESS

    +

    A fan of using LESS? No problem, just clone the repo and add these lines:

    +
    + +
    +
    +

    Fork on GitHub

    +

    Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.

    +

    Bootstrap on GitHub »

    +

    Currently v2.0.0

    +
    + + + + - - - + + + + + + + + + + + + + + + diff --git a/docs/javascript.html b/docs/javascript.html index 6a240c4d4..fda3ae32b 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -25,7 +25,7 @@ - + @@ -34,8 +34,8 @@
    - -
    -

    Javascript for Bootstrap

    -

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

    + +
    +

    Javascript for Bootstrap

    +

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

    - -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    -
    -
    - Download Source - - - - + + +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    + Select/Unselect All Plugins +

    Note: All plugins require the latest version of jQuery to be included.

    +
    + + + + +
    + +
    +
    +

    About modals

    +

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

    + Download file +
    +
    +

    Static example

    +

    Below is a statically rendered modal.

    +
    + -
    -
    - Select/Unselect All Plugins -

    Note: All plugins require the latest version of jQuery to be included.

    -
    - +
    + +

    Live demo

    +

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

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

    Using bootstrap-dropdown.js

    -

    Call the dropdowns via javascript:

    -
    $('.dropdown-toggle').dropdown()
    -

    Markup

    -

    To quickly add dropdown functionality to any element just add data-toggle="dropdown" and any valid bootstrap dropdown will automatically be activated.

    -

    Notice For added control and flexibility, optionally specify a data-target="#fat" or href="#fat" - this allows you to target specific dropdowns.

    +

    Using bootstrap-dropdown.js

    +

    Call the dropdowns via javascript:

    +
    $('.dropdown-toggle').dropdown()
    +

    Markup

    +

    To quickly add dropdown functionality to any element just add data-toggle="dropdown" and any valid bootstrap dropdown will automatically be activated.

    +

    Notice For added control and flexibility, optionally specify a data-target="#fat" or href="#fat" - this allows you to target specific dropdowns.

     <ul class="nav pills">
    -  <li class="active"><a href="#">Regular link</a></li>
    -  <li class="dropdown" id="menu1">
    -    <a class="dropdown-toggle" data-toggle="dropdown" href="#menu1">
    -      Dropdown
    -      <b class="caret"></b>
    -    </a>
    -    <ul class="dropdown-menu">
    -      <li><a href="#">Action</a></li>
    -      <li><a href="#">Another action</a></li>
    -      <li><a href="#">Something else here</a></li>
    -      <li class="divider"></li>
    -      <li><a href="#">Separated link</a></li>
    -    </ul>
    -  </li>
    -  ...
    +<li class="active"><a href="#">Regular link</a></li>
    +<li class="dropdown" id="menu1">
    +<a class="dropdown-toggle" data-toggle="dropdown" href="#menu1">
    +  Dropdown
    +  <b class="caret"></b>
    +</a>
    +<ul class="dropdown-menu">
    +  <li><a href="#">Action</a></li>
    +  <li><a href="#">Another action</a></li>
    +  <li><a href="#">Something else here</a></li>
    +  <li class="divider"></li>
    +  <li><a href="#">Separated link</a></li>
    +</ul>
    +</li>
    +...
     </ul>
    -

    Methods

    -

    $().dropdown()

    -

    - A programatic api for activating menus for a given navbar or tabbed navigation. -

    - - - +

    Methods

    +

    $().dropdown()

    +

    + A programatic api for activating menus for a given navbar or tabbed navigation. +

    + + + - -
    - -
    -
    -

    The ScrollSpy plugin is for automatically updating nav targets based on scroll position.

    - Download file -
    -
    -

    Example navbar with scrollspy

    -

    Scroll the area below and watch the navigation update. The dropdown sub items will be highlighted as well. Try it!

    - -
    +
    +

    @fat

    +

    + Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat. +

    +

    @mdo

    +

    + Veniam marfa mustache skateboard, adipisicing fugiat velit pitchfork beard. Freegan beard aliqua cupidatat mcsweeney's vero. Cupidatat four loko nisi, ea helvetica nulla carles. Tattooed cosby sweater food truck, mcsweeney's quis non freegan vinyl. Lo-fi wes anderson +1 sartorial. Carles non aesthetic exercitation quis gentrify. Brooklyn adipisicing craft beer vice keytar deserunt. +

    +

    one

    +

    + Occaecat commodo aliqua delectus. Fap craft beer deserunt skateboard ea. Lomo bicycle rights adipisicing banh mi, velit ea sunt next level locavore single-origin coffee in magna veniam. High life id vinyl, echo park consequat quis aliquip banh mi pitchfork. Vero VHS est adipisicing. Consectetur nisi DIY minim messenger bag. Cred ex in, sustainable delectus consectetur fanny pack iphone. +

    +

    two

    +

    + In incididunt echo park, officia deserunt mcsweeney's proident master cleanse thundercats sapiente veniam. Excepteur VHS elit, proident shoreditch +1 biodiesel laborum craft beer. Single-origin coffee wayfarers irure four loko, cupidatat terry richardson master cleanse. Assumenda you probably haven't heard of them art party fanny pack, tattooed nulla cardigan tempor ad. Proident wolf nesciunt sartorial keffiyeh eu banh mi sustainable. Elit wolf voluptate, lo-fi ea portland before they sold out four loko. Locavore enim nostrud mlkshk brooklyn nesciunt. +

    +

    three

    +

    + Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat. +

    +

    Keytar twee blog, culpa messenger bag marfa whatever delectus food truck. Sapiente synth id assumenda. Locavore sed helvetica cliche irony, thundercats you probably haven't heard of them consequat hoodie gluten-free lo-fi fap aliquip. Labore elit placeat before they sold out, terry richardson proident brunch nesciunt quis cosby sweater pariatur keffiyeh ut helvetica artisan. Cardigan craft beer seitan readymade velit. VHS chambray laboris tempor veniam. Anim mollit minim commodo ullamco thundercats. +

    +
    +
    +

    Using bootstrap-scrollspy.js

    +

    Call the scrollspy via javascript:

    +
    $('#navbar').scrollspy()
    +

    Markup

    +

    To easily add scrollspy behavior to your topbar navigation, just add data-spy="scroll" to the element you want to spy on (most typically this would be the body). +

    <body data-spy="scroll" >...</body>
    +

    Notice Navbar anchor tags must have resolvable id targets. For example, a <a href="#home">home</a> must correspond to something in the dom like <div id="home"></div>. +

    Options

    + + + + + + + + + + + + + + + + + +
    Nametypedefaultdescription
    offsetnumber10Pixels to offset from top when calculating position of scroll.
    + + + - -
    - -
    -
    -

    This plugin adds quick, dynamic tab and pill functionality for transitioning through local content.

    - Download file -
    -
    -

    Example tabs

    -

    Click the tabs below to toggle between hidden panes, even via dropdown menus.

    -
    +
    + + + +
    + +
    +
    +

    About Tooltips

    +

    Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, uss css3 for animations, and data-attributes for local title storage.

    + Download file +
    +
    +

    Example use of Tooltips

    +

    Hover over the links below to see tooltips:

    +
    +

    Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral. +

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

    About popovers

    +

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

    +

    * Requires Tooltip to be included

    + Download file +
    +
    +

    Example hover popover

    +

    Hover over the button to trigger the popover.

    + -
    -
    -

    About popovers

    -

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

    -

    * Requires Tooltip to be included

    - Download file -
    -
    -

    Example hover popover

    -

    Hover over the button to trigger the popover.

    - -
    -

    Using bootstrap-popover.js

    -

    Enable popovers via javascript:

    -
    $('#example').popover(options)
    -

    Options

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Nametypedefaultdescription
    animationbooleantrueapply a css fade transition to the tooltip
    placementstring'right'how to position the popover - top | bottom | left | right
    selectorstringfalseif a selector is provided, tooltip objects will be delegated to the specified targets
    triggerstring'hover'how tooltip is triggered - hover | focus | manual
    titlestring | function''default title value if `title` attribute isn't present
    contentstring | function''default content value if `data-content` attribute isn't present
    delaynumber | object0 -

    delay showing/hiding the popover (ms)

    -

    If a number is supplied, delay is applied to both hide/show

    -

    Object structure is: delay: { show: 500, hide: 100 }

    -
    -

    Notice Individual popover instance options can alternatively be specified through the use of data attributes.

    -

    Markup

    -

    - For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option. -

    -

    Methods

    -

    $().popover(options)

    -

    Initializes popovers for an element collection.

    -

    .popover('show')

    -

    Reveals an elements popover.

    -
    $('#element').popover('show')
    -

    .popover('hide')

    -

    Hides an elements popover.

    -
    $('#element').popover('hide')
    -
    +
    +

    Using bootstrap-popover.js

    +

    Enable popovers via javascript:

    +
    $('#example').popover(options)
    +

    Options

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Nametypedefaultdescription
    animationbooleantrueapply a css fade transition to the tooltip
    placementstring'right'how to position the popover - top | bottom | left | right
    selectorstringfalseif a selector is provided, tooltip objects will be delegated to the specified targets
    triggerstring'hover'how tooltip is triggered - hover | focus | manual
    titlestring | function''default title value if `title` attribute isn't present
    contentstring | function''default content value if `data-content` attribute isn't present
    delaynumber | object0 +

    delay showing/hiding the popover (ms)

    +

    If a number is supplied, delay is applied to both hide/show

    +

    Object structure is: delay: { show: 500, hide: 100 }

    +
    +

    Notice Individual popover instance options can alternatively be specified through the use of data attributes.

    +

    Markup

    +

    + For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option. +

    +

    Methods

    +

    $().popover(options)

    +

    Initializes popovers for an element collection.

    +

    .popover('show')

    +

    Reveals an elements popover.

    +
    $('#element').popover('show')
    +

    .popover('hide')

    +

    Hides an elements popover.

    +
    $('#element').popover('hide')
    +
    +
    +
    + + + + +
    + +
    +
    +

    About alerts

    +

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

    + Download +
    +
    +

    Example alerts

    +

    The alerts plugin works on regular alert messages, and block messages.

    +
    + × + Holy guacamole! Best check yo self, you’re not looking too good.
    -
    - - - - -
    -
    - - - - -
    - -
    -
    -

    About

    -

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

    - Download file -
    -
    -

    Example uses

    -

    Use the buttons plugin for states and toggles.

    - - - - - - - - - - - - - - - - - - - -
    Stateful - -
    Single toggle - -
    Checkbox -
    - - - -
    -
    Radio -
    - - - -
    -
    -
    -

    Using bootstrap-button.js

    -

    Enable buttons via javascript:

    -
    $('.tabs').button()
    -

    Markup

    -

    Data attributes are integral to the button plugin. Check out the example code below for the various markup types.

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

    About

    +

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

    + Download file +
    +
    +

    Example uses

    +

    Use the buttons plugin for states and toggles.

    + + + + + + + + + + + + + + + + + + + +
    Stateful + +
    Single toggle + +
    Checkbox +
    + + + +
    +
    Radio +
    + + + +
    +
    +
    +

    Using bootstrap-button.js

    +

    Enable buttons via javascript:

    +
    $('.tabs').button()
    +

    Markup

    +

    Data attributes are integral to the button plugin. Check out the example code below for the various markup types.

     <!-- Add data-toggle="button" to activate toggling on a single button -->
     <button class="btn" data-toggle="button">Single Toggle</button>
     
     <!-- Add data-toggle="buttons-checkbox" for checkbox style toggling on btn-group -->
     <div class="btn-group" data-toggle="buttons-checkbox">
    -  <button class="btn">Left</button>
    -  <button class="btn">Middle</button>
    -  <button class="btn">Right</button>
    +<button class="btn">Left</button>
    +<button class="btn">Middle</button>
    +<button class="btn">Right</button>
     </div>
     
     <!-- Add data-toggle="buttons-radio" for radio style toggling on btn-group -->
     <div class="btn-group" data-toggle="buttons-radio">
    -  <button class="btn">Left</button>
    -  <button class="btn">Middle</button>
    -  <button class="btn">Right</button>
    +<button class="btn">Left</button>
    +<button class="btn">Middle</button>
    +<button class="btn">Right</button>
     </div>
     
    -

    Methods

    -

    $().button('toggle')

    -

    Toggles push state. Gives btn the look that it's been activated.

    -

    Notice You can enable auto toggling of a button by using the data-toggle attribute.

    -
    <button class="btn" data-toggle="button" >...</button>
    -

    $().button('loading')

    -

    Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute data-loading-text. -

    -
    <button class="btn" data-loading-text="loading stuff..." >...</button>
    -

    - Notice Firefox persists the disabled state across page loads. A workaround for this is to use: autocomplete="off". More info can be found here. -

    -

    $().button('reset')

    -

    Resets button state - swaps text to original text.

    -

    $().button(string)

    -

    Resets button state - swaps text to any data defined text state.

    +

    Methods

    +

    $().button('toggle')

    +

    Toggles push state. Gives btn the look that it's been activated.

    +

    Notice You can enable auto toggling of a button by using the data-toggle attribute.

    +
    <button class="btn" data-toggle="button" >...</button>
    +

    $().button('loading')

    +

    Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute data-loading-text. +

    +
    <button class="btn" data-loading-text="loading stuff..." >...</button>
    +

    + Notice Firefox persists the disabled state across page loads. A workaround for this is to use: autocomplete="off". More info can be found here. +

    +

    $().button('reset')

    +

    Resets button state - swaps text to original text.

    +

    $().button(string)

    +

    Resets button state - swaps text to any data defined text state.

    <button class="btn" data-complete-text="finished!" >...</button>
     <script>
    -  $('.btn').button('complete')
    +$('.btn').button('complete')
     </script>
    -
    -
    -
    - - - - -
    - -
    -
    -

    About

    -

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

    - Download file -
    -
    -

    Example accordion

    -

    Using the collapse plugin, we built a simple accordion style widget:

    - -
    -
    - -
    -
    - Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS. -
    -
    +
    +
    +
    + + + + +
    + +
    +
    +

    About

    +

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

    + Download file +
    +
    +

    Example accordion

    +

    Using the collapse plugin, we built a simple accordion style widget:

    + +
    +
    + +
    +
    + Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
    -
    - -
    -
    - Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS. -
    -
    +
    +
    +
    + +
    +
    + Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
    -
    - -
    -
    - Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS. -
    -
    +
    +
    +
    + +
    +
    + Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
    +
    +
    - -
    -

    Using bootstrap-collapse.js

    -

    Enable via javascript:

    -
    $(".collapse").collapse()
    -

    Options

    - - - - - - - - - - - - - - - - - - - - - - - -
    Nametypedefaultdescription
    parentselectorfalseIf selector then all collapsible elements under the specified parent will be closed when this collasabile item is shown. (similar to traditional accordion behavior)
    togglebooleantrueToggles the collapsible element on invocation
    -

    Markup

    -

    Just add data-toggle="collapse" and a data-target to element to automatically assign control of a collapsible element. The data-target attribute accepts a css selector to apply the collapse to. Be sure to add the class collapse to the collapsible element. If you'd like it to default open, add the additional class in.

    -
    +      
    +      
    +

    Using bootstrap-collapse.js

    +

    Enable via javascript:

    +
    $(".collapse").collapse()
    +

    Options

    + + + + + + + + + + + + + + + + + + + + + + + +
    Nametypedefaultdescription
    parentselectorfalseIf selector then all collapsible elements under the specified parent will be closed when this collasabile item is shown. (similar to traditional accordion behavior)
    togglebooleantrueToggles the collapsible element on invocation
    +

    Markup

    +

    Just add data-toggle="collapse" and a data-target to element to automatically assign control of a collapsible element. The data-target attribute accepts a css selector to apply the collapse to. Be sure to add the class collapse to the collapsible element. If you'd like it to default open, add the additional class in.

    +
     <button class="btn danger" data-toggle="collapse" data-target="#demo">
    -  simple collapsible
    +simple collapsible
     </button>
     
     <div id="demo" class="collapse in"> … </div>
    -

    Notice To add accordion like group management to a collapsible control just add the additional data attribute data-parent="#selector". Refer to the demo below to see this in action.

    -

    Methods

    -

    .collapse(options)

    -

    Activates your content as a collapsible element. Accepts an optional options object. +

    Notice To add accordion like group management to a collapsible control just add the additional data attribute data-parent="#selector". Refer to the demo below to see this in action.

    +

    Methods

    +

    .collapse(options)

    +

    Activates your content as a collapsible element. Accepts an optional options object.

     $('#myCollapsible').collapse({
    -  toggle: false
    +toggle: false
     })
    -

    .collapse('toggle')

    -

    Toggles a collapsible element to shown or hidden.

    -

    .collapse('show')

    -

    Shows a collapsible element.

    -

    .collapse('hide')

    -

    Hides a collapsible element.

    -

    Events

    -

    - Bootstrap's collapse class exposes a few events for hooking into collapse functionality. -

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    EventDescription
    showThis event fires immediately when the show instance method is called.
    shownThis event is fired when a collapse element has been made visible to the user (will wait for css transitions to complete).
    hide - This event is fired immediately when the hide method has been called. -
    hiddenThis event is fired when a collapse element has been hidden from the user (will wait for css transitions to complete).
    +

    .collapse('toggle')

    +

    Toggles a collapsible element to shown or hidden.

    +

    .collapse('show')

    +

    Shows a collapsible element.

    +

    .collapse('hide')

    +

    Hides a collapsible element.

    +

    Events

    +

    + Bootstrap's collapse class exposes a few events for hooking into collapse functionality. +

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    EventDescription
    showThis event fires immediately when the show instance method is called.
    shownThis event is fired when a collapse element has been made visible to the user (will wait for css transitions to complete).
    hide + This event is fired immediately when the hide method has been called. +
    hiddenThis event is fired when a collapse element has been hidden from the user (will wait for css transitions to complete).
     $('#myCollapsible').on('hidden', function () {
    -  // do something ...
    +// do something ...
     })
    -
    -
    -
    - - - - - + + + + + - - - - -
    - + +
    + + + + +
    + +
    +
    +

    About

    +

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

    + Download file +
    +
    +

    Example

    +

    Start typing in the field below to show the typeahead results.

    +
    +
    -
    -
    -

    About

    -

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

    - Download file -
    -
    -

    Example

    -

    Start typing in the field below to show the typeahead results.

    -
    - -
    -
    -

    Using bootstrap-typeahead.js

    -

    Call the typeahead via javascript:

    -
    $('.typeahead').typeahead()
    -

    Options

    - - - - - - - - - - - - - - - - - -
    Nametypedefaultdescription
    itemsnumber8The max number of items to display in the dropdown.
    - -

    Markup

    -

    Add data attributes to register an element with typeahead functionality.

    +
    +

    Using bootstrap-typeahead.js

    +

    Call the typeahead via javascript:

    +
    $('.typeahead').typeahead()
    +

    Options

    + + + + + + + + + + + + + + + + + +
    Nametypedefaultdescription
    itemsnumber8The max number of items to display in the dropdown.
    + +

    Markup

    +

    Add data attributes to register an element with typeahead functionality.

     <input type="text" data-provide="typeahead">
     
    -
    -
    -
    - - - + + + + @@ -1438,34 +1437,5 @@ $('.myCarousel').carousel({ - diff --git a/docs/less.html b/docs/less.html index 09ff3e8e1..84f58f00d 100644 --- a/docs/less.html +++ b/docs/less.html @@ -7,7 +7,7 @@ - + @@ -18,10 +18,11 @@ - - - - + + + + + @@ -33,8 +34,8 @@ - - + + - + + - + + + + + + + + + + + + diff --git a/docs/scaffolding.html b/docs/scaffolding.html index f068c837c..7fdbea0ec 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -7,7 +7,7 @@ - + @@ -18,10 +18,11 @@ - - - - + + + + + @@ -33,7 +34,7 @@
    Bootstrap -
  • Icons by Glyphicons
  • -
  • Progress bars
  • -
  • Typeahead
  • -
  • +
  • Using LESS @@ -107,12 +108,13 @@
    - -
    -

    Scaffolding

    -

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

    -
    + + +
    +

    Scaffolding

    +

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

    +
    @@ -417,8 +419,6 @@
  • - - + + - + + - + + + + + + + + + + - diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache new file mode 100644 index 000000000..cc36a05ed --- /dev/null +++ b/docs/templates/layout.mustache @@ -0,0 +1,144 @@ + + + + + Bootstrap, from Twitter + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +{{>body}} + + + + +
    + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache new file mode 100644 index 000000000..3933c867d --- /dev/null +++ b/docs/templates/pages/base-css.mustache @@ -0,0 +1,1427 @@ + +
    +

    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.

    +
    + + + +
    + + +

    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

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

    + + + + + + + + + + + + + + + + + + + + +
    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 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.</p>
    +  <small>Someone famous</small>
    +</blockquote>
    +
    +
    +
    + +

    Example blockquotes

    +
    +
    +

    Default blockquotes are styled as such:

    +
    +

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

    + 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 in Body of work +
    +
    +
    + + + +

    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 class="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. +
    3. Consectetur adipiscing elit
    4. +
    5. Integer molestie lorem at massa
    6. +
    7. Facilisis in pretium nisl aliquet
    8. +
    9. Nulla volutpat aliquam velit
    10. +
    11. Faucibus porta lacus fringilla vel
    12. +
    13. Aenean sit amet erat nunc
    14. +
    15. Eget porttitor lorem
    16. +
    +
    +
    +

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

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

    Table options

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

    Example tables

    + +

    1. Default table styles

    +
    +
    +

    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>
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    #First NameLast NameLanguage
    1MarkOttoCSS
    2JacobThorntonJavascript
    3StuDentHTML
    +
    +
    + + +

    2. Striped table

    +
    +
    +

    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 table-striped">
    +  ...
    +</table>
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    #First NameLast NameLanguage
    1MarkOttoCSS
    2JacobThorntonJavascript
    3StuDentHTML
    +
    +
    + + +

    3. Bordered table

    +
    +
    +

    Add borders around the entire table and rounded corners for aesthetic purposes.

    +
    +<table class="table table-bordered">
    +  ...
    +</table>
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    #First NameLast NameLanguage
    1Mark OttoCSS
    2JacobThorntonJavascript
    3StuDent
    3BrosefStalinHTML
    +
    +
    + + +

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

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

    5. Striped table w/ TableSorter.js

    +
    +
    +

    Include the jQuery Tablesorter plugin and automaically 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">
    +  ...
    +</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
    +
    +
    +
    + + + + +
    + +
    +
    +

    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.

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

    Example forms using just form controls, no extra markup

    +
    +
    +

    Basic form

    +

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

    +
    + + + + +
    +
    +
    +

    Search form

    +

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

    + +
    +
    +

    Inline form

    +

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

    + +
    +
    + +
    + +

    Horizontal forms

    +
    +
    +
    + Controls Bootstrap supports +
    + +
    + +

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

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

    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 +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + + Something may have gone wrong +
    +
    +
    + +
    + + Please correct the error +
    +
    +
    + +
    + + 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 +
    + +
    + + + +

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

    +
    +
    +
    + +
    +
    + @ + +
    +

    Here's some help text

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

    Here's more help text

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

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

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

    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.

    +
    +
    +
    +
    + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ButtonClassDescription
    Default.btnStandard gray button with gradient
    Primary.primaryProvides extra visual weight and identifies the primary action in a set of buttons
    Info.infoUsed as an alternate to the default styles
    Success.successIndicates a successful or positive action
    Danger.dangerIndicates a dangerous or potentially negative action
    + +
    +
    +

    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.

    +
    +
    +

    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.

    +

    + Primary action + Action +

    +

    +   +

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

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

    +
    +
    + +
    + +
    +
    +

    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.

    +
    +
    + +

    Examples

    +
    +
    +

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

    +

    + Refresh + Settings +

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

    Or, use them in navigation.

    + +
    +
    +
    \ No newline at end of file diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache new file mode 100644 index 000000000..21ddf4747 --- /dev/null +++ b/docs/templates/pages/components.mustache @@ -0,0 +1,1176 @@ + +
    +

    Components

    +

    Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.

    +
    + + + +
    + +
    +
    +

    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.

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

    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.

    + +
    +
    +

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

    Multi-page pagination

    +
    +
    +

    When to use

    +

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

    +

    Stateful page links

    +

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

    +

    Flexible alignment

    +

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

    +
    +
    +

    Examples

    +

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

    + + + + +
    +
    +

    Markup

    +

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

    +
    +<div class="pagination">
    +  <ul>
    +    <li><a href="#">Prev</a></li>
    +    <li class="active">
    +      <a href="#">1</a>
    +    </li>
    +    <li><a href="#">2</a></li>
    +    <li><a href="#">3</a></li>
    +    <li><a href="#">4</a></li>
    +    <li><a href="#">Next</a></li>
    +  </ul>
    +</div>
    +
    +
    +
    + +

    Pager For quick previous and next links

    +
    +
    +

    About pager

    +

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

    +
    +
    +

    Default example

    +

    By default, the pager centers links.

    + +
    +<ul class="pager">
    +  <li>
    +    <a href="#">Previous</a>
    +  </li>
    +  <li>
    +    <a href="#">Next</a>
    +  </li>
    +</ul>
    +
    +
    +
    +

    Aligned links

    +

    Alternatively, you can align each link to the sides:

    + +
    +<ul class="pager">
    +  <li class="previous">
    +    <a href="#">&larr; Older</a>
    +  </li>
    +  <li class="next">
    +    <a href="#">Newer &rarr;</a>
    +  </li>
    +</ul>
    +
    +
    +
    +
    + + + + +
    + + +
    +
    +

    Default thumbnails

    +

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

    + +
    +
    +

    Highly customizable

    +

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

    +
      +
    • +
      + +
      +
      Thumbnail label
      +

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

      +

      Action Action

      +
      +
      +
    • +
    • +
      + +
      +
      Thumbnail label
      +

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

      +

      Action Action

      +
      +
      +
    • +
    +
    +
    + +
    +
    +

    Why use thumbnails

    +

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

    +
    +
    +

    Simple, flexible markup

    +

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

    +
    +
    +

    Uses grid column sizes

    +

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

    +
    +
    + +
    +
    +

    The markup

    +

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

    +
    +<ul class="thumbnails">
    +  <li class="span3">
    +    <a href="#" class="thumbnail">
    +      <img src="http://placehold.it/210x150" alt="">
    +    </a>
    +  </li>
    +  ...
    +</ul>
    +
    +

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

    +
    +<ul class="thumbnails">
    +  <li class="span3">
    +    <div class="thumbnail">
    +      <img src="http://placehold.it/210x150" alt="">
    +      <h5>Thumbnail label</h5>
    +      <p>Thumbnail caption right here...</p>
    +    </div>
    +  </li>
    +  ...
    +</ul>
    +
    +
    +
    +

    More examples

    +

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

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

    Lightweight defaults

    +
    +
    +

    Rewritten base class

    +

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

    +

    Single alert message

    +

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

    +
    +

    Goes great with javascript

    +

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

    +

    Get the plugin »

    +
    +
    +

    Example alerts

    +

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

    +
    + × + Warning! Best check yo self, you’re not looking too good. +
    +
    +<div class="alert">
    +  <a class="close">×</a>
    +  <strong>Warning!</strong> Best check yo self, you’re not looking too good.
    +</div>
    +
    +

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

    +
    + × +

    Warning!

    +

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

    +
    +
    +<div class="alert alert-block">
    +  <a class="close">×</a>
    +  <h4 class="alert-heading">Warning!</h4>
    +  Best check yo self, you’re not...
    +</div>
    +
    +
    +
    + +

    Contextual alternatives Add optional classes to change an alert's connotation

    +
    +
    +

    Error or danger

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

    Success

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

    Information

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

    Examples and markup

    +
    +
    +

    Basic

    +

    Default progress bar with a vertical gradient.

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

    Striped

    +

    Uses a gradient to create a striped effect.

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

    Animated

    +

    Takes the striped example and animates it.

    +
    +
    +
    +
    +<div class="progress danger
    +     striped active">
    +  <div class="bar"
    +       style="width: 40%;"></div>
    +</div>
    +
    +
    +
    + +

    Options and browser support

    +
    +
    +

    Additional colors

    +

    Progress bars utilize some of the same classes as buttons and alert messages for quick styling.

    +
      +
    • .info
    • +
    • .success
    • +
    • .danger
    • +
    +

    Alternatively, you can customize the LESS files and roll your own colors and sizes.

    +
    +
    +

    Behavior

    +

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

    +

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

    +
    +
    +

    Browser support

    +

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

    +

    Opera does not support animations at this time.

    +
    +
    + +
    \ No newline at end of file diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache new file mode 100644 index 000000000..f07116a5a --- /dev/null +++ b/docs/templates/pages/index.mustache @@ -0,0 +1,188 @@ +
    + + +
    +
    +

    Bootstrap,
    from Twitter

    +

    Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, featuring HTML, CSS, and JS for dozens of base elements and common design components.

    +

    + Download on GitHub + Get started → +

    + +
    +

    Feature highlights

    +
      +
    • × Built on LESS
    • +
    • × Complete styleguide docs
    • +
    • × Fully responsive design
    • +
    • × Small footprint (7kb gzipped)
    • +
    • × Support for IE7 and up
    • +
    • × Custom jQuery plugins
    • +
    • × Dozens of components
    • +
    +
    +
    +
    + + + + +
    +

    Built with Bootstrap.

    + + + +

    Designed for everyone, everywhere.

    + +
    +
    + +

    Built for and by nerds

    +

    Like you, we love building awesome products on the web. We love it so much, we decided to help people just like us do it easier, better, and faster. Bootstrap is built for you.

    +
    +
    + +

    For all skill levels

    +

    Bootstrap is designed to help people of all skill level—designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.

    +
    +
    + +

    Cross-everything

    +

    Originally built with only modern browsers in mind, Bootstrap has evolved to include support for all major browsers (even IE7!) and, with Bootstrap 2, tablets and smartphones, too.

    +
    +
    +
    +
    + +

    12-column grid

    +

    Grid systems aren't everything, but having a durable and flexible one at the core of your work can make development much simpler. Use our built-in grid classes or roll your own.

    +
    +
    + +

    Responsive design

    +

    With Bootstrap 2, we've gone fully responsive. Our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.

    +
    +
    + +

    Styleguide docs

    +

    Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.

    +
    +
    +
    +
    + +

    Growing library

    +

    Despite being only 7kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.

    +
    +
    + +

    Custom jQuery plugins

    +

    What good is an awesome design component without easy-to-use, proper, and extensible interactions? With Bootstrap, you get custom-built jQuery plugins to bring your projects to life.

    +
    +
    + +

    Built on LESS

    +

    Where vanilla CSS falters, LESS excels. Variables, nesting, operations, and mixins in LESS makes coding CSS faster and more efficient with minimal overhead.

    +
    +
    +
    +
    + +

    HTML5

    +

    Built to support new HTML5 elements and syntax.

    +
    +
    + +

    CSS3

    +

    Progressively enhanced components for ultimate style.

    +
    +
    + +

    Open-source

    +

    Built for and maintained by the community via GitHub.

    +
    +
    + +

    Made at Twitter

    +

    Brought to you by an experienced engineer and designer.

    +
    +
    + + + +

    Get started in no time.

    + + + + + + + + + +
    +

    Hotlink the CSS

    +

    For the quickest and easiest start, just copy this snippet into your webpage.

    +
    + +
    +
    +

    Use it with LESS

    +

    A fan of using LESS? No problem, just clone the repo and add these lines:

    +
    + +
    +
    +

    Fork on GitHub

    +

    Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.

    +

    Bootstrap on GitHub »

    +

    Currently v2.0.0

    +
    +
    +
    \ No newline at end of file diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache new file mode 100644 index 000000000..aefe87846 --- /dev/null +++ b/docs/templates/pages/javascript.mustache @@ -0,0 +1,1299 @@ + +
    +

    Javascript for Bootstrap

    +

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

    + + + +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    + Select/Unselect All Plugins +

    Note: All plugins require the latest version of jQuery to be included.

    +
    + + + + +
    + +
    +
    +

    About modals

    +

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

    + Download file +
    +
    +

    Static example

    +

    Below is a statically rendered modal.

    +
    + +
    + +

    Live demo

    +

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

    + + + Launch demo modal + +
    + +

    Using bootstrap-modal

    +

    Call the modal via javascript:

    +
    $('#myModal').modal(options)
    +

    Options

    + + + + + + + + + + + + + + + + + + + + + + + +
    Nametypedefaultdescription
    backdropbooleantrueIncludes a modal-backdrop element
    keyboardbooleantrueCloses the modal when escape key is pressed
    +

    Markup

    +

    You can activate modals on your page easily without having to write a single line of javascript. Just set data-toggle="modal" on a controller element with a data-target="#foo" or href="#foo" which corresponds to a modal element id, and when clicked, it will launch your modal.

    +

    Also, to add options to your modal instance, just include them as additional data attributes on either the control element or the modal markup itself.

    +
    +<a class="btn" data-toggle="modal" href="#myModal" >Launch Modal</a>
    +
    + +
    +<div class="modal">
    +<div class="modal-header">
    +<a href="#" class="close js-dismiss">×</a>
    +<h3>Modal header</h3>
    +</div>
    +<div class="modal-body">
    +<p>One fine body…</p>
    +</div>
    +<div class="modal-footer">
    +<a href="#" class="btn primary">Save changes</a>
    +<a href="#" class="btn">Close</a>
    +</div>
    +</div>
    +
    +

    Notice If you want your modal to animate in and out, just add a .fade class to the .modal element (refer to the demo to see this in action).

    +

    Methods

    +

    .modal(options)

    +

    Activates your content as a modal. Accepts an optional options object. +

    +$('#myModal').modal({
    +keyboard: false
    +})
    +

    .modal('toggle')

    +

    Manually toggles a modal.

    +
    $('#myModal').modal('toggle')
    +

    .modal('show')

    +

    Manually opens a modal.

    +
    $('#myModal').modal('show')
    +

    .modal('hide')

    +

    Manually hides a modal.

    +
    $('#myModal').modal('hide')
    +

    Events

    +

    Bootstrap's modal class exposes a few events for hooking into modal functionality.

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    EventDescription
    showThis event fires immediately when the show instance method is called.
    shownThis event is fired when the modal has been made visible to the user (will wait for css transitions to complete).
    hideThis event is fired immediately when the hide instance method has been called.
    hiddenThis event is fired when the modal has finished being hidden from the user (will wait for css transitions to complete).
    + +
    +$('#myModal').on('hidden', function () {
    +// do something ...
    +})
    +
    +
    +
    + + + + + + + + + +
    + +
    +
    +

    The ScrollSpy plugin is for automatically updating nav targets based on scroll position.

    + Download file +
    +
    +

    Example navbar with scrollspy

    +

    Scroll the area below and watch the navigation update. The dropdown sub items will be highlighted as well. Try it!

    + +
    +

    @fat

    +

    + Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat. +

    +

    @mdo

    +

    + Veniam marfa mustache skateboard, adipisicing fugiat velit pitchfork beard. Freegan beard aliqua cupidatat mcsweeney's vero. Cupidatat four loko nisi, ea helvetica nulla carles. Tattooed cosby sweater food truck, mcsweeney's quis non freegan vinyl. Lo-fi wes anderson +1 sartorial. Carles non aesthetic exercitation quis gentrify. Brooklyn adipisicing craft beer vice keytar deserunt. +

    +

    one

    +

    + Occaecat commodo aliqua delectus. Fap craft beer deserunt skateboard ea. Lomo bicycle rights adipisicing banh mi, velit ea sunt next level locavore single-origin coffee in magna veniam. High life id vinyl, echo park consequat quis aliquip banh mi pitchfork. Vero VHS est adipisicing. Consectetur nisi DIY minim messenger bag. Cred ex in, sustainable delectus consectetur fanny pack iphone. +

    +

    two

    +

    + In incididunt echo park, officia deserunt mcsweeney's proident master cleanse thundercats sapiente veniam. Excepteur VHS elit, proident shoreditch +1 biodiesel laborum craft beer. Single-origin coffee wayfarers irure four loko, cupidatat terry richardson master cleanse. Assumenda you probably haven't heard of them art party fanny pack, tattooed nulla cardigan tempor ad. Proident wolf nesciunt sartorial keffiyeh eu banh mi sustainable. Elit wolf voluptate, lo-fi ea portland before they sold out four loko. Locavore enim nostrud mlkshk brooklyn nesciunt. +

    +

    three

    +

    + Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat. +

    +

    Keytar twee blog, culpa messenger bag marfa whatever delectus food truck. Sapiente synth id assumenda. Locavore sed helvetica cliche irony, thundercats you probably haven't heard of them consequat hoodie gluten-free lo-fi fap aliquip. Labore elit placeat before they sold out, terry richardson proident brunch nesciunt quis cosby sweater pariatur keffiyeh ut helvetica artisan. Cardigan craft beer seitan readymade velit. VHS chambray laboris tempor veniam. Anim mollit minim commodo ullamco thundercats. +

    +
    +
    +

    Using bootstrap-scrollspy.js

    +

    Call the scrollspy via javascript:

    +
    $('#navbar').scrollspy()
    +

    Markup

    +

    To easily add scrollspy behavior to your topbar navigation, just add data-spy="scroll" to the element you want to spy on (most typically this would be the body). +

    <body data-spy="scroll" >...</body>
    +

    Notice Navbar anchor tags must have resolvable id targets. For example, a <a href="#home">home</a> must correspond to something in the dom like <div id="home"></div>. +

    Options

    + + + + + + + + + + + + + + + + + +
    Nametypedefaultdescription
    offsetnumber10Pixels to offset from top when calculating position of scroll.
    +
    +
    +
    + + + + +
    + +
    +
    +

    This plugin adds quick, dynamic tab and pill functionality for transitioning through local content.

    + Download file +
    +
    +

    Example tabs

    +

    Click the tabs below to toggle between hidden panes, even via dropdown menus.

    + +
    +
    +

    Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.

    +
    +
    +

    Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente accusamus tattooed echo park.

    +
    + + +
    +
    +

    Using bootstrap-tab.js

    +

    Enable tabbable tabs via javascript:

    +
    $('#myTab').tab('show')
    +

    Markup

    +

    You can activate a tab or pill navigation without writing any javascript by simply specifying data-toggle="tab" or data-toggle="pill" on an element.

    +
    +<ul class="tabs">
    +<li><a href="#home" data-toggle="tab">Home</a></li>
    +<li><a href="#profile" data-toggle="tab">Profile</a></li>
    +<li><a href="#messages" data-toggle="tab">Messages</a></li>
    +<li><a href="#ettings" data-toggle="tab">Settings</a></li>
    +</ul>
    +

    Methods

    +

    $().tab

    +

    + Activates a tab element and content container. Tab should have either a `data-target` or an `href` targeting a container node in the dom. +

    +
    +<ul class="tabs">
    +<li class="active"><a href="#home">Home</a></li>
    +<li><a href="#profile">Profile</a></li>
    +<li><a href="#messages">Messages</a></li>
    +<li><a href="#settings">Settings</a></li>
    +</ul>
    +
    +<div class="tab-content">
    +<div class="active" id="home">...</div>
    +<div id="profile">...</div>
    +<div id="messages">...</div>
    +<div id="settings">...</div>
    +</div>
    +
    +<script>
    +$(function () {
    +$('.tabs a:last').tab('show')
    +})
    +</script>
    +

    +

    Events

    + + + + + + + + + + + + + + + + + +
    EventDescription
    showThis event fires on tab show, but before the new tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively.
    shownThis event fires on tab show after a tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively.
    + +
    +$('a[data-toggle="tab"]').on('shown', function (e) {
    +e.target // activated tab
    +e.relatedTarget // previous tab
    +})
    +
    +
    +
    + + + +
    + +
    +
    +

    About Tooltips

    +

    Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, uss css3 for animations, and data-attributes for local title storage.

    + Download file +
    +
    +

    Example use of Tooltips

    +

    Hover over the links below to see tooltips:

    +
    +

    Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral. +

    +
    +
    +

    Using bootstrap-tooltip.js

    +

    Trigger the tooltip via javascript:

    +
    $('#example').tooltip(options)
    +

    Options

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Nametypedefaultdescription
    animationbooleantrueapply a css fade transition to the tooltip
    placementstring'top'how to position the tooltip - top | bottom | left | right
    selectorstringfalseIf a selector is provided, tooltip objects will be delegated to the specified targets.
    titlestring | function''default title value if `title` tag isn't present
    triggerstring'hover'how tooltip is triggered - hover | focus | manual
    delaynumber | object0 +

    delay showing/hiding the tooltip (ms)

    +

    If a number is supplied, delay is applied to both hide/show

    +

    Object structure is: delay: { show: 500, hide: 100 }

    +
    +

    Notice Individual tooltip instance options can alternatively be specified through the use of data attributes.

    +

    Markup

    +

    For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.

    +

    Methods

    +

    $().tooltip(options)

    +

    Attaches a tooltip handler to an element collection.

    +

    .tooltip('show')

    +

    Reveals an elements tooltip.

    +
    $('#element').tooltip('show')
    +

    .tooltip('hide')

    +

    Hides an elements tooltip.

    +
    $('#element').tooltip('hide')
    +
    +
    +
    + + + + +
    + +
    +
    +

    About popovers

    +

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

    +

    * Requires Tooltip to be included

    + Download file +
    +
    +

    Example hover popover

    +

    Hover over the button to trigger the popover.

    + +
    +

    Using bootstrap-popover.js

    +

    Enable popovers via javascript:

    +
    $('#example').popover(options)
    +

    Options

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Nametypedefaultdescription
    animationbooleantrueapply a css fade transition to the tooltip
    placementstring'right'how to position the popover - top | bottom | left | right
    selectorstringfalseif a selector is provided, tooltip objects will be delegated to the specified targets
    triggerstring'hover'how tooltip is triggered - hover | focus | manual
    titlestring | function''default title value if `title` attribute isn't present
    contentstring | function''default content value if `data-content` attribute isn't present
    delaynumber | object0 +

    delay showing/hiding the popover (ms)

    +

    If a number is supplied, delay is applied to both hide/show

    +

    Object structure is: delay: { show: 500, hide: 100 }

    +
    +

    Notice Individual popover instance options can alternatively be specified through the use of data attributes.

    +

    Markup

    +

    + For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option. +

    +

    Methods

    +

    $().popover(options)

    +

    Initializes popovers for an element collection.

    +

    .popover('show')

    +

    Reveals an elements popover.

    +
    $('#element').popover('show')
    +

    .popover('hide')

    +

    Hides an elements popover.

    +
    $('#element').popover('hide')
    +
    +
    +
    + + + + +
    + +
    +
    +

    About alerts

    +

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

    + Download +
    +
    +

    Example alerts

    +

    The alerts plugin works on regular alert messages, and block messages.

    +
    + × + Holy guacamole! Best check yo self, you’re not looking too good. +
    +
    + × +

    Oh snap! You got an error!

    +

    Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.

    +

    + Take this action Or do this +

    +
    +
    +

    Using bootstrap-alerts.js

    +

    Enable dismissal of an alert via javascript:

    +
    $(".alert-message").alert()
    +

    Markup

    +

    Just add data-dismiss="alert" to your close button to automatically give an alert close functionality.

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

    Methods

    +

    $().alert()

    +

    Wraps all alerts with close functionality. To have your alerts animate out when closed, make sure they have the .fade and .in class already applied to them.

    +

    .alert('close')

    +

    Closes an alert.

    +
    $(".alert-message").alert('close')
    +

    Events

    +

    Bootstrap's alert class exposes a few events for hooking into alert functionality.

    + + + + + + + + + + + + + + + + + +
    EventDescription
    closeThis event fires immediately when the close instance method is called.
    closedThis event is fired when the alert has been closed (will wait for css transitions to complete).
    +
    +$('#my-alert').bind('closed', function () {
    +// do something ...
    +})
    +
    +
    +
    + + + + +
    + +
    +
    +

    About

    +

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

    + Download file +
    +
    +

    Example uses

    +

    Use the buttons plugin for states and toggles.

    + + + + + + + + + + + + + + + + + + + +
    Stateful + +
    Single toggle + +
    Checkbox +
    + + + +
    +
    Radio +
    + + + +
    +
    +
    +

    Using bootstrap-button.js

    +

    Enable buttons via javascript:

    +
    $('.tabs').button()
    +

    Markup

    +

    Data attributes are integral to the button plugin. Check out the example code below for the various markup types.

    +
    +<!-- Add data-toggle="button" to activate toggling on a single button -->
    +<button class="btn" data-toggle="button">Single Toggle</button>
    +
    +<!-- Add data-toggle="buttons-checkbox" for checkbox style toggling on btn-group -->
    +<div class="btn-group" data-toggle="buttons-checkbox">
    +<button class="btn">Left</button>
    +<button class="btn">Middle</button>
    +<button class="btn">Right</button>
    +</div>
    +
    +<!-- Add data-toggle="buttons-radio" for radio style toggling on btn-group -->
    +<div class="btn-group" data-toggle="buttons-radio">
    +<button class="btn">Left</button>
    +<button class="btn">Middle</button>
    +<button class="btn">Right</button>
    +</div>
    +
    +

    Methods

    +

    $().button('toggle')

    +

    Toggles push state. Gives btn the look that it's been activated.

    +

    Notice You can enable auto toggling of a button by using the data-toggle attribute.

    +
    <button class="btn" data-toggle="button" >...</button>
    +

    $().button('loading')

    +

    Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute data-loading-text. +

    +
    <button class="btn" data-loading-text="loading stuff..." >...</button>
    +

    + Notice Firefox persists the disabled state across page loads. A workaround for this is to use: autocomplete="off". More info can be found here. +

    +

    $().button('reset')

    +

    Resets button state - swaps text to original text.

    +

    $().button(string)

    +

    Resets button state - swaps text to any data defined text state.

    +
    <button class="btn" data-complete-text="finished!" >...</button>
    +<script>
    +$('.btn').button('complete')
    +</script>
    +
    +
    +
    + + + + +
    + +
    +
    +

    About

    +

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

    + Download file +
    +
    +

    Example accordion

    +

    Using the collapse plugin, we built a simple accordion style widget:

    + +
    +
    + +
    +
    + Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS. +
    +
    +
    +
    + +
    +
    + Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS. +
    +
    +
    +
    + +
    +
    + Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS. +
    +
    +
    +
    + + +
    +

    Using bootstrap-collapse.js

    +

    Enable via javascript:

    +
    $(".collapse").collapse()
    +

    Options

    + + + + + + + + + + + + + + + + + + + + + + + +
    Nametypedefaultdescription
    parentselectorfalseIf selector then all collapsible elements under the specified parent will be closed when this collasabile item is shown. (similar to traditional accordion behavior)
    togglebooleantrueToggles the collapsible element on invocation
    +

    Markup

    +

    Just add data-toggle="collapse" and a data-target to element to automatically assign control of a collapsible element. The data-target attribute accepts a css selector to apply the collapse to. Be sure to add the class collapse to the collapsible element. If you'd like it to default open, add the additional class in.

    +
    +<button class="btn danger" data-toggle="collapse" data-target="#demo">
    +simple collapsible
    +</button>
    +
    +<div id="demo" class="collapse in"> … </div>
    +

    Notice To add accordion like group management to a collapsible control just add the additional data attribute data-parent="#selector". Refer to the demo below to see this in action.

    +

    Methods

    +

    .collapse(options)

    +

    Activates your content as a collapsible element. Accepts an optional options object. +

    +$('#myCollapsible').collapse({
    +toggle: false
    +})
    +

    .collapse('toggle')

    +

    Toggles a collapsible element to shown or hidden.

    +

    .collapse('show')

    +

    Shows a collapsible element.

    +

    .collapse('hide')

    +

    Hides a collapsible element.

    +

    Events

    +

    + Bootstrap's collapse class exposes a few events for hooking into collapse functionality. +

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    EventDescription
    showThis event fires immediately when the show instance method is called.
    shownThis event is fired when a collapse element has been made visible to the user (will wait for css transitions to complete).
    hide + This event is fired immediately when the hide method has been called. +
    hiddenThis event is fired when a collapse element has been hidden from the user (will wait for css transitions to complete).
    + +
    +$('#myCollapsible').on('hidden', function () {
    +// do something ...
    +})
    +
    +
    +
    + + + + + + + + + +
    + +
    +
    +

    About

    +

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

    + Download file +
    +
    +

    Example

    +

    Start typing in the field below to show the typeahead results.

    +
    + +
    +
    +

    Using bootstrap-typeahead.js

    +

    Call the typeahead via javascript:

    +
    $('.typeahead').typeahead()
    +

    Options

    + + + + + + + + + + + + + + + + + +
    Nametypedefaultdescription
    itemsnumber8The max number of items to display in the dropdown.
    + +

    Markup

    +

    Add data attributes to register an element with typeahead functionality.

    +
    +<input type="text" data-provide="typeahead">
    +
    +
    +
    +
    \ No newline at end of file diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache new file mode 100644 index 000000000..568e857be --- /dev/null +++ b/docs/templates/pages/less.mustache @@ -0,0 +1,406 @@ + +
    +

    Using LESS with Bootstrap

    +

    Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.

    +
    + + + + + +
    +
    +

    Why LESS?

    +

    Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.

    +
    +
    +

    What's included?

    +

    As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.

    +
    +
    +

    Learn more

    + LESS CSS +

    Visit the official website at http://lesscss.org to learn more.

    +
    +
    +
    +
    +

    Variables

    +

    Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.

    +
    +
    +

    Mixins

    +

    Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.

    +
    +
    +

    Operations

    +

    Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.

    +
    +
    + + + + + + +

    Hyperlinks

    + + + + + + + + + + + + + + + + + + + + +
    VariableValueUsage
    @linkColor#0069d6Default link text color
    @linkColorHoverdarken(@linkColor, 15)Default link text hover color
    + +
    +
    +

    Grayscale colors

    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    @black#000
    @grayDarklighten(@black, 25%)
    @graylighten(@black, 50%)
    @grayLightlighten(@black, 75%)
    @grayLighterlighten(@black, 90%)
    @white#fff
    +
    +
    +

    Accent colors

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    @blue#049CDB
    @green#46a546
    @red#9d261d
    @yellow#ffc40d
    @orange#f89406
    @pink#c3325f
    @purple#7a43b6
    +
    +
    + +
    +
    +

    Grid system

    + + + + + + + + + + + + + + + + + + + +
    @gridColumns12
    @gridColumnWidth60px
    @gridGutterWidth20px
    @siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
    +
    +
    +

    Typography

    + + + + + + + + + + + + + + + + +
    @baseFontSize13px
    @baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
    @baseLineHeight18px
    +
    +
    + +
    +
    +

    Visuals

    +
    +
    + + + + + + + + +
    @primaryButtonColor@blue
    +
    +
    + + + + + + + + + + + + + + + + + + + +
    + +
    +
    +

    Bootstrap was built with Preboot, an open-source pack of mixins and variables to be used in conjunction with Less, a CSS preprocessor for faster and easier web development.

    +

    Check out how we used Preboot in Bootstrap and how you can make use of it should you choose to run Less on your next project.

    +
    +
    +

    How to use it

    +

    Use this option to make full use of Bootstrap’s Less variables, mixins, and nesting in CSS via javascript in your browser.

    +
    +<link rel="stylesheet/less" href="less/bootstrap.less" media="all" />
    +<script src="js/less-1.1.3.min.js"></script>
    +

    Not feeling the .js solution? Try the Less Mac app or use Node.js to compile when you deploy your code.

    + +

    What’s included

    +

    Here are some of the highlights of what’s included in Twitter Bootstrap as part of Bootstrap. Head over to the Bootstrap website or Github project page to download and learn more.

    +

    Variables

    +

    Variables in Less are perfect for maintaining and updating your CSS headache free. When you want to change a color value or a frequently used value, update it in one spot and you’re set.

    +
    +// Links
    +@linkColor:         #8b59c2;
    +@linkColorHover:    darken(@linkColor, 10);
    +
    +// Grays
    +@black:             #000;
    +@grayDark:          lighten(@black, 25%);
    +@gray:              lighten(@black, 50%);
    +@grayLight:         lighten(@black, 70%);
    +@grayLighter:       lighten(@black, 90%);
    +@white:             #fff;
    +
    +// Accent Colors
    +@blue:              #08b5fb;
    +@green:             #46a546;
    +@red:               #9d261d;
    +@yellow:            #ffc40d;
    +@orange:            #f89406;
    +@pink:              #c3325f;
    +@purple:            #7a43b6;
    +
    +// Baseline grid
    +@basefont:          13px;
    +@baseline:          18px;
    +
    + +

    Commenting

    +

    Less also provides another style of commenting in addition to CSS’s normal /* ... */ syntax.

    +
    +// This is a comment
    +/* This is also a comment */
    +
    + +

    Mixins up the wazoo

    +

    Mixins are basically includes or partials for CSS, allowing you to combine a block of code into one. They’re great for vendor prefixed properties like box-shadow, cross-browser gradients, font stacks, and more. Below is a sample of the mixins that are included with Bootstrap.

    +

    Font stacks

    +
    +#font {
    +  .shorthand(@weight: normal, @size: 14px, @lineHeight: 20px) {
    +    font-size: @size;
    +    font-weight: @weight;
    +    line-height: @lineHeight;
    +  }
    +  .sans-serif(@weight: normal, @size: 14px, @lineHeight: 20px) {
    +    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
    +    font-size: @size;
    +    font-weight: @weight;
    +    line-height: @lineHeight;
    +  }
    +  ...
    +}
    +
    +

    Gradients

    +
    +#gradient {
    +  ...
    +  .vertical (@startColor: #555, @endColor: #333) {
    +    background-color: @endColor;
    +    background-repeat: repeat-x;
    +    background-image: -khtml-gradient(linear, left top, left bottom, from(@startColor), to(@endColor)); // Konqueror
    +    background-image: -moz-linear-gradient(@startColor, @endColor); // FF 3.6+
    +    background-image: -ms-linear-gradient(@startColor, @endColor); // IE10
    +    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+
    +    background-image: -webkit-linear-gradient(@startColor, @endColor); // Safari 5.1+, Chrome 10+
    +    background-image: -o-linear-gradient(@startColor, @endColor); // Opera 11.10
    +    background-image: linear-gradient(@startColor, @endColor); // The standard
    +  }
    +  ...
    +}
    +
    + +

    Operations

    +

    Get fancy and perform some math to generate flexible and powerful mixins like the one below.

    +
    +// Griditude
    +@gridColumns:       16;
    +@gridColumnWidth:   40px;
    +@gridGutterWidth:   20px;
    +@siteWidth:         (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
    +
    +// Make some columns
    +.columns(@columnSpan: 1) {
    +  width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1));
    +}
    +
    + +

    Compiling Less

    +

    After modifying the .less files in /lib/, you'll need to recompile them in order to regenerate the bootstrap-*.*.*.css and bootstrap-*.*.*.min.css files. If you're submitting a pull request to GitHub, you must always recompile.

    +

    Ways to compile

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    MethodSteps
    Node with makefile +

    Install the LESS command line compiler with npm by running the following command:

    +
    $ npm install less
    +

    Once installed just run make from the root of your bootstrap directory and you're all set.

    +

    Additionally, if you have watchr installed, you may run make watch to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).

    +
    Javascript +

    Download the latest Less.js and include the path to it (and Bootstrap) in the <head>.

    +
    +<link rel="stylesheet/less" href="/path/to/bootstrap.less">
    +<script src="/path/to/less.js"></script>
    +
    +

    To recompile the .less files, just save them and reload your page. Less.js compiles them and stores them in local storage.

    +
    Command line +

    Install the LESS command line tool via Node and run the following command:

    +
    $ lessc ./lib/bootstrap.less > bootstrap.css
    +

    Be sure to include --compress in that command if you're trying to save some bytes!

    +
    Unofficial Mac app +

    The unofficial Mac app watches directories of .less files and compiles the code to local files after every save of a watched .less file.

    +

    If you like, you can toggle preferences in the app for automatic minifying and which directory the compiled files end up in.

    +
    CrunchCrunch is a great looking LESS editor and compiler built on Adobe Air.
    CodeKitCreated by the same guy as the unofficial Mac app, CodeKit is a Mac app that compiles LESS, SASS, Stylus, and CoffeeScript.
    SimplessMac, Linux, and PC app for drag and drop compiling of LESS files. Plus, the source code is on GitHub.
    +
    +
    + +
    \ No newline at end of file diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache new file mode 100644 index 000000000..567ac6d0d --- /dev/null +++ b/docs/templates/pages/scaffolding.mustache @@ -0,0 +1,311 @@ + + +
    +

    Scaffolding

    +

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

    +
    + + + + +
    + + +

    Default 940px grid

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

    The default grid system provided as part of Bootstrap is a 940px-wide, 12-column grid.

    +

    It also has three responsive variations for various devices and resolutions: phone, tablet, and large widescreen desktops.

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

    As shown here, a basic layout can be created with two "columns," each spanning a number of the 12 foundational columns we defined as part of our grid system.

    +
    +
    + +

    Offsetting columns

    +
    +
    4
    +
    4 offset 4
    +
    +
    +
    3 offset 3
    +
    3 offset 3
    +
    +
    +
    8 offset 4
    +
    + +
    + +

    Nesting columns

    +
    +
    +

    With the static (non-fluid) grid system in Bootstrap, nesting is easy. To nest your content, just add a new .row and set of .span* columns within an existing .span* column.

    +

    Example

    +
    +
    + Level 1 of column +
    +
    + Level 2 +
    +
    + Level 2 +
    +
    +
    +
    +
    +
    +
    +<div class="row">
    +  <div class="span12">
    +    Level 1 of column
    +    <div class="row">
    +      <div class="span6">Level 2</div>
    +      <div class="span6">Level 2</div>
    +    </div>
    +  </div>
    +</div>
    +
    +
    +
    + +

    Grid customization

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    VariableDefault valueDescription
    @gridColumns12Number of columns
    @gridColumnWidth60pxWidth of each column
    @gridGutterWidth20pxNegative space between columns
    @siteWidthComputed sum of all columns and guttersCounts number of columns and gutters to set width of the .fixed-container() mixin
    +
    +
    +

    Variables in LESS

    +

    Built into Bootstrap are a handful of variables for customizing the default 940px grid system, documented above. All variables for the grid are stored in variables.less.

    +
    +
    +

    How to customize

    +

    Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grids in the preboot.less file and use one of the four ways documented to recompile.

    +
    +
    +

    Staying responsive

    +

    Customization of the grid only works at the default level, the 940px grid. To maintain the responsive aspects of Bootstrap, you'll also have to customize the grids in responsive.less.

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

    Fixed layout

    +

    The default and simple 940px-wide, centered layout for just about any website or page provided by a single <div class="container">.

    +
    +
    +
    +
    +<body>
    +  <div class="container">
    +    ...
    +  </div>
    +</body>
    +
    +
    +
    +

    Fluid layout

    +

    <div class="fluid-container"> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.

    +
    +
    +
    +
    +
    +<body>
    +  <div class="fluid-container sidebar-left">
    +    <div class="fluid-sidebar">
    +      ...
    +    </div>
    +    <div class="fluid-content">
    +      ...
    +    </div>
    +  </div>
    +</body>
    +
    +
    +
    +
    + + + + + +
    + + +
    +
    + Responsive devices +
    +
    +

    Supported devices

    +

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

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    LabelLayout widthColumn widthGutter width
    Smartphones480px and belowFluid columns, no fixed widths
    Portrait tablets480px to 768pxFluid columns, no fixed widths
    Landscape tablets768px to 940px44px20px
    Default940px and up60px20px
    Large display1210px and up70px30px
    + +

    What they do

    +

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

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

    Using the media queries

    +
    +
    +

    Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:

    +
      +
    1. Use the compiled responsive version, bootstrap.reponsive.css
    2. +
    3. Add @import "responsive.less" and recompile Bootstrap
    4. +
    5. Compile responsive.less as a separate file and include that
    6. +
    +

    Why not just include it? Truth be told, not everything needs to be responsive. Instead of encouraging developers to remove this feature, we figure it best to enable it.

    +
    +
    +
    +  // Landscape phones and down
    +  @media (max-width: 480px) { ... }
    +
    +  // Landscape phone to portrait tablet
    +  @media (min-width: 480px) and (max-width: 768px) { ... }
    +
    +  // Portrait tablet to landscape and desktop
    +  @media (min-width: 768px) and (max-width: 940px) { ... }
    +
    +  // Large desktop
    +  @media (min-width: 1210px) { .. }
    +
    +
    +
    +
    \ No newline at end of file diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache new file mode 100644 index 000000000..a243d6ad5 --- /dev/null +++ b/docs/templates/pages/upgrading.mustache @@ -0,0 +1,86 @@ + +
    +

    Upgrading to Bootstrap 2

    +

    Learn about significant changes and additions since v1.4 with this handy guide.

    +
    + + +

    Rough outline

    +
      +
    • Docs completely overhauled +
        +
      • Responsive thanks to new grid system
      • +
      • Now less marketing and more information
      • +
      • Extensive use of tables to share classes and elements of most components
      • +
      • Broken down into several pages for easier consumption
      • +
      +
    • +
    • Updated grid system, now only 12 columns +
        +
      • Same great classes, but now only 12 columns
      • +
      • Responsive approach means your projects virtually work out of the box on smartphones, tablets, and more
      • +
      +
    • +
    • New thumbnails (previously media grids) +
        +
      • .media-grid class has been changed to .thumbnails
      • +
      • Individual thumbnails now require .thumbnail class
      • +
      +
    • +
    • Updated forms +
        +
      • Default form style is now stacked to use less CSS and add flexibility
      • +
      • Exact same markup is required for vertical or horizontal forms—just swap the classes
      • +
      • New form defaults for search, inline, vertical, and horizontal
      • +
      +
    • +
    • Updated tables +
        +
      • Table classes made more consistent
      • +
      • Removed unused table color options (too much code for such little impact)
      • +
      +
    • +
    • Typography +
        +
      • Right-aligned option for blockquotes if float: right;
      • +
      • h4 elements were dropped from 16px to 14px with a default line-height of 18px
      • +
      • h5 elements were dropped from 14px to 12px
      • +
      • h6 elements were dropped from 13px to 11px
      • +
      +
    • +
    • Buttons +
        +
      • Added button bar options
      • +
      +
    • +
    • Examples +
        +
      • Fluid examples redone. .fluid-container now requires a .sidebar-left or .sidebar-right as well. Fluid sidebar element has a new class, .fluid-sidebar.
      • +
      +
    • +
    • Dropdown menus +
        +
      • Updated the .dropdown-menu to tighten up spacing
      • +
      • Now requires you to add a <span class="caret"></span> to show the dropdown arrow
      • +
      • The navbar (fixed topbar) has brand new dropdowns. Gone are the dark versions and in their place are the standard white ones with an additional caret at their tops for clarity of position.
      • +
      +
    • +
    • Navigation +
        +
      • Tabs and pills now require the use of a new base class, .nav, on their <ul>
      • +
      • New nav list component added that uses the same base class, .nav
      • +
      • Vertical tabs and pills have been added—just add .stacked to the <ul>
      • +
      • Pills were restyled to be less rounded by default
      • +
      • Pills now have dropdown menu support (they share the same markup and styles as tabs)
      • +
      +
    • +
    + + \ No newline at end of file diff --git a/docs/upgrading.html b/docs/upgrading.html index 42521bb9a..7e43408ac 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -2,12 +2,12 @@ - Bootstrap, from Twitter: Upgrading from v1.4 to v2.0 + Bootstrap, from Twitter - + @@ -18,10 +18,11 @@ - - - - + + + + + @@ -33,8 +34,8 @@
    Bootstrap -
  • Icons by Glyphicons
  • -
  • Progress bars
  • -
  • Typeahead
  • -
  • +
  • Using LESS @@ -107,12 +108,12 @@
    - -
    -

    Upgrading to Bootstrap 2

    -

    Learn about significant changes and additions since v1.4 with this handy guide.

    -
    + +
    +

    Upgrading to Bootstrap 2

    +

    Learn about significant changes and additions since v1.4 with this handy guide.

    +

    Rough outline

    @@ -193,8 +194,6 @@
  • --> - - +
    + - - - + + + + + + - + + + + + + + + + -- 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/assets/js/application.js | 1 + docs/base-css.html | 95 +- docs/components.html | 110 +- docs/index.html | 438 +++--- docs/javascript.html | 2442 ++++++++++++++--------------- docs/less.html | 78 +- docs/scaffolding.html | 93 +- docs/templates/layout.mustache | 79 +- docs/templates/pages/base-css.mustache | 7 + docs/templates/pages/components.mustache | 26 +- docs/templates/pages/index.mustache | 356 ++--- docs/templates/pages/javascript.mustache | 2338 +++++++++++++-------------- docs/templates/pages/scaffolding.mustache | 18 +- docs/templates/pages/upgrading.mustache | 12 +- docs/upgrading.html | 89 +- 15 files changed, 2867 insertions(+), 3315 deletions(-) (limited to 'docs') diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 93f7ea719..2da4ab8e2 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -24,6 +24,7 @@ $(function(){ // table sort example if ($.fn.tableSorter) { $("#sortTableExample").tablesorter( { sortList: [[ 1, 0 ]] } ) + $(".tablesorter-example").tablesorter({ sortList: [[1,0]] }) } // add on logic 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 @@ - - - + - -
    - -
    -
    -

    This plugin adds quick, dynamic tab and pill functionality for transitioning through local content.

    - Download file -
    -
    -

    Example tabs

    -

    Click the tabs below to toggle between hidden panes, even via dropdown menus.

    - -
    -
    -

    Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.

    -
    -
    -

    Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente accusamus tattooed echo park.

    -
    - - + +
    + -
    -

    Using bootstrap-tab.js

    -

    Enable tabbable tabs via javascript:

    -
    $('#myTab').tab('show')
    -

    Markup

    -

    You can activate a tab or pill navigation without writing any javascript by simply specifying data-toggle="tab" or data-toggle="pill" on an element.

    +
    +
    +

    This plugin adds quick, dynamic tab and pill functionality for transitioning through local content.

    + Download file +
    +
    +

    Example tabs

    +

    Click the tabs below to toggle between hidden panes, even via dropdown menus.

    + +
    +
    +

    Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.

    +
    +
    +

    Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente accusamus tattooed echo park.

    +
    + + +
    +
    +

    Using bootstrap-tab.js

    +

    Enable tabbable tabs via javascript:

    +
    $('#myTab').tab('show')
    +

    Markup

    +

    You can activate a tab or pill navigation without writing any javascript by simply specifying data-toggle="tab" or data-toggle="pill" on an element.

     <ul class="tabs">
    -<li><a href="#home" data-toggle="tab">Home</a></li>
    -<li><a href="#profile" data-toggle="tab">Profile</a></li>
    -<li><a href="#messages" data-toggle="tab">Messages</a></li>
    -<li><a href="#ettings" data-toggle="tab">Settings</a></li>
    +  <li><a href="#home" data-toggle="tab">Home</a></li>
    +  <li><a href="#profile" data-toggle="tab">Profile</a></li>
    +  <li><a href="#messages" data-toggle="tab">Messages</a></li>
    +  <li><a href="#ettings" data-toggle="tab">Settings</a></li>
     </ul>
    -

    Methods

    -

    $().tab

    -

    - Activates a tab element and content container. Tab should have either a `data-target` or an `href` targeting a container node in the dom. -

    +

    Methods

    +

    $().tab

    +

    + Activates a tab element and content container. Tab should have either a `data-target` or an `href` targeting a container node in the dom. +

     <ul class="tabs">
    -<li class="active"><a href="#home">Home</a></li>
    -<li><a href="#profile">Profile</a></li>
    -<li><a href="#messages">Messages</a></li>
    -<li><a href="#settings">Settings</a></li>
    +  <li class="active"><a href="#home">Home</a></li>
    +  <li><a href="#profile">Profile</a></li>
    +  <li><a href="#messages">Messages</a></li>
    +  <li><a href="#settings">Settings</a></li>
     </ul>
     
     <div class="tab-content">
    -<div class="active" id="home">...</div>
    -<div id="profile">...</div>
    -<div id="messages">...</div>
    -<div id="settings">...</div>
    +  <div class="active" id="home">...</div>
    +  <div id="profile">...</div>
    +  <div id="messages">...</div>
    +  <div id="settings">...</div>
     </div>
     
     <script>
    -$(function () {
    -$('.tabs a:last').tab('show')
    -})
    +  $(function () {
    +    $('.tabs a:last').tab('show')
    +  })
     </script>
    -

    -

    Events

    - - - - - - - - - - - - - - - - - -
    EventDescription
    showThis event fires on tab show, but before the new tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively.
    shownThis event fires on tab show after a tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively.
    +

    +

    Events

    + + + + + + + + + + + + + + + + + +
    EventDescription
    showThis event fires on tab show, but before the new tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively.
    shownThis event fires on tab show after a tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively.
    -
    +          
     $('a[data-toggle="tab"]').on('shown', function (e) {
    -e.target // activated tab
    -e.relatedTarget // previous tab
    +  e.target // activated tab
    +  e.relatedTarget // previous tab
     })
    -
    -
    -
    +
    +
    +
    - -
    - -
    -
    -

    About Tooltips

    -

    Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, uss css3 for animations, and data-attributes for local title storage.

    - Download file -
    -
    -

    Example use of Tooltips

    -

    Hover over the links below to see tooltips:

    -
    -

    Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral. -

    + +
    + -
    -

    Using bootstrap-tooltip.js

    -

    Trigger the tooltip via javascript:

    -
    $('#example').tooltip(options)
    -

    Options

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Nametypedefaultdescription
    animationbooleantrueapply a css fade transition to the tooltip
    placementstring'top'how to position the tooltip - top | bottom | left | right
    selectorstringfalseIf a selector is provided, tooltip objects will be delegated to the specified targets.
    titlestring | function''default title value if `title` tag isn't present
    triggerstring'hover'how tooltip is triggered - hover | focus | manual
    delaynumber | object0 -

    delay showing/hiding the tooltip (ms)

    -

    If a number is supplied, delay is applied to both hide/show

    -

    Object structure is: delay: { show: 500, hide: 100 }

    -
    -

    Notice Individual tooltip instance options can alternatively be specified through the use of data attributes.

    -

    Markup

    -

    For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.

    -

    Methods

    -

    $().tooltip(options)

    -

    Attaches a tooltip handler to an element collection.

    -

    .tooltip('show')

    -

    Reveals an elements tooltip.

    -
    $('#element').tooltip('show')
    -

    .tooltip('hide')

    -

    Hides an elements tooltip.

    -
    $('#element').tooltip('hide')
    -
    -
    -
    +
    +
    +

    About Tooltips

    +

    Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, uss css3 for animations, and data-attributes for local title storage.

    + Download file +
    +
    +

    Example use of Tooltips

    +

    Hover over the links below to see tooltips:

    +
    +

    Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral. +

    +
    +
    +

    Using bootstrap-tooltip.js

    +

    Trigger the tooltip via javascript:

    +
    $('#example').tooltip(options)
    +

    Options

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Nametypedefaultdescription
    animationbooleantrueapply a css fade transition to the tooltip
    placementstring'top'how to position the tooltip - top | bottom | left | right
    selectorstringfalseIf a selector is provided, tooltip objects will be delegated to the specified targets.
    titlestring | function''default title value if `title` tag isn't present
    triggerstring'hover'how tooltip is triggered - hover | focus | manual
    delaynumber | object0 +

    delay showing/hiding the tooltip (ms)

    +

    If a number is supplied, delay is applied to both hide/show

    +

    Object structure is: delay: { show: 500, hide: 100 }

    +
    +

    Notice Individual tooltip instance options can alternatively be specified through the use of data attributes.

    +

    Markup

    +

    For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.

    +

    Methods

    +

    $().tooltip(options)

    +

    Attaches a tooltip handler to an element collection.

    +

    .tooltip('show')

    +

    Reveals an elements tooltip.

    +
    $('#element').tooltip('show')
    +

    .tooltip('hide')

    +

    Hides an elements tooltip.

    +
    $('#element').tooltip('hide')
    +
    +
    + - -
    - -
    -
    -

    About popovers

    -

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

    -

    * Requires Tooltip to be included

    - Download file -
    -
    -

    Example hover popover

    -

    Hover over the button to trigger the popover.

    -
    - hover for popover + +
    + -
    -

    Using bootstrap-popover.js

    -

    Enable popovers via javascript:

    -
    $('#example').popover(options)
    -

    Options

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Nametypedefaultdescription
    animationbooleantrueapply a css fade transition to the tooltip
    placementstring'right'how to position the popover - top | bottom | left | right
    selectorstringfalseif a selector is provided, tooltip objects will be delegated to the specified targets
    triggerstring'hover'how tooltip is triggered - hover | focus | manual
    titlestring | function''default title value if `title` attribute isn't present
    contentstring | function''default content value if `data-content` attribute isn't present
    delaynumber | object0 -

    delay showing/hiding the popover (ms)

    -

    If a number is supplied, delay is applied to both hide/show

    -

    Object structure is: delay: { show: 500, hide: 100 }

    -
    -

    Notice Individual popover instance options can alternatively be specified through the use of data attributes.

    -

    Markup

    -

    - For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option. -

    -

    Methods

    -

    $().popover(options)

    -

    Initializes popovers for an element collection.

    -

    .popover('show')

    -

    Reveals an elements popover.

    -
    $('#element').popover('show')
    -

    .popover('hide')

    -

    Hides an elements popover.

    -
    $('#element').popover('hide')
    -
    -
    -
    +
    +
    +

    About popovers

    +

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

    +

    * Requires Tooltip to be included

    + Download file +
    +
    +

    Example hover popover

    +

    Hover over the button to trigger the popover.

    + +
    +

    Using bootstrap-popover.js

    +

    Enable popovers via javascript:

    +
    $('#example').popover(options)
    +

    Options

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Nametypedefaultdescription
    animationbooleantrueapply a css fade transition to the tooltip
    placementstring'right'how to position the popover - top | bottom | left | right
    selectorstringfalseif a selector is provided, tooltip objects will be delegated to the specified targets
    triggerstring'hover'how tooltip is triggered - hover | focus | manual
    titlestring | function''default title value if `title` attribute isn't present
    contentstring | function''default content value if `data-content` attribute isn't present
    delaynumber | object0 +

    delay showing/hiding the popover (ms)

    +

    If a number is supplied, delay is applied to both hide/show

    +

    Object structure is: delay: { show: 500, hide: 100 }

    +
    +

    Notice Individual popover instance options can alternatively be specified through the use of data attributes.

    +

    Markup

    +

    + For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option. +

    +

    Methods

    +

    $().popover(options)

    +

    Initializes popovers for an element collection.

    +

    .popover('show')

    +

    Reveals an elements popover.

    +
    $('#element').popover('show')
    +

    .popover('hide')

    +

    Hides an elements popover.

    +
    $('#element').popover('hide')
    +
    +
    + - -
    - -
    -
    -

    About alerts

    -

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

    - Download -
    -
    -

    Example alerts

    -

    The alerts plugin works on regular alert messages, and block messages.

    -
    - × - Holy guacamole! Best check yo self, you’re not looking too good. + +
    + -
    - × -

    Oh snap! You got an error!

    -

    Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.

    -

    - Take this action Or do this -

    -
    -
    -

    Using bootstrap-alerts.js

    -

    Enable dismissal of an alert via javascript:

    -
    $(".alert-message").alert()
    -

    Markup

    -

    Just add data-dismiss="alert" to your close button to automatically give an alert close functionality.

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

    Methods

    -

    $().alert()

    -

    Wraps all alerts with close functionality. To have your alerts animate out when closed, make sure they have the .fade and .in class already applied to them.

    -

    .alert('close')

    -

    Closes an alert.

    -
    $(".alert-message").alert('close')
    -

    Events

    -

    Bootstrap's alert class exposes a few events for hooking into alert functionality.

    - - - - - - - - - - - - - - - - - -
    EventDescription
    closeThis event fires immediately when the close instance method is called.
    closedThis event is fired when the alert has been closed (will wait for css transitions to complete).
    +
    +
    +

    About alerts

    +

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

    + Download +
    +
    +

    Example alerts

    +

    The alerts plugin works on regular alert messages, and block messages.

    +
    + × + Holy guacamole! Best check yo self, you’re not looking too good. +
    +
    + × +

    Oh snap! You got an error!

    +

    Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.

    +

    + Take this action Or do this +

    +
    +
    +

    Using bootstrap-alerts.js

    +

    Enable dismissal of an alert via javascript:

    +
    $(".alert-message").alert()
    +

    Markup

    +

    Just add data-dismiss="alert" to your close button to automatically give an alert close functionality.

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

    Methods

    +

    $().alert()

    +

    Wraps all alerts with close functionality. To have your alerts animate out when closed, make sure they have the .fade and .in class already applied to them.

    +

    .alert('close')

    +

    Closes an alert.

    +
    $(".alert-message").alert('close')
    +

    Events

    +

    Bootstrap's alert class exposes a few events for hooking into alert functionality.

    + + + + + + + + + + + + + + + + + +
    EventDescription
    closeThis event fires immediately when the close instance method is called.
    closedThis event is fired when the alert has been closed (will wait for css transitions to complete).
     $('#my-alert').bind('closed', function () {
    -// do something ...
    +  // do something ...
     })
    -
    -
    -
    +
    +
    +
    - -
    - -
    -
    -

    About

    -

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

    - Download file -
    -
    -

    Example uses

    -

    Use the buttons plugin for states and toggles.

    - - - - - - - - - - - - - - - - - - - -
    Stateful - -
    Single toggle - -
    Checkbox -
    - - - -
    -
    Radio -
    - - - -
    -
    -
    -

    Using bootstrap-button.js

    -

    Enable buttons via javascript:

    -
    $('.tabs').button()
    -

    Markup

    -

    Data attributes are integral to the button plugin. Check out the example code below for the various markup types.

    + +
    + +
    +
    +

    About

    +

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

    + Download file +
    +
    +

    Example uses

    +

    Use the buttons plugin for states and toggles.

    + + + + + + + + + + + + + + + + + + + +
    Stateful + +
    Single toggle + +
    Checkbox +
    + + + +
    +
    Radio +
    + + + +
    +
    +
    +

    Using bootstrap-button.js

    +

    Enable buttons via javascript:

    +
    $('.tabs').button()
    +

    Markup

    +

    Data attributes are integral to the button plugin. Check out the example code below for the various markup types.

     <!-- Add data-toggle="button" to activate toggling on a single button -->
     <button class="btn" data-toggle="button">Single Toggle</button>
     
     <!-- Add data-toggle="buttons-checkbox" for checkbox style toggling on btn-group -->
     <div class="btn-group" data-toggle="buttons-checkbox">
    -<button class="btn">Left</button>
    -<button class="btn">Middle</button>
    -<button class="btn">Right</button>
    +  <button class="btn">Left</button>
    +  <button class="btn">Middle</button>
    +  <button class="btn">Right</button>
     </div>
     
     <!-- Add data-toggle="buttons-radio" for radio style toggling on btn-group -->
     <div class="btn-group" data-toggle="buttons-radio">
    -<button class="btn">Left</button>
    -<button class="btn">Middle</button>
    -<button class="btn">Right</button>
    +  <button class="btn">Left</button>
    +  <button class="btn">Middle</button>
    +  <button class="btn">Right</button>
     </div>
     
    -

    Methods

    -

    $().button('toggle')

    -

    Toggles push state. Gives btn the look that it's been activated.

    -

    Notice You can enable auto toggling of a button by using the data-toggle attribute.

    -
    <button class="btn" data-toggle="button" >...</button>
    -

    $().button('loading')

    -

    Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute data-loading-text. -

    -
    <button class="btn" data-loading-text="loading stuff..." >...</button>
    -

    - Notice Firefox persists the disabled state across page loads. A workaround for this is to use: autocomplete="off". More info can be found here. -

    -

    $().button('reset')

    -

    Resets button state - swaps text to original text.

    -

    $().button(string)

    -

    Resets button state - swaps text to any data defined text state.

    +

    Methods

    +

    $().button('toggle')

    +

    Toggles push state. Gives btn the look that it's been activated.

    +

    Notice You can enable auto toggling of a button by using the data-toggle attribute.

    +
    <button class="btn" data-toggle="button" >...</button>
    +

    $().button('loading')

    +

    Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute data-loading-text. +

    +
    <button class="btn" data-loading-text="loading stuff..." >...</button>
    +

    + Notice Firefox persists the disabled state across page loads. A workaround for this is to use: autocomplete="off". More info can be found here. +

    +

    $().button('reset')

    +

    Resets button state - swaps text to original text.

    +

    $().button(string)

    +

    Resets button state - swaps text to any data defined text state.

    <button class="btn" data-complete-text="finished!" >...</button>
     <script>
    -$('.btn').button('complete')
    +  $('.btn').button('complete')
     </script>
    -
    -
    -
    +
    +
    +
    - -
    - -
    -
    -

    About

    -

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

    - Download file -
    -
    -

    Example accordion

    -

    Using the collapse plugin, we built a simple accordion style widget:

    - -
    -
    - -
    -
    - Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS. -
    -
    + +
    + +
    +
    +

    About

    +

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

    + Download file
    -
    - -
    -
    - Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS. +
    +

    Example accordion

    +

    Using the collapse plugin, we built a simple accordion style widget:

    + +
    +
    + +
    +
    + Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS. +
    +
    -
    -
    -
    - -
    -
    - Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS. +
    + +
    +
    + Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS. +
    +
    +
    +
    + +
    +
    + Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS. +
    +
    -
    -
    - -
    -

    Using bootstrap-collapse.js

    -

    Enable via javascript:

    -
    $(".collapse").collapse()
    -

    Options

    - - - - - - - - - - - - - - - - - - - - - - - -
    Nametypedefaultdescription
    parentselectorfalseIf selector then all collapsible elements under the specified parent will be closed when this collasabile item is shown. (similar to traditional accordion behavior)
    togglebooleantrueToggles the collapsible element on invocation
    -

    Markup

    -

    Just add data-toggle="collapse" and a data-target to element to automatically assign control of a collapsible element. The data-target attribute accepts a css selector to apply the collapse to. Be sure to add the class collapse to the collapsible element. If you'd like it to default open, add the additional class in.

    -
    +          
    +          
    +

    Using bootstrap-collapse.js

    +

    Enable via javascript:

    +
    $(".collapse").collapse()
    +

    Options

    + + + + + + + + + + + + + + + + + + + + + + + +
    Nametypedefaultdescription
    parentselectorfalseIf selector then all collapsible elements under the specified parent will be closed when this collasabile item is shown. (similar to traditional accordion behavior)
    togglebooleantrueToggles the collapsible element on invocation
    +

    Markup

    +

    Just add data-toggle="collapse" and a data-target to element to automatically assign control of a collapsible element. The data-target attribute accepts a css selector to apply the collapse to. Be sure to add the class collapse to the collapsible element. If you'd like it to default open, add the additional class in.

    +
     <button class="btn danger" data-toggle="collapse" data-target="#demo">
    -simple collapsible
    +  simple collapsible
     </button>
     
     <div id="demo" class="collapse in"> … </div>
    -

    Notice To add accordion like group management to a collapsible control just add the additional data attribute data-parent="#selector". Refer to the demo below to see this in action.

    -

    Methods

    -

    .collapse(options)

    -

    Activates your content as a collapsible element. Accepts an optional options object. +

    Notice To add accordion like group management to a collapsible control just add the additional data attribute data-parent="#selector". Refer to the demo below to see this in action.

    +

    Methods

    +

    .collapse(options)

    +

    Activates your content as a collapsible element. Accepts an optional options object.

     $('#myCollapsible').collapse({
    -toggle: false
    +  toggle: false
     })
    -

    .collapse('toggle')

    -

    Toggles a collapsible element to shown or hidden.

    -

    .collapse('show')

    -

    Shows a collapsible element.

    -

    .collapse('hide')

    -

    Hides a collapsible element.

    -

    Events

    -

    - Bootstrap's collapse class exposes a few events for hooking into collapse functionality. -

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    EventDescription
    showThis event fires immediately when the show instance method is called.
    shownThis event is fired when a collapse element has been made visible to the user (will wait for css transitions to complete).
    hide - This event is fired immediately when the hide method has been called. -
    hiddenThis event is fired when a collapse element has been hidden from the user (will wait for css transitions to complete).
    +

    .collapse('toggle')

    +

    Toggles a collapsible element to shown or hidden.

    +

    .collapse('show')

    +

    Shows a collapsible element.

    +

    .collapse('hide')

    +

    Hides a collapsible element.

    +

    Events

    +

    + Bootstrap's collapse class exposes a few events for hooking into collapse functionality. +

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    EventDescription
    showThis event fires immediately when the show instance method is called.
    shownThis event is fired when a collapse element has been made visible to the user (will wait for css transitions to complete).
    hide + This event is fired immediately when the hide method has been called. +
    hiddenThis event is fired when a collapse element has been hidden from the user (will wait for css transitions to complete).
     $('#myCollapsible').on('hidden', function () {
    -// do something ...
    +  // do something ...
     })
    -
    -
    -
    +
    +
    +
    - - +

    .carousel('cycle')

    +

    Cycles through the carousel items from left to right.

    +

    .carousel('pause')

    +

    Stops the carousel from cycling through items.

    +

    .carousel(number)

    +

    Cycles the carousel to a particular frame (0 based, similar to an array).

    +

    .carousel('prev')

    +

    Cycles to the previous item.

    +

    .carousel('next')

    +

    Cycles to the next item.

    +

    Events

    +

    Bootstrap's modal class exposes a few events for hooking into modal functionality.

    + + + + + + + + + + + + + + + + + + +
    EventDescription
    slideThis event fires immediately when the slide instance method is invoked.
    slidThis event is fired when the carousel has completed it's slide transition.
    + + + - -
    - -
    -
    -

    About

    -

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

    - Download file -
    -
    -

    Example

    -

    Start typing in the field below to show the typeahead results.

    -
    - + +
    + -
    -

    Using bootstrap-typeahead.js

    -

    Call the typeahead via javascript:

    -
    $('.typeahead').typeahead()
    -

    Options

    - - - - - - - - - - - - - - - - - -
    Nametypedefaultdescription
    itemsnumber8The max number of items to display in the dropdown.
    +
    +
    +

    About

    +

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

    + Download file +
    +
    +

    Example

    +

    Start typing in the field below to show the typeahead results.

    +
    + +
    +
    +

    Using bootstrap-typeahead.js

    +

    Call the typeahead via javascript:

    +
    $('.typeahead').typeahead()
    +

    Options

    + + + + + + + + + + + + + + + + + +
    Nametypedefaultdescription
    itemsnumber8The max number of items to display in the dropdown.
    -

    Markup

    -

    Add data attributes to register an element with typeahead functionality.

    +

    Markup

    +

    Add data attributes to register an element with typeahead functionality.

     <input type="text" data-provide="typeahead">
     
    -
    -
    -
    \ No newline at end of file +
    +
    +
    \ No newline at end of file diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 567ac6d0d..c586af1b9 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -1,10 +1,14 @@ - - -
    -

    Scaffolding

    -

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

    -
    + +
    +

    Scaffolding

    +

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

    + +
    diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache index a243d6ad5..475539284 100644 --- a/docs/templates/pages/upgrading.mustache +++ b/docs/templates/pages/upgrading.mustache @@ -1,9 +1,9 @@ - -
    -

    Upgrading to Bootstrap 2

    -

    Learn about significant changes and additions since v1.4 with this handy guide.

    -
    + +
    +

    Upgrading to Bootstrap 2

    +

    Learn about significant changes and additions since v1.4 with this handy guide.

    +

    Rough outline

    diff --git a/docs/upgrading.html b/docs/upgrading.html index 7e43408ac..ee18cbeb0 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -27,79 +27,30 @@ -
    #First NameLast NameLanguage{{_i}}First Name{{/i}}{{_i}}Last Name{{/i}}{{_i}}Language{{/i}}
    #First NameLast NameLanguage{{_i}}First Name{{/i}}{{_i}}Last Name{{/i}}{{_i}}Language{{/i}}
    #First NameLast NameLanguage{{_i}}First Name{{/i}}{{_i}}Last Name{{/i}}{{_i}}Language{{/i}}
    #First NameLast NameLanguage{{_i}}First Name{{/i}}{{_i}}Last Name{{/i}}{{_i}}Language{{/i}}
    #First NameLast NameLanguage{{_i}}First Name{{/i}}{{_i}}Last Name{{/i}}{{_i}}Language{{/i}}
    -

    Styles for the Tablesorter, zebra striping, borders, and condensing may all compound in any variation to fit your needs.

    +

    {{_i}}Styles for the Tablesorter, zebra striping, borders, and condensing may all compound in any variation to fit your needs.{{/i}}

    - - - + + + -- cgit v1.2.3 From 540d229eba6e65c0d18b706df73fb51322b5ea40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Robichet?= Date: Tue, 24 Jan 2012 21:57:30 +0100 Subject: Fixed a mailto typo --- docs/base-css.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/base-css.html b/docs/base-css.html index f21f25f6b..79200009a 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
    -- cgit v1.2.3 From 925fef411090f06b34c5e86f4d0ed5630adff87b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Robichet?= Date: Tue, 24 Jan 2012 22:11:09 +0100 Subject: Typo on tablesorter --- docs/assets/js/application.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 2da4ab8e2..95caa0f31 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -22,7 +22,7 @@ $(function(){ window.prettyPrint && prettyPrint() // table sort example - if ($.fn.tableSorter) { + if ($.fn.tablesorter) { $("#sortTableExample").tablesorter( { sortList: [[ 1, 0 ]] } ) $(".tablesorter-example").tablesorter({ sortList: [[1,0]] }) } -- cgit v1.2.3 From 5fb31670af6df88afb0a82872b6f7935486f91c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Robichet?= Date: Tue, 24 Jan 2012 22:12:37 +0100 Subject: Added jquery.tablesorter js file --- docs/base-css.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs') diff --git a/docs/base-css.html b/docs/base-css.html index 79200009a..01c4d115c 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1509,6 +1509,7 @@ + -- cgit v1.2.3 From 425e5bfb71527e932858ad41f9e234fc05d65c6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= Date: Tue, 24 Jan 2012 22:17:32 +0100 Subject: Final translation tags in Base CSS --- docs/templates/pages/base-css.mustache | 325 +++++++++++++++++---------------- 1 file changed, 163 insertions(+), 162 deletions(-) (limited to 'docs') diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 5a58b9663..b8c413888 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -809,125 +809,125 @@ ================================================== -->
    -

    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.

    +

    {{_i}}Flexible HTML and CSS{{/i}}

    +

    {{_i}}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.{{/i}}

    +

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

    -

    Four layouts included

    -

    Bootstrap comes with support for four types of form layouts:

    +

    {{_i}}Four layouts included{{/i}}

    +

    {{_i}}Bootstrap comes with support for four types of form layouts:{{/i}}

      -
    • Vertical (default)
    • -
    • Search
    • -
    • Inline
    • -
    • Horizontal
    • +
    • {{_i}}Vertical (default){{/i}}
    • +
    • {{_i}}Search{{/i}}
    • +
    • {{_i}}Inline{{/i}}
    • +
    • {{_i}}Horizontal{{/i}}
    -

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

    +

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

    -

    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.

    +

    {{_i}}Control states and more{{/i}}

    +

    {{_i}}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.{{/i}}

    +

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

    -

    Four types of forms

    -

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

    +

    {{_i}}Four types of forms{{/i}}

    +

    {{_i}}Bootstrap provides simple markup and styles for four styles of common web forms.{{/i}}

    #First NameLast NameLanguage{{_i}}First Name{{/i}}{{_i}}Last Name{{/i}}{{_i}}Language{{/i}}
    - - - + + + - - - + + + - + - + - + - + - + - +
    NameClassDescription{{_i}}Name{{/i}}{{_i}}Class{{/i}}{{_i}}Description{{/i}}
    Vertical (default).vertical-form (not required)Stacked, left-aligned labels over controls{{_i}}Vertical (default){{/i}}.vertical-form ({{_i}}not required{{/i}}){{_i}}Stacked, left-aligned labels over controls{{/i}}
    Horizontal{{_i}}Horizontal{{/i}} .form-horizontalFloat left, right-aligned labels on same line as controls{{_i}}Float left, right-aligned labels on same line as controls{{/i}}
    Inline{{_i}}Inline{{/i}} .form-inlineLeft-aligned label and inline-block controls for compact style{{_i}}Left-aligned label and inline-block controls for compact style{{/i}}
    Search{{_i}}Search{{/i}} .form-searchExtra-rounded text input for a typical search aesthetic{{_i}}Extra-rounded text input for a typical search aesthetic{{/i}}
    -

    Example forms using just form controls, no extra markup

    +

    {{_i}}Example forms using just form controls, no extra markup{{/i}}

    -

    Basic form

    -

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

    +

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

    +

    {{_i}}With v2.0, we have lighter and smarter defaults for form styles. No extra markup, just form controls.{{/i}}

    - - + + - +
    -

    Search form

    -

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

    +

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

    +

    {{_i}}Reflecting default WebKit styles, just add .form-search for extra rounded search fields.{{/i}}

    -

    Inline form

    -

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

    +

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

    +

    {{_i}}Inputs are block level to start. For .form-inline and .form-horizontal, we use inline-block.{{/i}}


    -

    Horizontal forms

    +

    {{_i}}Horizontal forms{{/i}}

    - Controls Bootstrap supports + {{_i}}Controls Bootstrap supports{{/i}}
    - +
    -

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

    +

    {{_i}}In addition to freeform text, any HTML5 text-based input appears like so.{{/i}}

    - +
    - +
    @@ -951,39 +951,39 @@
    - +
    - +
    - - + +
    -

    What's included

    -

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

    +

    {{_i}}What's included{{/i}}

    +

    {{_i}}Shown on the left are all the default form controls we support. Here's the bulleted list:{{/i}}

      -
    • text inputs (text, password, email, etc)
    • -
    • checkbox
    • -
    • radio
    • -
    • select
    • -
    • multiple select
    • -
    • file input
    • -
    • textarea
    • +
    • {{_i}}text inputs (text, password, email, etc){{/i}}
    • +
    • {{_i}}checkbox{{/i}}
    • +
    • {{_i}}radio{{/i}}
    • +
    • {{_i}}select{{/i}}
    • +
    • {{_i}}multiple select{{/i}}
    • +
    • {{_i}}file input{{/i}}
    • +
    • {{_i}}textarea{{/i}}

    -

    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.

    +

    {{_i}}New defaults with v2.0{{/i}}

    +

    {{_i}}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.{{/i}}

    @@ -993,66 +993,66 @@
    - Form control states + {{_i}}Form control states{{/i}}
    - +
    - +
    - +
    - +
    - +
    - +
    - Something may have gone wrong + {{_i}}Something may have gone wrong{{/i}}
    - +
    - Please correct the error + {{_i}}Please correct the error{{/i}}
    - +
    - Woohoo! + {{_i}}Woohoo!{{/i}}
    - - + +
    -

    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.

    +

    {{_i}}Redesigned browser states{{/i}}

    +

    {{_i}}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.{{/i}}


    -

    Form validation

    -

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

    +

    {{_i}}Form validation{{/i}}

    +

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

     <fieldset
       class="control-group error">
    -  ...
    +  …
     </fieldset>
     
    @@ -1064,38 +1064,38 @@
    - Extending form controls + {{_i}}Extending form controls{{/i}}
    - +
    -

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

    +

    {{_i}}Use the same .span* classes from the grid system for input sizes.{{/i}}

    - +
    @
    -

    Here's some help text

    +

    {{_i}}Here's some help text{{/i}}

    - +
    .00
    -

    Here's more help text

    +

    {{_i}}Here's more help text{{/i}}

    - +
    - +
    -

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

    +

    {{_i}}Note: Labels surround all the options for much larger click areas and a more usable form.{{/i}}

    - +
    - - + +
    -

    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.

    +

    {{_i}}Prepend & append inputs{{/i}}

    +

    {{_i}}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.{{/i}}


    -

    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.

    +

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

    +

    {{_i}}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">.{{/i}}

    +

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

    @@ -1162,81 +1162,82 @@
    - - - + + + - + - + - + - + - + - + - + - + - + - +
    ButtonClassDescription{{_i}}Button{{/i}}{{_i}}Class{{/i}}{{_i}}Description{{/i}}
    Default{{_i}}Default{{/i}} .btnStandard gray button with gradient{{_i}}Standard gray button with gradient{{/i}}
    Primary{{_i}}Primary{{/i}} .primaryProvides extra visual weight and identifies the primary action in a set of buttons{{_i}}Provides extra visual weight and identifies the primary action in a set of buttons{{/i}}
    Info{{_i}}Info{{/i}} .infoUsed as an alternate to the default styles{{_i}}Used as an alternate to the default styles{{/i}}
    Success{{_i}}Success{{/i}} .successIndicates a successful or positive action{{_i}}Indicates a successful or positive action{{/i}}
    Danger{{_i}}Danger{{/i}} .dangerIndicates a dangerous or potentially negative action{{_i}}Indicates a dangerous or potentially negative action{{/i}}
    -

    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.

    +

    {{_i}}Buttons for actions{{/i}}

    +

    {{_i}}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.{{/i}}

    -

    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.

    +

    {{_i}}For anchors and forms{{/i}}

    +

    {{_i}}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.{{/i}}

    -

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

    +

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

    -

    Multiple sizes

    -

    Fancy larger or smaller buttons? Have at it!

    +

    {{_i}}Multiple sizes{{/i}}

    +

    {{_i}}Fancy larger or smaller buttons? Have at it!{{/i}}

    - Primary action - Action + {{_i}}Primary action{{/i}} + {{_i}}Action{{/i}}

    - Primary action - Action + {{_i}}Primary action{{/i}} + {{_i}}Action{{/i}}

    -

    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.

    +

    {{_i}}Disabled state{{/i}}

    +

    {{_i}}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.{{/i}}

    - Primary action - Action + {{_i}}Primary action{{/i}} + {{_i}}Action{{/i}}

    -   + +

    @@ -1251,7 +1252,7 @@ ================================================== -->
    @@ -1365,7 +1366,7 @@
    -

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

    +

    {{_i}}Light red background color is only used to show the dimensions of the icons in the docs.{{/i}}

    @@ -1373,38 +1374,38 @@
    -

    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.

    +

    {{_i}}Built as a sprite{{/i}}

    +

    {{_i}}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.{{/i}}

    +

    {{_i}}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.{{/i}}

    -

    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}}How to use{{/i}}

    +

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

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

    +

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

    -

    Use cases

    -

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

    +

    {{_i}}Use cases{{/i}}

    +

    {{_i}}Icons are great, but where would one use them? Here are a few ideas:{{/i}}

      -
    • 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
    • +
    • {{_i}}As visuals for your sidebar navigation{{/i}}
    • +
    • {{_i}}For a purely icon-driven nav{{/i}}
    • +
    • {{_i}}For buttons to help convey the meaning of an action{{/i}}
    • +
    • {{_i}}With links to share context on a user's destination{{/i}}
    -

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

    +

    {{_i}}Essentially, anywhere you can put an <i> tag, you can put an icon.{{/i}}

    -

    Examples

    +

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

    -

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

    +

    {{_i}}Use them in buttons, or in button groups for a toolbar style presentation.{{/i}}

    - Refresh - Settings + {{_i}}Refresh{{/i}} + {{_i}}Settings{{/i}}

    @@ -1421,12 +1422,12 @@
    -

    Or, use them in navigation.

    +

    {{_i}}Or, use them in navigation.{{/i}}

    -- 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 ++-- docs/components.html | 2 +- docs/javascript.html | 2 +- docs/less.html | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'docs') 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.

    diff --git a/docs/components.html b/docs/components.html index 3a15541c4..9d28b9e06 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1088,7 +1088,7 @@

    Rewritten base class

    -

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

    +

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

    Single alert message

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


    diff --git a/docs/javascript.html b/docs/javascript.html index bdcc622de..a35c29913 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -856,7 +856,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

    Notice Individual popover instance options can alternatively be specified through the use of data attributes.

    Markup

    - For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option. + For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option.

    Methods

    $().popover(options)

    diff --git a/docs/less.html b/docs/less.html index cc8197118..cd486ac98 100644 --- a/docs/less.html +++ b/docs/less.html @@ -75,7 +75,7 @@

    Why LESS?

    -

    Bootstrap is made with LESS at its core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.

    +

    Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.

    What's included?

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

    - - - + + + - + - +
    VariableValueUsage{{_i}}Variable{{/i}}{{_i}}Value{{/i}}{{_i}}Usage{{/i}}
    @linkColor #0069d6Default link text color{{_i}}Default link text color{{/i}}
    @linkColorHover darken(@linkColor, 15)Default link text hover color{{_i}}Default link text hover color{{/i}}
    -

    Grayscale colors

    +

    {{_i}}Grayscale colors{{/i}}

    @@ -106,7 +106,7 @@
    -

    Accent colors

    +

    {{_i}}Accent colors{{/i}}

    @@ -144,7 +144,7 @@
    -

    Grid system

    +

    {{_i}}Grid system{{/i}}

    @@ -167,7 +167,7 @@
    -

    Typography

    +

    {{_i}}Typography{{/i}}

    @@ -190,7 +190,7 @@
    -

    Visuals

    +

    {{_i}}Visuals{{/i}}

    @@ -209,7 +209,7 @@ @@ -217,7 +217,7 @@ @@ -225,7 +225,7 @@ @@ -235,25 +235,25 @@ ================================================== -->
    -

    Bootstrap was built with Preboot, an open-source pack of mixins and variables to be used in conjunction with Less, a CSS preprocessor for faster and easier web development.

    -

    Check out how we used Preboot in Bootstrap and how you can make use of it should you choose to run Less on your next project.

    +

    {{_i}}Bootstrap was built with Preboot, an open-source pack of mixins and variables to be used in conjunction with Less, a CSS preprocessor for faster and easier web development.{{/i}}

    +

    {{_i}}Check out how we used Preboot in Bootstrap and how you can make use of it should you choose to run Less on your next project.{{/i}}

    -

    How to use it

    -

    Use this option to make full use of Bootstrap’s Less variables, mixins, and nesting in CSS via javascript in your browser.

    +

    {{_i}}How to use it{{/i}}

    +

    {{_i}}Use this option to make full use of Bootstrap’s Less variables, mixins, and nesting in CSS via javascript in your browser.{{/i}}

     <link rel="stylesheet/less" href="less/bootstrap.less" media="all" />
     <script src="js/less-1.1.3.min.js"></script>
    -

    Not feeling the .js solution? Try the Less Mac app or use Node.js to compile when you deploy your code.

    +

    {{_i}}Not feeling the .js solution? Try the Less Mac app or use Node.js to compile when you deploy your code.{{/i}}

    -

    What’s included

    -

    Here are some of the highlights of what’s included in Twitter Bootstrap as part of Bootstrap. Head over to the Bootstrap website or Github project page to download and learn more.

    -

    Variables

    -

    Variables in Less are perfect for maintaining and updating your CSS headache free. When you want to change a color value or a frequently used value, update it in one spot and you’re set.

    +

    {{_i}}What’s included{{/i}}

    +

    {{_i}}Here are some of the highlights of what’s included in Twitter Bootstrap as part of Bootstrap. Head over to the Bootstrap website or Github project page to download and learn more.{{/i}}

    +

    {{_i}}Variables{{/i}}

    +

    {{_i}}Variables in Less are perfect for maintaining and updating your CSS headache free. When you want to change a color value or a frequently used value, update it in one spot and you’re set.{{/i}}

     // Links
     @linkColor:         #8b59c2;
    @@ -281,16 +281,16 @@
     @baseline:          18px;
     
    -

    Commenting

    -

    Less also provides another style of commenting in addition to CSS’s normal /* ... */ syntax.

    +

    {{_i}}Commenting{{/i}}

    +

    {{_i}}Less also provides another style of commenting in addition to CSS’s normal /* ... */ syntax.{{/i}}

     // This is a comment
     /* This is also a comment */
     
    -

    Mixins up the wazoo

    -

    Mixins are basically includes or partials for CSS, allowing you to combine a block of code into one. They’re great for vendor prefixed properties like box-shadow, cross-browser gradients, font stacks, and more. Below is a sample of the mixins that are included with Bootstrap.

    -

    Font stacks

    +

    {{_i}}Mixins up the wazoo{{/i}}

    +

    {{_i}}Mixins are basically includes or partials for CSS, allowing you to combine a block of code into one. They’re great for vendor prefixed properties like box-shadow, cross-browser gradients, font stacks, and more. Below is a sample of the mixins that are included with Bootstrap.{{/i}}

    +

    {{_i}}Font stacks{{/i}}

     #font {
       .shorthand(@weight: normal, @size: 14px, @lineHeight: 20px) {
    @@ -307,7 +307,7 @@
       ...
     }
     
    -

    Gradients

    +

    {{_i}}Gradients{{/i}}

     #gradient {
       ...
    @@ -326,8 +326,8 @@
     }
     
    -

    Operations

    -

    Get fancy and perform some math to generate flexible and powerful mixins like the one below.

    +

    {{_i}}Operations{{/i}}

    +

    {{_i}}Get fancy and perform some math to generate flexible and powerful mixins like the one below.{{/i}}

     // Griditude
     @gridColumns:       16;
    @@ -341,62 +341,62 @@
     }
     
    -

    Compiling Less

    -

    After modifying the .less files in /lib/, you'll need to recompile them in order to regenerate the bootstrap-*.*.*.css and bootstrap-*.*.*.min.css files. If you're submitting a pull request to GitHub, you must always recompile.

    -

    Ways to compile

    +

    {{_i}}Compiling Less{{/i}}

    +

    {{_i}}After modifying the .less files in /lib/, you'll need to recompile them in order to regenerate the bootstrap-*.*.*.css and bootstrap-*.*.*.min.css files. If you're submitting a pull request to GitHub, you must always recompile.{{/i}}

    +

    {{_i}}Ways to compile{{/i}}

    - - + + - + - + - + - + - + - + - +
    MethodSteps{{_i}}Method{{/i}}{{_i}}Steps{{/i}}
    Node with makefile{{_i}}Node with makefile{{/i}} -

    Install the LESS command line compiler with npm by running the following command:

    +

    {{_i}}Install the LESS command line compiler with npm by running the following command:{{/i}}

    $ npm install less
    -

    Once installed just run make from the root of your bootstrap directory and you're all set.

    -

    Additionally, if you have watchr installed, you may run make watch to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).

    +

    {{_i}}Once installed just run make from the root of your bootstrap directory and you're all set.{{/i}}

    +

    {{_i}}Additionally, if you have watchr installed, you may run make watch to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).{{/i}}

    Javascript{{_i}}Javascript{{/i}} -

    Download the latest Less.js and include the path to it (and Bootstrap) in the <head>.

    +

    {{_i}}Download the latest Less.js and include the path to it (and Bootstrap) in the <head>.{{/i}}

     <link rel="stylesheet/less" href="/path/to/bootstrap.less">
     <script src="/path/to/less.js"></script>
     
    -

    To recompile the .less files, just save them and reload your page. Less.js compiles them and stores them in local storage.

    +

    {{_i}}To recompile the .less files, just save them and reload your page. Less.js compiles them and stores them in local storage.{{/i}}

    Command line{{_i}}Command line{{/i}} -

    Install the LESS command line tool via Node and run the following command:

    +

    {{_i}}Install the LESS command line tool via Node and run the following command:{{/i}}

    $ lessc ./lib/bootstrap.less > bootstrap.css
    -

    Be sure to include --compress in that command if you're trying to save some bytes!

    +

    {{_i}}Be sure to include --compress in that command if you're trying to save some bytes!{{/i}}

    Unofficial Mac app{{_i}}Unofficial Mac app{{/i}} -

    The unofficial Mac app watches directories of .less files and compiles the code to local files after every save of a watched .less file.

    -

    If you like, you can toggle preferences in the app for automatic minifying and which directory the compiled files end up in.

    +

    {{_i}}The unofficial Mac app watches directories of .less files and compiles the code to local files after every save of a watched .less file.{{/i}}

    +

    {{_i}}If you like, you can toggle preferences in the app for automatic minifying and which directory the compiled files end up in.{{/i}}

    CrunchCrunch is a great looking LESS editor and compiler built on Adobe Air.{{_i}}Crunch is a great looking LESS editor and compiler built on Adobe Air.{{/i}}
    CodeKitCreated by the same guy as the unofficial Mac app, CodeKit is a Mac app that compiles LESS, SASS, Stylus, and CoffeeScript.{{_i}}Created by the same guy as the unofficial Mac app, CodeKit is a Mac app that compiles LESS, SASS, Stylus, and CoffeeScript.{{/i}}
    SimplessMac, Linux, and PC app for drag and drop compiling of LESS files. Plus, the source code is on GitHub.{{_i}}Mac, Linux, and PC app for drag and drop compiling of LESS files. Plus, the source code is on GitHub.{{/i}}
    -- cgit v1.2.3 From f03e170054be081738493c6dace4b37a7a3d40cd Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 24 Jan 2012 14:08:03 -0800 Subject: scaffolding i18n --- docs/templates/pages/scaffolding.mustache | 134 +++++++++++++++--------------- 1 file changed, 67 insertions(+), 67 deletions(-) (limited to 'docs') diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index c586af1b9..7c0c12e8f 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -1,12 +1,12 @@
    -

    Scaffolding

    -

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

    +

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

    +

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

    @@ -16,7 +16,7 @@ ================================================== -->

    Default 940px grid

    @@ -53,8 +53,8 @@
    -

    The default grid system provided as part of Bootstrap is a 940px-wide, 12-column grid.

    -

    It also has three responsive variations for various devices and resolutions: phone, tablet, and large widescreen desktops.

    +

    {{_i}}The default grid system provided as part of Bootstrap is a 940px-wide, 12-column grid.{{/i}}

    +

    {{_i}}It also has three responsive variations for various devices and resolutions: phone, tablet, and large widescreen desktops.{{/i}}

    @@ -65,7 +65,7 @@
     
    -

    As shown here, a basic layout can be created with two "columns," each spanning a number of the 12 foundational columns we defined as part of our grid system.

    +

    {{_i}}As shown here, a basic layout can be created with two "columns," each spanning a number of the 12 foundational columns we defined as part of our grid system.{{/i}}

    @@ -84,20 +84,20 @@
    -

    Nesting columns

    +

    {{_i}}Nesting columns{{/i}}

    -

    With the static (non-fluid) grid system in Bootstrap, nesting is easy. To nest your content, just add a new .row and set of .span* columns within an existing .span* column.

    -

    Example

    +

    {{_i}}With the static (non-fluid) grid system in Bootstrap, nesting is easy. To nest your content, just add a new .row and set of .span* columns within an existing .span* column.{{/i}}

    +

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

    - Level 1 of column + {{_i}}Level 1 of column{{/i}}
    - Level 2 + {{_i}}Level 2{{/i}}
    - Level 2 + {{_i}}Level 2{{/i}}
    @@ -107,10 +107,10 @@
     <div class="row">
       <div class="span12">
    -    Level 1 of column
    +    {{_i}}Level 1 of column{{/i}}
         <div class="row">
    -      <div class="span6">Level 2</div>
    -      <div class="span6">Level 2</div>
    +      <div class="span6">{{_i}}Level 2{{/i}}</div>
    +      <div class="span6">{{_i}}Level 2{{/i}}</div>
         </div>
       </div>
     </div>
    @@ -118,50 +118,50 @@
         
    -

    Grid customization

    +

    {{_i}}Grid customization{{/i}}

    - - - + + + - + - + - + - - + +
    VariableDefault valueDescription{{_i}}Variable{{/i}}{{_i}}Default value{{/i}}{{_i}}Description{{/i}}
    @gridColumns 12Number of columns{{_i}}Number of columns{{/i}}
    @gridColumnWidth 60pxWidth of each column{{_i}}Width of each column{{/i}}
    @gridGutterWidth 20pxNegative space between columns{{_i}}Negative space between columns{{/i}}
    @siteWidthComputed sum of all columns and guttersCounts number of columns and gutters to set width of the .fixed-container() mixin{{_i}}Computed sum of all columns and gutters{{/i}}{{_i}}Counts number of columns and gutters to set width of the .fixed-container() mixin{{/i}}
    -

    Variables in LESS

    -

    Built into Bootstrap are a handful of variables for customizing the default 940px grid system, documented above. All variables for the grid are stored in variables.less.

    +

    {{_i}}Variables in LESS{{/i}}

    +

    {{_i}}Built into Bootstrap are a handful of variables for customizing the default 940px grid system, documented above. All variables for the grid are stored in variables.less.{{/i}}

    -

    How to customize

    -

    Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grids in the preboot.less file and use one of the four ways documented to recompile.

    +

    {{_i}}How to customize{{/i}}

    +

    {{_i}}Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grids in the preboot.less file and use one of the four ways documented to recompile.{{/i}}

    -

    Staying responsive

    -

    Customization of the grid only works at the default level, the 940px grid. To maintain the responsive aspects of Bootstrap, you'll also have to customize the grids in responsive.less.

    +

    {{_i}}Staying responsive{{/i}}

    +

    {{_i}}Customization of the grid only works at the default level, the 940px grid. To maintain the responsive aspects of Bootstrap, you'll also have to customize the grids in responsive.less.{{/i}}

    @@ -173,13 +173,13 @@ ================================================== -->
    -

    Fixed layout

    -

    The default and simple 940px-wide, centered layout for just about any website or page provided by a single <div class="container">.

    +

    {{_i}}Fixed layout{{/i}}

    +

    {{_i}}The default and simple 940px-wide, centered layout for just about any website or page provided by a single <div class="container">.{{/i}}

    @@ -192,8 +192,8 @@
    -

    Fluid layout

    -

    <div class="fluid-container"> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.

    +

    {{_i}}Fluid layout{{/i}}

    +

    {{_i}}<div class="fluid-container"> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.{{/i}}

    @@ -221,7 +221,7 @@ ================================================== -->
    @@ -229,42 +229,42 @@ Responsive devices
    -

    Supported devices

    -

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

    +

    {{_i}}Supported devices{{/i}}

    +

    {{_i}}Bootstrap supports a handful of media queries to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:{{/i}}

    - - - - + + + + - + - + - + - + - + - + - + @@ -272,12 +272,12 @@
    LabelLayout widthColumn widthGutter width{{_i}}Label{{/i}}{{_i}}Layout width{{/i}}{{_i}}Column width{{/i}}{{_i}}Gutter width{{/i}}
    Smartphones{{_i}}Smartphones{{/i}} 480px and belowFluid columns, no fixed widths{{_i}}Fluid columns, no fixed widths{{/i}}
    Portrait tablets{{_i}}Portrait tablets{{/i}} 480px to 768pxFluid columns, no fixed widths{{_i}}Fluid columns, no fixed widths{{/i}}
    Landscape tablets{{_i}}Landscape tablets{{/i}} 768px to 940px 44px 20px
    Default{{_i}}Default{{/i}} 940px and up 60px 20px
    Large display{{_i}}Large display{{/i}} 1210px and up 70px 30px
    -

    What they do

    -

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

    +

    {{_i}}What they do{{/i}}

    +

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

      -
    • Modify the width of column in our grid
    • -
    • Stack elements instead of float wherever necessary
    • -
    • Resize headings and text to be more appropriate for devices
    • +
    • {{_i}}Modify the width of column in our grid{{/i}}
    • +
    • {{_i}}Stack elements instead of float wherever necessary{{/i}}
    • +
    • {{_i}}Resize headings and text to be more appropriate for devices{{/i}}
    @@ -285,29 +285,29 @@
    -

    Using the media queries

    +

    {{_i}}Using the media queries{{/i}}

    -

    Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:

    +

    {{_i}}Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:{{/i}}

      -
    1. Use the compiled responsive version, bootstrap.reponsive.css
    2. -
    3. Add @import "responsive.less" and recompile Bootstrap
    4. -
    5. Compile responsive.less as a separate file and include that
    6. +
    7. {{_i}}Use the compiled responsive version, bootstrap.reponsive.css{{/i}}
    8. +
    9. {{_i}}Add @import "responsive.less" and recompile Bootstrap{{/i}}
    10. +
    11. {{_i}}Compile responsive.less as a separate file and include that{{/i}}
    -

    Why not just include it? Truth be told, not everything needs to be responsive. Instead of encouraging developers to remove this feature, we figure it best to enable it.

    +

    {{_i}}Why not just include it? Truth be told, not everything needs to be responsive. Instead of encouraging developers to remove this feature, we figure it best to enable it.{{/i}}

    -  // Landscape phones and down
    +  // {{_i}}Landscape phones and down{{/i}}
       @media (max-width: 480px) { ... }
     
    -  // Landscape phone to portrait tablet
    +  // {{_i}}Landscape phone to portrait tablet{{/i}}
       @media (min-width: 480px) and (max-width: 768px) { ... }
     
    -  // Portrait tablet to landscape and desktop
    +  // {{_i}}Portrait tablet to landscape and desktop{{/i}}
       @media (min-width: 768px) and (max-width: 940px) { ... }
     
    -  // Large desktop
    +  // {{_i}}Large desktop{{/i}}
       @media (min-width: 1210px) { .. }
     
    -- cgit v1.2.3 From f4543ecb19f41f93db94e56601e0a4132ea4828f Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 24 Jan 2012 14:14:01 -0800 Subject: add i18n to upgrading --- docs/templates/pages/upgrading.mustache | 74 ++++++++++++++++----------------- 1 file changed, 37 insertions(+), 37 deletions(-) (limited to 'docs') diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache index 475539284..cc731eae1 100644 --- a/docs/templates/pages/upgrading.mustache +++ b/docs/templates/pages/upgrading.mustache @@ -1,78 +1,78 @@
    -

    Upgrading to Bootstrap 2

    -

    Learn about significant changes and additions since v1.4 with this handy guide.

    +

    {{_i}}Upgrading to Bootstrap 2{{/i}}

    +

    {{_i}}Learn about significant changes and additions since v1.4 with this handy guide.{{/i}}

    Rough outline

      -
    • Docs completely overhauled +
    • {{_i}}Docs completely overhauled{{/i}}
        -
      • Responsive thanks to new grid system
      • -
      • Now less marketing and more information
      • -
      • Extensive use of tables to share classes and elements of most components
      • -
      • Broken down into several pages for easier consumption
      • +
      • {{_i}}Responsive thanks to new grid system{{/i}}
      • +
      • {{_i}}Now less marketing and more information{{/i}}
      • +
      • {{_i}}Extensive use of tables to share classes and elements of most components{{/i}}
      • +
      • {{_i}}Broken down into several pages for easier consumption{{/i}}
    • -
    • Updated grid system, now only 12 columns +
    • {{_i}}Updated grid system, now only 12 columns{{/i}}
        -
      • Same great classes, but now only 12 columns
      • -
      • Responsive approach means your projects virtually work out of the box on smartphones, tablets, and more
      • +
      • {{_i}}Same great classes, but now only 12 columns{{/i}}
      • +
      • {{_i}}Responsive approach means your projects virtually work out of the box on smartphones, tablets, and more{{/i}}
    • -
    • New thumbnails (previously media grids) +
    • {{_i}}New thumbnails (previously media grids){{/i}}
        -
      • .media-grid class has been changed to .thumbnails
      • -
      • Individual thumbnails now require .thumbnail class
      • +
      • {{_i}}.media-grid class has been changed to .thumbnails{{/i}}
      • +
      • {{_i}}Individual thumbnails now require .thumbnail class{{/i}}
    • -
    • Updated forms +
    • {{_i}}Updated forms{{/i}}
        -
      • Default form style is now stacked to use less CSS and add flexibility
      • -
      • Exact same markup is required for vertical or horizontal forms—just swap the classes
      • -
      • New form defaults for search, inline, vertical, and horizontal
      • +
      • {{_i}}Default form style is now stacked to use less CSS and add flexibility{{/i}}
      • +
      • {{_i}}Exact same markup is required for vertical or horizontal forms—just swap the classes{{/i}}
      • +
      • {{_i}}New form defaults for search, inline, vertical, and horizontal{{/i}}
    • Updated tables
        -
      • Table classes made more consistent
      • -
      • Removed unused table color options (too much code for such little impact)
      • +
      • {{_i}}Table classes made more consistent{{/i}}
      • +
      • {{_i}}Removed unused table color options (too much code for such little impact){{/i}}
    • Typography
        -
      • Right-aligned option for blockquotes if float: right;
      • -
      • h4 elements were dropped from 16px to 14px with a default line-height of 18px
      • -
      • h5 elements were dropped from 14px to 12px
      • -
      • h6 elements were dropped from 13px to 11px
      • +
      • {{_i}}Right-aligned option for blockquotes if float: right;{{/i}}
      • +
      • {{_i}}h4 elements were dropped from 16px to 14px with a default line-height of 18px{{/i}}
      • +
      • {{_i}}h5 elements were dropped from 14px to 12px{{/i}}
      • +
      • {{_i}}h6 elements were dropped from 13px to 11px{{/i}}
    • -
    • Buttons +
    • {{_i}}Buttons{{/i}}
        -
      • Added button bar options
      • +
      • {{_i}}Added button bar options{{/i}}
    • -
    • Examples +
    • {{_i}}Examples{{/i}}
        -
      • Fluid examples redone. .fluid-container now requires a .sidebar-left or .sidebar-right as well. Fluid sidebar element has a new class, .fluid-sidebar.
      • +
      • {{_i}}Fluid examples redone. .fluid-container now requires a .sidebar-left or .sidebar-right as well. Fluid sidebar element has a new class, .fluid-sidebar.{{/i}}
    • -
    • Dropdown menus +
    • {{_i}}Dropdown menus{{/i}}
        -
      • Updated the .dropdown-menu to tighten up spacing
      • -
      • Now requires you to add a <span class="caret"></span> to show the dropdown arrow
      • -
      • The navbar (fixed topbar) has brand new dropdowns. Gone are the dark versions and in their place are the standard white ones with an additional caret at their tops for clarity of position.
      • +
      • {{_i}}Updated the .dropdown-menu to tighten up spacing{{/i}}
      • +
      • {{_i}}Now requires you to add a <span class="caret"></span> to show the dropdown arrow{{/i}}
      • +
      • {{_i}}The navbar (fixed topbar) has brand new dropdowns. Gone are the dark versions and in their place are the standard white ones with an additional caret at their tops for clarity of position.{{/i}}
    • -
    • Navigation +
    • {{_i}}Navigation{{/i}}
        -
      • Tabs and pills now require the use of a new base class, .nav, on their <ul>
      • -
      • New nav list component added that uses the same base class, .nav
      • -
      • Vertical tabs and pills have been added—just add .stacked to the <ul>
      • -
      • Pills were restyled to be less rounded by default
      • -
      • Pills now have dropdown menu support (they share the same markup and styles as tabs)
      • +
      • {{_i}}Tabs and pills now require the use of a new base class, .nav, on their <ul>{{/i}}
      • +
      • {{_i}}New nav list component added that uses the same base class, .nav{{/i}}
      • +
      • {{_i}}Vertical tabs and pills have been added—just add .stacked to the <ul><{{/i}}/li> +
      • {{_i}}Pills were restyled to be less rounded by default{{/i}}
      • +
      • {{_i}}Pills now have dropdown menu support (they share the same markup and styles as tabs){{/i}}
    -- cgit v1.2.3 From a800d6ceac11eb834295567c20e890abf88c64af Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 24 Jan 2012 14:22:02 -0800 Subject: i18n index --- docs/index.html | 2 +- docs/templates/pages/index.mustache | 106 ++++++++++++++++++------------------ 2 files changed, 54 insertions(+), 54 deletions(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index 1743676b6..d0c0bcae6 100644 --- a/docs/index.html +++ b/docs/index.html @@ -136,7 +136,7 @@ -

    Designed for everyone, everywhere.

    +
    diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index 8927bc640..1e77d4a25 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -4,34 +4,34 @@ ================================================== -->
    -

    Bootstrap,
    from Twitter

    -

    Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, featuring HTML, CSS, and JS for dozens of base elements and common design components.

    +

    {{_i}}Bootstrap,
    from Twitter{{/i}}

    +

    {{_i}}Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, featuring HTML, CSS, and JS for dozens of base elements and common design components.{{/i}}

    - Download on GitHub - Get started → + {{_i}}Download on GitHub{{/i}} + {{_i}}Get started →{{/i}}

    -

    Feature highlights

    +

    {{_i}}Feature highlights{{/i}}

      -
    • × Built on LESS
    • -
    • × Complete styleguide docs
    • -
    • × Fully responsive design
    • -
    • × Small footprint (7kb gzipped)
    • -
    • × Support for IE7 and up
    • -
    • × Custom jQuery plugins
    • -
    • × Dozens of components
    • +
    • {{_i}}× Built on LESS{{/i}}
    • +
    • {{_i}}× Complete styleguide docs{{/i}}
    • +
    • {{_i}}× Fully responsive design{{/i}}
    • +
    • {{_i}}× Small footprint (7kb gzipped){{/i}}
    • +
    • {{_i}}× Support for IE7 and up{{/i}}
    • +
    • {{_i}}× Custom jQuery plugins{{/i}}
    • +
    • {{_i}}× Dozens of components{{/i}}
    -
    -
    -

    Visuals

    -
    -
    - - - - - - - - -
    @primaryButtonColor@blue
    -
    -
    - -
    -
    -

    {{_i}}Why LESS?{{/i}}

    -

    {{_i}}Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.{{/i}}

    -
    -
    -

    {{_i}}What's included?{{/i}}

    -

    {{_i}}As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.{{/i}}

    -
    -
    -

    {{_i}}Learn more{{/i}}

    - LESS CSS -

    {{_i}}Visit the official website at http://lesscss.org to learn more.{{/i}}

    -
    -
    -
    -
    -

    {{_i}}Variables{{/i}}

    -

    {{_i}}Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.{{/i}}

    +
    + -
    -

    {{_i}}Mixins{{/i}}

    -

    {{_i}}Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.{{/i}}

    +
    +
    +

    {{_i}}Why LESS?{{/i}}

    +

    {{_i}}Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.{{/i}}

    +
    +
    +

    {{_i}}What's included?{{/i}}

    +

    {{_i}}As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.{{/i}}

    +
    +
    +

    {{_i}}Learn more{{/i}}

    + LESS CSS +

    {{_i}}Visit the official website at http://lesscss.org to learn more.{{/i}}

    +
    -
    -

    {{_i}}Operations{{/i}}

    -

    {{_i}}Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.{{/i}}

    +
    +
    +

    {{_i}}Variables{{/i}}

    +

    {{_i}}Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.{{/i}}

    +
    +
    +

    {{_i}}Mixins{{/i}}

    +

    {{_i}}Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.{{/i}}

    +
    +
    +

    {{_i}}Operations{{/i}}

    +

    {{_i}}Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.{{/i}}

    +
    -
    +
    - - -

    {{_i}}Hyperlinks{{/i}}

    - - - - - - - - - - - - - - - - - - - - -
    {{_i}}Variable{{/i}}{{_i}}Value{{/i}}{{_i}}Usage{{/i}}
    @linkColor#0069d6{{_i}}Default link text color{{/i}}
    @linkColorHoverdarken(@linkColor, 15){{_i}}Default link text hover color{{/i}}
    - -
    -
    -

    {{_i}}Grayscale colors{{/i}}

    - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    @black#000
    @grayDarklighten(@black, 25%)
    @graylighten(@black, 50%)
    @grayLightlighten(@black, 75%)
    @grayLighterlighten(@black, 90%)
    @white#fff
    +
    + -
    -

    {{_i}}Accent colors{{/i}}

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    @blue#049CDB
    @green#46a546
    @red#9d261d
    @yellow#ffc40d
    @orange#f89406
    @pink#c3325f
    @purple#7a43b6
    -
    -
    -
    -
    -

    {{_i}}Grid system{{/i}}

    - - - - - - - - - - - - - - - - - - - -
    @gridColumns12
    @gridColumnWidth60px
    @gridGutterWidth20px
    @siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
    -
    -
    -

    {{_i}}Typography{{/i}}

    - - - - - - - - - - - - - - - - -
    @baseFontSize13px
    @baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
    @baseLineHeight18px
    -
    -
    +

    {{_i}}Hyperlinks{{/i}}

    + + + + + + + + + + + + + + + + + + + + +
    {{_i}}Variable{{/i}}{{_i}}Value{{/i}}{{_i}}Usage{{/i}}
    @linkColor#08c{{_i}}Default link text color{{/i}}
    @linkColorHoverdarken(@linkColor, 15%){{_i}}Default link text hover color{{/i}}
    + +
    +
    +

    {{_i}}Grayscale colors{{/i}}

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
    @black#000
    @grayDarker#222
    @grayDark#333
    @gray#555
    @grayLight#999
    @grayLighter#eee
    @white#fff
    +
    +
    +

    {{_i}}Accent colors{{/i}}

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
    @blue#049cdb
    @green#46a546
    @red#9d261d
    @yellow#ffc40d
    @orange#f89406
    @pink#c3325f
    @purple#7a43b6
    +
    +
    +
    +
    +

    {{_i}}Grid system{{/i}}

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
    @gridColumns12
    @gridColumnWidth60px
    @gridGutterWidth20px
    @siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
    +
    +
    +

    {{_i}}Typography{{/i}}

    + + + + + + + + + + + + + + + + + + + + + + +
    {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
    @baseFontSize13px
    @baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
    @baseLineHeight18px
    +
    +
    +
    +
    +

    {{_i}}Visuals{{/i}}

    +
    +
    + + + + + + + + +
    @primaryButtonColor@blue
    +
    +
    +
    -
    -
    -

    {{_i}}Visuals{{/i}}

    -
    -
    - - - - - - - - -
    @primaryButtonColor@blue
    -
    -
    -
    -
    -

    Visuals

    -
    -
    - - - - - - - - -
    @primaryButtonColor@blue
    -
    -
    + +

    Components

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Buttons
    @primaryButtonColor@blue
    Buttons
    @placeholderText@grayLight
    Navbars
    @navbarHeight40px
    @navbarBackground@grayDarker
    @navbarBackgroundHighlight@grayDark
    +
    diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 8adc7874f..141000c7c 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -99,23 +99,23 @@ @grayDarker - #222 + #222 @grayDark - #333 + #333 @gray - #555 + #555 @grayLight - #999 + #999 @grayLighter - #eee + #eee @white @@ -223,22 +223,66 @@ -
    -
    -

    {{_i}}Visuals{{/i}}

    -
    -
    - - - - - - - - -
    @primaryButtonColor@blue
    -
    -
    + +

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

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{_i}}Buttons{{/i}}
    @primaryButtonColor@blue
    {{_i}}Buttons{{/i}}
    @placeholderText@grayLight
    {{_i}}Navbars{{/i}}
    @navbarHeight40px
    @navbarBackground@grayDarker
    @navbarBackgroundHighlight@grayDark
    {{_i}}Buttons{{/i}}
    @placeholderText@grayLight
    +
    -- cgit v1.2.3 From a40d4993ed0a947083b7e85cf7772492d613afc8 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 24 Jan 2012 17:13:02 -0800 Subject: make subnav fix --- docs/assets/css/docs.css | 6 ++++++ docs/assets/js/application.js | 21 +++++++++++++++++++++ 2 files changed, 27 insertions(+) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index d78cea2b1..4ab353069 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -165,6 +165,12 @@ section { border-right: 0; } +.subhead .subnav-fixed { + position: fixed; + top: 40px; + z-index:1000; +} + /* Quick links -------------------------------------------------- */ diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 95caa0f31..4b7efe53f 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -116,6 +116,27 @@ $(function(){ }) }) + // fix sub nav playa + var $win = $(window) + , $nav = $('.subhead .nav') + , navTop = $('.subhead .nav').offset().top - 40 + , isFixed = 0 + + processScroll() + + $win.on('scroll', processScroll) + + function processScroll() { + var i, scrollTop = $win.scrollTop() + if (scrollTop >= navTop && !isFixed) { + isFixed = 1 + $nav.addClass('subnav-fixed') + } else if (scrollTop <= navTop && isFixed) { + isFixed = 0 + $nav.removeClass('subnav-fixed') + } + } + }) // JS for javascript demos -- cgit v1.2.3 From 805a965f2e7373db42d99376d4dc3c1ca9ea509d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 17:14:19 -0800 Subject: finish updating form state and alert variables in less docs page --- docs/assets/css/docs.css | 2 + docs/less.html | 143 +++++++++++++++++++++++----------- docs/templates/pages/less.mustache | 155 +++++++++++++++++++++++-------------- 3 files changed, 198 insertions(+), 102 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index d78cea2b1..956eff246 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -417,6 +417,8 @@ pre.prettyprint { /* Make tables spaced out a bit more */ h2 + table, +h3 + table, +h4 + table, h2 + .row { margin-top: 5px; } diff --git a/docs/less.html b/docs/less.html index dfa0739a7..c9e447382 100644 --- a/docs/less.html +++ b/docs/less.html @@ -58,6 +58,10 @@
    +
    + Heads up! This page is still under construction and is missing plenty of documentation. Hang tight! +
    +
    @@ -285,51 +289,100 @@

    Components

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Buttons
    @primaryButtonColor@blue
    Buttons
    @placeholderText@grayLight
    Navbars
    @navbarHeight40px
    @navbarBackground@grayDarker
    @navbarBackgroundHighlight@grayDark
    +
    +
    +

    Buttons

    + + + + + + + +
    @primaryButtonColor@blue
    +

    Forms

    + + + + + + + +
    @placeholderText@grayLight
    +

    Navbar

    + + + + + + + + + + + + + + + +
    @navbarHeight40px
    @navbarBackground@grayDarker
    @navbarBackgroundHighlight@grayDark
    +
    +
    +

    Form states and alerts

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    @warningText#f3edd2
    @warningBackground#c09853
    @warningBorder#f3edd2
    @errorText#b94a48
    @errorBackground#f2dede
    @errorBorder#e9c7c7
    @successText#468847
    @successBackground#dff0d8
    @successBorder#cfe8c4
    @infoText#3a87ad
    @infoBackground#d9edf7
    @infoBorder#bfe1f2
    +
    +
    diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 141000c7c..580fac2f6 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -1,3 +1,7 @@ +
    + Heads up! This page is still under construction and is missing plenty of documentation. Hang tight! +
    +
    @@ -225,63 +229,100 @@

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

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {{_i}}Buttons{{/i}}
    @primaryButtonColor@blue
    {{_i}}Buttons{{/i}}
    @placeholderText@grayLight
    {{_i}}Navbars{{/i}}
    @navbarHeight40px
    @navbarBackground@grayDarker
    @navbarBackgroundHighlight@grayDark
    {{_i}}Buttons{{/i}}
    @placeholderText@grayLight
    +
    +
    +

    Buttons

    + + + + + + + +
    @primaryButtonColor@blue
    +

    Forms

    + + + + + + + +
    @placeholderText@grayLight
    +

    Navbar

    + + + + + + + + + + + + + + + +
    @navbarHeight40px
    @navbarBackground@grayDarker
    @navbarBackgroundHighlight@grayDark
    +
    +
    +

    Form states and alerts

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    @warningText#f3edd2
    @warningBackground#c09853
    @warningBorder#f3edd2
    @errorText#b94a48
    @errorBackground#f2dede
    @errorBorder#e9c7c7
    @successText#468847
    @successBackground#dff0d8
    @successBorder#cfe8c4
    @infoText#3a87ad
    @infoBackground#d9edf7
    @infoBorder#bfe1f2
    +
    +
    -- cgit v1.2.3 From 26ed8202ee270ce8b103491613fb2f5053472a70 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 18:24:38 -0800 Subject: modify the scaffolding page to fix the language around preboot/grid variables --- docs/assets/css/docs.css | 3 ++- docs/templates/pages/scaffolding.mustache | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index d5192ca55..ac48c6e2b 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -168,7 +168,8 @@ section { .subhead .subnav-fixed { position: fixed; top: 40px; - z-index:1000; + z-index: 1030; + width: 938px; } diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 7c0c12e8f..a8638f273 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -157,7 +157,7 @@

    {{_i}}How to customize{{/i}}

    -

    {{_i}}Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grids in the preboot.less file and use one of the four ways documented to recompile.{{/i}}

    +

    {{_i}}Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grid variables in variables.less and use one of the four ways documented to recompile. If you're adding more columns, be sure to add the CSS for those in grid.less.{{/i}}

    {{_i}}Staying responsive{{/i}}

    -- cgit v1.2.3 From 9ef4171d03e048ee9458fb7a1db83ea61bf845c2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 18:26:45 -0800 Subject: lighten alert on less page --- docs/less.html | 2 +- docs/scaffolding.html | 2 +- docs/templates/pages/less.mustache | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/less.html b/docs/less.html index c9e447382..c8c1540b5 100644 --- a/docs/less.html +++ b/docs/less.html @@ -58,7 +58,7 @@
    -
    +
    Heads up! This page is still under construction and is missing plenty of documentation. Hang tight!
    diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 2684e32ec..1fd8363ae 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -217,7 +217,7 @@

    How to customize

    -

    Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grids in the preboot.less file and use one of the four ways documented to recompile.

    +

    Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grid variables in variables.less and use one of the four ways documented to recompile. If you're adding more columns, be sure to add the CSS for those in grid.less.

    Staying responsive

    diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 580fac2f6..b5cff2d11 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -1,4 +1,4 @@ -
    +
    Heads up! This page is still under construction and is missing plenty of documentation. Hang tight!
    -- cgit v1.2.3 From d3622235359c08f65d5396ee01523c7f7d8901b1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 18:29:17 -0800 Subject: refine fixed docs bar --- docs/assets/css/docs.css | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index ac48c6e2b..dd723800b 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -170,6 +170,12 @@ section { top: 40px; z-index: 1030; width: 938px; + -webkit-border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + border-radius: 0 0 4px 4px; + -webkit-box-shadow: 0 1px 5px rgba(0,0,0,.05); + -moz-box-shadow: 0 1px 5px rgba(0,0,0,.05); + box-shadow: 0 1px 5px rgba(0,0,0,.05); } @@ -565,6 +571,13 @@ form.well { .subhead .nav li + li a { border-top: 1px solid #eee; } + .subhead .subnav-fixed { + position: static; + top: auto; + z-index: auto; + width: auto; + } + /* Don't space out quick links so much */ .quick-links { -- cgit v1.2.3 From 880486089888fbba04ed12083ad038ae38494fd1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 18:45:23 -0800 Subject: fix typo on js docs --- docs/javascript.html | 2 +- docs/templates/pages/javascript.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/javascript.html b/docs/javascript.html index a35c29913..06aba5156 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1166,7 +1166,7 @@ $('#myCollapsible').collapse({ - show/td> + show This event fires immediately when the show instance method is called. diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 763fe8aa1..97e6da9ef 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -1106,7 +1106,7 @@ $('#myCollapsible').collapse({ - {{_i}}show{{/i}}/td> + {{_i}}show{{/i}} {{_i}}This event fires immediately when the show instance method is called.{{/i}} -- cgit v1.2.3 From f70895a6059aab44c53048b0294204d2f53dfd65 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 19:01:38 -0800 Subject: remove rogue html elements --- docs/javascript.html | 6 ++---- docs/templates/pages/javascript.mustache | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'docs') diff --git a/docs/javascript.html b/docs/javascript.html index 06aba5156..472285cc9 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -646,7 +646,6 @@ $('#myModal').on('hidden', function () { $('.tabs a:last').tab('show') }) </script> -

    Events

    @@ -753,7 +752,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
    -

    Notice Individual tooltip instance options can alternatively be specified through the use of data attributes.

    +

    Notice Individual tooltip instance options can alternatively be specified through the use of data attributes.

    Markup

    For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.

    Methods

    @@ -853,7 +852,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { -

    Notice Individual popover instance options can alternatively be specified through the use of data attributes.

    +

    Notice Individual popover instance options can alternatively be specified through the use of data attributes.

    Markup

    For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option. @@ -1310,7 +1309,6 @@ $('.myCarousel').carousel({ slid This event is fired when the carousel has completed it's slide transition. -

    diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 97e6da9ef..9fd431f2f 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -586,7 +586,6 @@ $('#myModal').on('hidden', function () { $('.tabs a:last').tab('show') }) </script> -

    {{_i}}Events{{/i}}

    @@ -693,7 +692,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
    -

    {{_i}}Notice Individual tooltip instance options can alternatively be specified through the use of data attributes.{{/i}}

    +

    {{_i}}Notice Individual tooltip instance options can alternatively be specified through the use of data attributes.{{/i}}

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

    {{_i}}For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.{{/i}}

    {{_i}}Methods{{/i}}

    @@ -793,7 +792,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { -

    {{_i}}Notice Individual popover instance options can alternatively be specified through the use of data attributes.{{/i}}

    +

    {{_i}}Notice Individual popover instance options can alternatively be specified through the use of data attributes.{{/i}}

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

    {{_i}}For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option.{{/i}} @@ -1250,7 +1249,6 @@ $('.myCarousel').carousel({ {{_i}}slid{{/i}} {{_i}}This event is fired when the carousel has completed it's slide transition.{{/i}} -

    -- 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/assets/css/docs.css | 40 +++-- docs/assets/js/application.js | 4 +- docs/base-css.html | 16 +- docs/components.html | 263 +++++++++++++++--------------- docs/javascript.html | 30 ++-- docs/less.html | 14 +- docs/scaffolding.html | 12 +- docs/templates/pages/base-css.mustache | 16 +- docs/templates/pages/components.mustache | 263 +++++++++++++++--------------- docs/templates/pages/javascript.mustache | 30 ++-- docs/templates/pages/less.mustache | 14 +- docs/templates/pages/scaffolding.mustache | 12 +- 12 files changed, 370 insertions(+), 344 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index dd723800b..776ca58b9 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -125,7 +125,9 @@ section { } /* Subnav */ -.subhead .nav { +.subnav { + width: 100%; + height: 36px; background-color: #eeeeee; /* Old browsers */ background-repeat: repeat-x; /* Repeat the gradient */ background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */ @@ -138,23 +140,30 @@ section { border: 1px solid #e5e5e5; -webkit-border-radius: 4px; -moz-border-radius: 4px; - border-radius: 4px; + border-radius: 4px; +} +.subhead .nav { } .subhead .nav a { margin: 0; padding-top: 11px; padding-bottom: 11px; font-size: 13px; + color: #777; border-left: 1px solid #f5f5f5; border-right: 1px solid #e5e5e5; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } +.subhead .nav a:hover, .subhead .nav .active a { - background-color: #fff; + background-color: transparent; color: #333; } +.subhead .nav .active a { + background-color: #eee; +} .subhead .nav li:first-child a { border-left: 0; -webkit-border-radius: 4px 0 0 4px; @@ -165,17 +174,24 @@ section { border-right: 0; } -.subhead .subnav-fixed { +.subnav-fixed { position: fixed; top: 40px; + left: 0; + right: 0; z-index: 1030; - width: 938px; - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; - -webkit-box-shadow: 0 1px 5px rgba(0,0,0,.05); - -moz-box-shadow: 0 1px 5px rgba(0,0,0,.05); - box-shadow: 0 1px 5px rgba(0,0,0,.05); + border-color: #d5d5d5; + border-width: 0 0 1px; /* drop the border on the fixed edges */ + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + -webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); + -moz-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); + box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); +} +.subnav-fixed .nav { + width: 940px; + margin: 0 auto; } @@ -438,7 +454,7 @@ h2 + .row { /* Example sites showcase */ .example-sites img { - max-width: 290px; + max-width: 100%; } .marketing-byline { margin: -18px 0 27px; diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 4b7efe53f..0252d75e9 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -118,8 +118,8 @@ $(function(){ // fix sub nav playa var $win = $(window) - , $nav = $('.subhead .nav') - , navTop = $('.subhead .nav').offset().top - 40 + , $nav = $('.subnav') + , navTop = $('.subnav').offset().top - 40 , isFixed = 0 processScroll() 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.

    - +
    diff --git a/docs/components.html b/docs/components.html index 9d28b9e06..50c615fb9 100644 --- a/docs/components.html +++ b/docs/components.html @@ -58,11 +58,12 @@
    - -
    -

    Components

    -

    Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.

    + +
    +

    Components

    +

    Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.

    +
    +
    +
    - -
    - -
    -
    -

    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.

    -
    + +
    + +
    +
    +

    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 +
    +
    +
    +
    - Left - Middle - Right + 1 + 2 + 3 + 4
    -
    -
    -
    -
    - 1 - 2 - 3 - 4 -
    -
    - 5 - 6 - 7 -
    -
    - 8 -
    +
    + 5 + 6 + 7 +
    +
    + 8
    -
    -
    -

    Example markup

    -

    Here's how the HTML looks for a standard button group built with anchor tag buttons:

    + +
    +
    +

    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>
    @@ -134,95 +136,95 @@
       </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.

    -
    -
    +
    +

    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.

    +
    +
    +
    - -
    - +
    @@ -528,11 +530,6 @@

    Tabbable in any direction

    -

    Tabs on the bottom

    Flip the order of the HTML and add a class to put tabs on the bottom.

    diff --git a/docs/javascript.html b/docs/javascript.html index 472285cc9..396bf15bc 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -63,20 +63,22 @@

    Javascript for Bootstrap

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

    +
    diff --git a/docs/less.html b/docs/less.html index c8c1540b5..86a65a6c7 100644 --- a/docs/less.html +++ b/docs/less.html @@ -67,12 +67,14 @@

    Using LESS with Bootstrap

    Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.

    - +
    diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 1fd8363ae..bb18b0394 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -63,11 +63,13 @@

    Scaffolding

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

    - +
    diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 5552d6735..41722aa71 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -3,13 +3,15 @@

    {{_i}}Base CSS{{/i}}

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

    - +
    diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 5282e6178..36fc84281 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -1,8 +1,9 @@ - -
    -

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

    -

    {{_i}}Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.{{/i}}

    + +
    +

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

    +

    {{_i}}Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.{{/i}}

    +
    +
    + - -
    - -
    -
    -

    {{_i}}Button groups{{/i}}

    -

    {{_i}}Use button groups to join multiple buttons together as one composite component. Build them with a series of <a> or <button> elements.{{/i}}

    -

    {{_i}}You can also combine sets of <div class="btn-group"> into a <div class="btn-toolbar"> for more complex projects.{{/i}}

    -
    + +
    + +
    +
    +

    {{_i}}Button groups{{/i}}

    +

    {{_i}}Use button groups to join multiple buttons together as one composite component. Build them with a series of <a> or <button> elements.{{/i}}

    +

    {{_i}}You can also combine sets of <div class="btn-group"> into a <div class="btn-toolbar"> for more complex projects.{{/i}}

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

    {{_i}}Example markup{{/i}}

    -

    {{_i}}Here's how the HTML looks for a standard button group built with anchor tag buttons:{{/i}}

    + +
    +
    +

    {{_i}}Example markup{{/i}}

    +

    {{_i}}Here's how the HTML looks for a standard button group built with anchor tag buttons:{{/i}}

     <div class="btn-group">
       <a class="btn" href="#">1</a>
    @@ -74,95 +76,95 @@
       </div>
     </div>
     
    -
    -
    -

    {{_i}}Checkbox and radio flavors{{/i}}

    -

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

    -

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

    -
    -

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

    -

    {{_i}}CSS for button groups is in a separate file, button-groups.less.{{/i}}

    -
    -
    +
    +

    {{_i}}Checkbox and radio flavors{{/i}}

    +

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

    +

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

    +
    +

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

    +

    {{_i}}CSS for button groups is in a separate file, button-groups.less.{{/i}}

    +
    +
    +
    - -
    - +
    @@ -468,11 +470,6 @@

    {{_i}}Tabbable in any direction{{/i}}

    -

    {{_i}}Tabs on the bottom{{/i}}

    {{_i}}Flip the order of the HTML and add a class to put tabs on the bottom.{{/i}}

    diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 9fd431f2f..b6b16fef2 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -3,20 +3,22 @@

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

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

    +
    diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index b5cff2d11..ea7058fd9 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -7,12 +7,14 @@

    {{_i}}Using LESS with Bootstrap{{/i}}

    {{_i}}Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.{{/i}}

    - +
    diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index a8638f273..ed80dabfc 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -3,11 +3,13 @@

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

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

    - +
    -- cgit v1.2.3 From 4a6d9106b8f92a85a528971c70f132c32b6c43cf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 19:36:42 -0800 Subject: fix the thumbnails more examples section --- docs/assets/css/docs.css | 8 ++++++-- docs/components.html | 2 +- docs/templates/pages/components.mustache | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 776ca58b9..d0a5623f4 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -19,7 +19,7 @@ body { /* Tweak navbar brand link to be super sleek -------------------------------------------------- */ -body > .navbar-fixed .brand { +.navbar-fixed .brand { padding-right: 0; padding-left: 0; margin-left: 20px; @@ -27,8 +27,12 @@ body > .navbar-fixed .brand { font-weight: bold; color: #000; text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.125); + -webkit-transition: all .2s linear; + -moz-transition: all .2s linear; + transition: all .2s linear; + } -body > .navbar-fixed .brand:hover { +.navbar-fixed .brand:hover { text-decoration: none; } diff --git a/docs/components.html b/docs/components.html index 50c615fb9..d823998d9 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1038,7 +1038,7 @@
    • - +
    • diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 36fc84281..94d72a540 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -978,7 +978,7 @@
      • - +
      • -- 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/assets/css/docs.css | 39 +++++++++++++++------------------- docs/base-css.html | 22 +++++++++++++------ docs/templates/pages/base-css.mustache | 22 +++++++++++++------ 3 files changed, 49 insertions(+), 34 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index d0a5623f4..6cb8720c7 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -146,8 +146,6 @@ section { -moz-border-radius: 4px; border-radius: 4px; } -.subhead .nav { -} .subhead .nav a { margin: 0; padding-top: 11px; @@ -477,7 +475,7 @@ h2 + .row { /* Remove bottom margin on example forms in wells */ form.well { - margin-bottom: 0; + padding: 14px; } /* Tighten up spacing */ @@ -558,6 +556,14 @@ form.well { margin-top: 18px; } + /* Subnav */ + .subnav { + background: none; + } + .subnav .nav > li { + float: none; + } + /* Adjust the jumbotron */ .jumbotron h1, .jumbotron p { @@ -580,25 +586,6 @@ form.well { margin: 0 auto 10px; } - /* Subnav */ - .subhead .nav { - padding: 0; - background: none; - } - .subhead .nav > li { - float: none; - } - .subhead .nav li + li a { - border-top: 1px solid #eee; - } - .subhead .subnav-fixed { - position: static; - top: auto; - z-index: auto; - width: auto; - } - - /* Don't space out quick links so much */ .quick-links { margin: 40px 0 0; @@ -632,6 +619,14 @@ form.well { @media (max-width: 768px) { + /* Subnav */ + .subnav-fixed { + position: static; + top: auto; + z-index: auto; + width: auto; + } + /* Adjust the jumbotron */ .jumbotron .benefits { position: relative; 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.

        +
        +
    • +
    • Update Less.js +
        +
      • Make sure to use to the current release of less.js
      • +
      +
    • +
    -
    -

    Using LESS with Bootstrap

    -

    Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.

    - -
    + +
    +

    Using LESS with Bootstrap

    +

    Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.

    + +
    - -
    - -
    -
    -

    Why LESS?

    -

    Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.

    -
    -
    -

    What's included?

    -

    As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.

    -
    -
    -

    Learn more

    - LESS CSS -

    Visit the official website at http://lesscss.org to learn more.

    -
    -
    -
    -
    -

    Variables

    -

    Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.

    -
    -
    -

    Mixins

    -

    Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.

    -
    -
    -

    Operations

    -

    Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.

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

    Scaffolding

    + + + +

    Base CSS

    + + + + + + + +
    +
    +

    Components

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

    JS Components

    + + + + + + + +
    +
    +

    Responsive

    + + + +

    Miscellaneous

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

    Links

    + + + + +

    Grid system

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

    Typography

    + + + + + + +

    Forms

    + + + + +

    Navbar

    + + + + + + +
    +
    +

    Form states & alerts

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

    And you're set!

    +

    We've compiled your selected CSS and customized variables and have them ready to download as a tidy ZIP file. Choose from compiled or compiled and minified CSS files.

    + Download CSS Download minified CSS +
    +

    Looking to customize your javascript? Head over to the Javascript plugins page to build your own Bootstrap JS bundle.

    +
    +
    +
    + + - -
    - -

    Hyperlinks

    - - - - - - - - - - - - - - - - - - - - -
    VariableValueUsage
    @linkColor#08cDefault link text color
    @linkColorHoverdarken(@linkColor, 15%)Default link text hover color
    - -
    -
    -

    Grayscale colors

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    VariableValue
    @black#000
    @grayDarker#222
    @grayDark#333
    @gray#555
    @grayLight#999
    @grayLighter#eee
    @white#fff
    -
    -
    -

    Accent colors

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    VariableValue
    @blue#049cdb
    @green#46a546
    @red#9d261d
    @yellow#ffc40d
    @orange#f89406
    @pink#c3325f
    @purple#7a43b6
    -
    -
    -
    -
    -

    Grid system

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    VariableValue
    @gridColumns12
    @gridColumnWidth60px
    @gridGutterWidth20px
    @siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
    -
    -
    -

    Typography

    - - - - - - - - - - - - - - - - - - - - - - -
    VariableValue
    @baseFontSize13px
    @baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
    @baseLineHeight18px
    -
    -
    - -

    Components

    -
    -
    -

    Buttons

    - - - - - - - -
    @primaryButtonColor@blue
    -

    Forms

    - - - - - - - -
    @placeholderText@grayLight
    -

    Navbar

    - - - - - - - - - - - - - - - -
    @navbarHeight40px
    @navbarBackground@grayDarker
    @navbarBackgroundHighlight@grayDark
    -
    -
    -

    Form states and alerts

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    @warningText#f3edd2
    @warningBackground#c09853
    @warningBorder#f3edd2
    @errorText#b94a48
    @errorBackground#f2dede
    @errorBorder#e9c7c7
    @successText#468847
    @successBackground#dff0d8
    @successBorder#cfe8c4
    @infoText#3a87ad
    @infoBackground#d9edf7
    @infoBorder#bfe1f2
    -
    -
    + +
    + +
    +
    +

    Why LESS?

    +

    Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.

    +
    +
    +

    What's included?

    +

    As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.

    +
    +
    +

    Learn more

    + LESS CSS +

    Visit the official website at http://lesscss.org to learn more.

    +
    +
    +
    +
    +

    Variables

    +

    Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.

    +
    +
    +

    Mixins

    +

    Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.

    +
    +
    +

    Operations

    +

    Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.

    +
    +
    +
    -
    + +
    + - - +

    Hyperlinks

    + + + + + + + + + + + + + + + + + + + + +
    VariableValueUsage
    @linkColor#08cDefault link text color
    @linkColorHoverdarken(@linkColor, 15%)Default link text hover color
    + +
    +
    +

    Grayscale colors

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    VariableValue
    @black#000
    @grayDarker#222
    @grayDark#333
    @gray#555
    @grayLight#999
    @grayLighter#eee
    @white#fff
    +
    +
    +

    Accent colors

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    VariableValue
    @blue#049cdb
    @green#46a546
    @red#9d261d
    @yellow#ffc40d
    @orange#f89406
    @pink#c3325f
    @purple#7a43b6
    +
    +
    +
    +
    +

    Grid system

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    VariableValue
    @gridColumns12
    @gridColumnWidth60px
    @gridGutterWidth20px
    @siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
    +
    +
    +

    Typography

    + + + + + + + + + + + + + + + + + + + + + + +
    VariableValue
    @baseFontSize13px
    @baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
    @baseLineHeight18px
    +
    +
    + +

    Components

    +
    +
    +

    Buttons

    + + + + + + + +
    @primaryButtonColor@blue
    +

    Forms

    + + + + + + + +
    @placeholderText@grayLight
    +

    Navbar

    + + + + + + + + + + + + + + + +
    @navbarHeight40px
    @navbarBackground@grayDarker
    @navbarBackgroundHighlight@grayDark
    +
    +
    +

    Form states and alerts

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    @warningText#f3edd2
    @warningBackground#c09853
    @warningBorder#f3edd2
    @errorText#b94a48
    @errorBackground#f2dede
    @errorBorder#e9c7c7
    @successText#468847
    @successBackground#dff0d8
    @successBorder#cfe8c4
    @infoText#3a87ad
    @infoBackground#d9edf7
    @infoBorder#bfe1f2
    +
    +
    +
    - - + + - - + + + + + + + + diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 225e88d2b..ba864ce9e 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -308,7 +308,7 @@ <pre class="prettyprint"> -

    {{_i}}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.{{/i}}

    +

    {{_i}}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.{{/i}}

    <div>
       <h1>{{_i}}Heading{{/i}}</h1>
       <p>{{_i}}Something right here…{{/i}}</p>
    diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
    index ea7058fd9..ecb39055b 100644
    --- a/docs/templates/pages/less.mustache
    +++ b/docs/templates/pages/less.mustache
    @@ -1,356 +1,517 @@
    -      
    - Heads up! This page is still under construction and is missing plenty of documentation. Hang tight! -
    - - -
    -

    {{_i}}Using LESS with Bootstrap{{/i}}

    -

    {{_i}}Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.{{/i}}

    - -
    - - - - -
    - -
    -
    -

    {{_i}}Why LESS?{{/i}}

    -

    {{_i}}Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.{{/i}}

    -
    -
    -

    {{_i}}What's included?{{/i}}

    -

    {{_i}}As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.{{/i}}

    -
    -
    -

    {{_i}}Learn more{{/i}}

    - LESS CSS -

    {{_i}}Visit the official website at http://lesscss.org to learn more.{{/i}}

    -
    -
    -
    -
    -

    {{_i}}Variables{{/i}}

    -

    {{_i}}Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.{{/i}}

    -
    -
    -

    {{_i}}Mixins{{/i}}

    -

    {{_i}}Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.{{/i}}

    -
    -
    -

    {{_i}}Operations{{/i}}

    -

    {{_i}}Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.{{/i}}

    -
    -
    -
    - - - - -
    - - -

    {{_i}}Hyperlinks{{/i}}

    - - - - - - - - - - - - - - - - - - - - -
    {{_i}}Variable{{/i}}{{_i}}Value{{/i}}{{_i}}Usage{{/i}}
    @linkColor#08c{{_i}}Default link text color{{/i}}
    @linkColorHoverdarken(@linkColor, 15%){{_i}}Default link text hover color{{/i}}
    - -
    -
    -

    {{_i}}Grayscale colors{{/i}}

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
    @black#000
    @grayDarker#222
    @grayDark#333
    @gray#555
    @grayLight#999
    @grayLighter#eee
    @white#fff
    -
    -
    -

    {{_i}}Accent colors{{/i}}

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
    @blue#049cdb
    @green#46a546
    @red#9d261d
    @yellow#ffc40d
    @orange#f89406
    @pink#c3325f
    @purple#7a43b6
    -
    -
    -
    -
    -

    {{_i}}Grid system{{/i}}

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
    @gridColumns12
    @gridColumnWidth60px
    @gridGutterWidth20px
    @siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
    -
    -
    -

    {{_i}}Typography{{/i}}

    - - - - - - - - - - - - - - - - - - - - - - -
    {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
    @baseFontSize13px
    @baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
    @baseLineHeight18px
    -
    -
    - -

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

    -
    -
    -

    Buttons

    - - - - - - - -
    @primaryButtonColor@blue
    -

    Forms

    - - - - - - - -
    @placeholderText@grayLight
    -

    Navbar

    - - - - - - - - - - - - - - - -
    @navbarHeight40px
    @navbarBackground@grayDarker
    @navbarBackgroundHighlight@grayDark
    -
    -
    -

    Form states and alerts

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    @warningText#f3edd2
    @warningBackground#c09853
    @warningBorder#f3edd2
    @errorText#b94a48
    @errorBackground#f2dede
    @errorBorder#e9c7c7
    @successText#468847
    @successBackground#dff0d8
    @successBorder#cfe8c4
    @infoText#3a87ad
    @infoBackground#d9edf7
    @infoBorder#bfe1f2
    +
    + Heads up! This page is still under construction and is missing plenty of documentation. Hang tight! +
    + + +
    +

    {{_i}}Using LESS with Bootstrap{{/i}}

    +

    {{_i}}Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.{{/i}}

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

    Scaffolding

    + + + +

    Base CSS

    + + + + + + + +
    +
    +

    Components

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

    JS Components

    + + + + + + + +
    +
    +

    Responsive

    + + + +

    Miscellaneous

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

    Links

    + + + + +

    Grid system

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

    Typography

    + + + + + + +

    Forms

    + + + + +

    Navbar

    + + + + + + +
    +
    +

    Form states & alerts

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

    And you're set!

    +

    We've compiled your selected CSS and customized variables and have them ready to download as a tidy ZIP file. Choose from compiled or compiled and minified CSS files.

    + Download CSS Download minified CSS +
    +

    Looking to customize your javascript? Head over to the Javascript plugins page to build your own Bootstrap JS bundle.

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

    {{_i}}Why LESS?{{/i}}

    +

    {{_i}}Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.{{/i}}

    +
    +
    +

    {{_i}}What's included?{{/i}}

    +

    {{_i}}As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.{{/i}}

    +
    +
    +

    {{_i}}Learn more{{/i}}

    + LESS CSS +

    {{_i}}Visit the official website at http://lesscss.org to learn more.{{/i}}

    +
    +
    +
    +
    +

    {{_i}}Variables{{/i}}

    +

    {{_i}}Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.{{/i}}

    +
    +
    +

    {{_i}}Mixins{{/i}}

    +

    {{_i}}Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.{{/i}}

    +
    +
    +

    {{_i}}Operations{{/i}}

    +

    {{_i}}Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.{{/i}}

    +
    +
    +
    - + +
    + - - +

    {{_i}}Hyperlinks{{/i}}

    + + + + + + + + + + + + + + + + + + + + +
    {{_i}}Variable{{/i}}{{_i}}Value{{/i}}{{_i}}Usage{{/i}}
    @linkColor#08c{{_i}}Default link text color{{/i}}
    @linkColorHoverdarken(@linkColor, 15%){{_i}}Default link text hover color{{/i}}
    + +
    +
    +

    {{_i}}Grayscale colors{{/i}}

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
    @black#000
    @grayDarker#222
    @grayDark#333
    @gray#555
    @grayLight#999
    @grayLighter#eee
    @white#fff
    +
    +
    +

    {{_i}}Accent colors{{/i}}

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
    @blue#049cdb
    @green#46a546
    @red#9d261d
    @yellow#ffc40d
    @orange#f89406
    @pink#c3325f
    @purple#7a43b6
    +
    +
    +
    +
    +

    {{_i}}Grid system{{/i}}

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
    @gridColumns12
    @gridColumnWidth60px
    @gridGutterWidth20px
    @siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
    +
    +
    +

    {{_i}}Typography{{/i}}

    + + + + + + + + + + + + + + + + + + + + + + +
    {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
    @baseFontSize13px
    @baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
    @baseLineHeight18px
    +
    +
    + +

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

    +
    +
    +

    Buttons

    + + + + + + + +
    @primaryButtonColor@blue
    +

    Forms

    + + + + + + + +
    @placeholderText@grayLight
    +

    Navbar

    + + + + + + + + + + + + + + + +
    @navbarHeight40px
    @navbarBackground@grayDarker
    @navbarBackgroundHighlight@grayDark
    +
    +
    +

    Form states and alerts

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    @warningText#f3edd2
    @warningBackground#c09853
    @warningBorder#f3edd2
    @errorText#b94a48
    @errorBackground#f2dede
    @errorBorder#e9c7c7
    @successText#468847
    @successBackground#dff0d8
    @successBorder#cfe8c4
    @infoText#3a87ad
    @infoBackground#d9edf7
    @infoBorder#bfe1f2
    +
    +
    + +
    + + + + + - - + + - - + + -- cgit v1.2.3 From ae70d2a8b6db76d0b3a2a2ef4540a270f0f5c257 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 23:44:59 -0800 Subject: refine spacing on fixed subnav --- docs/assets/css/docs.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index d9f8e438b..8c30e733d 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -197,8 +197,9 @@ section { box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); } .subnav-fixed .nav { - width: 940px; + width: 938px; margin: 0 auto; + padding: 0 1px; } } -- cgit v1.2.3 From b0fb31be5eff9cc4d7a1b2aab70643ff4fc82618 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 23:45:48 -0800 Subject: fix js link on chop shop --- docs/less.html | 2 +- docs/templates/pages/less.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/less.html b/docs/less.html index e5e3baa66..55138c71a 100644 --- a/docs/less.html +++ b/docs/less.html @@ -230,7 +230,7 @@

    We've compiled your selected CSS and customized variables and have them ready to download as a tidy ZIP file. Choose from compiled or compiled and minified CSS files.

    Download CSS Download minified CSS
    -

    Looking to customize your javascript? Head over to the Javascript plugins page to build your own Bootstrap JS bundle.

    +

    Looking to customize your javascript? Head over to the Javascript plugins page to build your own Bootstrap JS bundle.

    diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index ecb39055b..2633abdf3 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -170,7 +170,7 @@

    We've compiled your selected CSS and customized variables and have them ready to download as a tidy ZIP file. Choose from compiled or compiled and minified CSS files.

    Download CSS Download minified CSS
    -

    Looking to customize your javascript? Head over to the Javascript plugins page to build your own Bootstrap JS bundle.

    +

    Looking to customize your javascript? Head over to the Javascript plugins page to build your own Bootstrap JS bundle.

    -- cgit v1.2.3 From 64f85e037102425062a43ba17b9d5b1f4c4acba7 Mon Sep 17 00:00:00 2001 From: Jason Wieland Date: Wed, 25 Jan 2012 00:02:37 -0800 Subject: caught another old reference to 1.1.3 --- docs/templates/pages/less.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index ea7058fd9..ff52970b2 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -371,7 +371,7 @@

    {{_i}}Use this option to make full use of Bootstrap’s Less variables, mixins, and nesting in CSS via javascript in your browser.{{/i}}

     <link rel="stylesheet/less" href="less/bootstrap.less" media="all" />
    -<script src="js/less-1.1.3.min.js"></script>
    +<script src="js/less-1.2.1.min.js"></script>

    {{_i}}Not feeling the .js solution? Try the Less Mac app or use Node.js to compile when you deploy your code.{{/i}}

    {{_i}}What’s included{{/i}}

    -- 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/assets/css/docs.css | 94 +++--- docs/assets/js/google-code-prettify/prettify.css | 4 - docs/base-css.html | 13 +- docs/components.html | 21 +- docs/download.html | 312 ++++++++++++++++++++ docs/index.html | 3 + docs/javascript.html | 27 +- docs/less.html | 361 ++++------------------- docs/scaffolding.html | 9 +- docs/templates/layout.mustache | 3 + docs/templates/pages/base-css.mustache | 10 +- docs/templates/pages/components.mustache | 18 +- docs/templates/pages/download.mustache | 216 ++++++++++++++ docs/templates/pages/javascript.mustache | 24 +- docs/templates/pages/less.mustache | 359 ++++------------------ docs/templates/pages/scaffolding.mustache | 6 +- docs/upgrading.html | 3 + 17 files changed, 772 insertions(+), 711 deletions(-) create mode 100644 docs/download.html create mode 100644 docs/templates/pages/download.mustache (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 8c30e733d..12c534fb2 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -442,68 +442,78 @@ section { } -/* CSS Chop Shop +/* Download page -------------------------------------------------- */ -.builder { +.download .page-header { + margin-top: 36px; } -.builder .span2 { - width: 160px; -} -.builder ul { - margin: 0; - list-style: none; -} -.builder .tabs { - margin-right: 0; -} -.builder .tabs a { - width: 160px; - padding: 14px; - font-size: 14px; -} -.builder .tab-content { - padding: 19px; - margin-left: 189px; - border: 1px solid #e5e5e5; - -webkit-border-radius: 0 4px 4px 4px; - -moz-border-radius: 0 4px 4px 4px; - border-radius: 0 4px 4px 4px; +.page-header .toggle-all { + margin-top: 13px; } /* Space out h3s when following a section */ -.builder input + h3, -.builder .checkbox + h3 { +.download h3 { + margin-bottom: 5px; +} +.download-builder input + h3, +.download-builder .checkbox + h3 { margin-top: 9px; } /* Fields for variables */ -.builder input + h3 { - margin-top: 9px; -} -.builder #variables label { - margin-bottom: 2px; - color: #555; -} -.builder input[type=text] { +.download-builder input[type=text] { margin-bottom: 9px; font-family: Menlo, Monaco, "Courier New", monospace; font-size: 12px; color: #d14; background-color: #f7f7f9; } -.builder input[type=text]:focus { +.download-builder input[type=text]:focus { background-color: #fff; } +/* Custom, larger checkbox labels */ +.download .checkbox { + padding: 6px 10px 6px 25px; + font-size: 14px; + color: #555; + background-color: #f9f9f9; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + cursor: pointer; +} +.download .checkbox:hover { + color: #333; + background-color: #f5f5f5; +} +.download .checkbox input[type=checkbox] { + position: relative; + top: 1px; +} +.download .checkbox small { + font-size: 12px; + color: #777; +} -.builder-actions { - margin-top: 18px; - padding-top: 18px; - border-top: 1px solid #eee; +/* Giant download button */ +.download-btn { + pading: 18px 20px; + margin: 45px 0; + text-align: center; + border: 1px solid #eee; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } -.builder-actions .toggle-all { - float: right; - line-height: 36px; +.btn.xlarge { + margin: 36px auto; + padding: 14px 24px; + font-size: 30px; + text-align: center; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } diff --git a/docs/assets/js/google-code-prettify/prettify.css b/docs/assets/js/google-code-prettify/prettify.css index 0d54905fb..aedd8d1a9 100644 --- a/docs/assets/js/google-code-prettify/prettify.css +++ b/docs/assets/js/google-code-prettify/prettify.css @@ -27,8 +27,4 @@ ol.linenums li { color: #bebec5; line-height: 18px; text-shadow: 0 1px 0 #fff; -} -/* Alternate shading for lines */ -li.L1, li.L3, li.L5, li.L7, li.L9 { - } \ No newline at end of file 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.

    diff --git a/docs/components.html b/docs/components.html index d823998d9..c1cec739c 100644 --- a/docs/components.html +++ b/docs/components.html @@ -51,6 +51,9 @@
  • Using LESS
  • +
  • + Download +
  • @@ -65,15 +68,15 @@

    Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.

    diff --git a/docs/download.html b/docs/download.html new file mode 100644 index 000000000..1d74c4f78 --- /dev/null +++ b/docs/download.html @@ -0,0 +1,312 @@ + + + + + Bootstrap, from Twitter + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    + Heads up! This page is still under construction and is missing plenty of documentation. Hang tight! +
    + + +
    +

    Download and customize Bootstrap

    +

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

    +
    + +
    + +
    +
    +

    Scaffolding

    + + + +

    Base CSS

    + + + + + + + +
    +
    +

    Components

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

    JS Components

    + + + + + + + +
    +
    +

    Miscellaneous

    + + + + +

    Responsive

    + + + +
    +
    + + +
    +
    +

    Links

    + + + + +

    Grid system

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

    Typography

    + + + + + + +

    Forms

    + + + + +

    Navbar

    + + + + + + +
    +
    +

    Form states & alerts

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

    Heads up!

    +

    All plugins require the latest version of jQuery to be included.

    +
    +
    + + +
    + + + + +
    + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/index.html b/docs/index.html index 2bbcaa78a..83e65c97e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -51,6 +51,9 @@
  • Using LESS
  • +
  • + Download +
  • diff --git a/docs/javascript.html b/docs/javascript.html index 425d347cb..a7818ff46 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -51,6 +51,9 @@
  • Using LESS
  • +
  • + Download +
  • @@ -65,18 +68,18 @@

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

    diff --git a/docs/less.html b/docs/less.html index 55138c71a..6bb04e8d8 100644 --- a/docs/less.html +++ b/docs/less.html @@ -51,6 +51,9 @@
  • Using LESS
  • +
  • + Download +
  • @@ -69,177 +72,16 @@

    Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.

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

    Scaffolding

    - - - -

    Base CSS

    - - - - - - - -
    -
    -

    Components

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

    JS Components

    - - - - - - - -
    -
    -

    Responsive

    - - - -

    Miscellaneous

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

    Links

    - - - - -

    Grid system

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

    Typography

    - - - - - - -

    Forms

    - - - - -

    Navbar

    - - - - - - -
    -
    -

    Form states & alerts

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

    And you're set!

    -

    We've compiled your selected CSS and customized variables and have them ready to download as a tidy ZIP file. Choose from compiled or compiled and minified CSS files.

    - Download CSS Download minified CSS -
    -

    Looking to customize your javascript? Head over to the Javascript plugins page to build your own Bootstrap JS bundle.

    -
    -
    -
    -
    - -
    - - -
    @@ -249,7 +91,7 @@

    Why LESS?

    -

    Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.

    +

    Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by our good friend, Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.

    What's included?

    @@ -283,7 +125,7 @@ ================================================== -->

    Hyperlinks

    @@ -554,85 +396,8 @@ - - - - - - - - - - - - - - - -
    - -
    -
    -

    Bootstrap was built with Preboot, an open-source pack of mixins and variables to be used in conjunction with Less, a CSS preprocessor for faster and easier web development.

    -

    Check out how we used Preboot in Bootstrap and how you can make use of it should you choose to run Less on your next project.

    -
    -
    -

    How to use it

    -

    Use this option to make full use of Bootstrap’s Less variables, mixins, and nesting in CSS via javascript in your browser.

    -
    -<link rel="stylesheet/less" href="less/bootstrap.less" media="all" />
    -<script src="js/less-1.1.3.min.js"></script>
    -

    Not feeling the .js solution? Try the Less Mac app or use Node.js to compile when you deploy your code.

    - -

    What’s included

    -

    Here are some of the highlights of what’s included in Twitter Bootstrap as part of Bootstrap. Head over to the Bootstrap website or Github project page to download and learn more.

    -

    Variables

    -

    Variables in Less are perfect for maintaining and updating your CSS headache free. When you want to change a color value or a frequently used value, update it in one spot and you’re set.

    -
    -// Links
    -@linkColor:         #8b59c2;
    -@linkColorHover:    darken(@linkColor, 10);
    -
    -// Grays
    -@black:             #000;
    -@grayDark:          lighten(@black, 25%);
    -@gray:              lighten(@black, 50%);
    -@grayLight:         lighten(@black, 70%);
    -@grayLighter:       lighten(@black, 90%);
    -@white:             #fff;
    -
    -// Accent Colors
    -@blue:              #08b5fb;
    -@green:             #46a546;
    -@red:               #9d261d;
    -@yellow:            #ffc40d;
    -@orange:            #f89406;
    -@pink:              #c3325f;
    -@purple:            #7a43b6;
    -
    -// Baseline grid
    -@basefont:          13px;
    -@baseline:          18px;
    -
    - -

    Commenting

    -

    Less also provides another style of commenting in addition to CSS’s normal /* ... */ syntax.

    -
    -// This is a comment
    -/* This is also a comment */
    -
    -

    Mixins up the wazoo

    Mixins are basically includes or partials for CSS, allowing you to combine a block of code into one. They’re great for vendor prefixed properties like box-shadow, cross-browser gradients, font stacks, and more. Below is a sample of the mixins that are included with Bootstrap.

    Font stacks

    @@ -686,69 +451,59 @@ } -

    Compiling Less

    -

    After modifying the .less files in /lib/, you'll need to recompile them in order to regenerate the bootstrap-*.*.*.css and bootstrap-*.*.*.min.css files. If you're submitting a pull request to GitHub, you must always recompile.

    -

    Ways to compile

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    MethodSteps
    Node with makefile -

    Install the LESS command line compiler with npm by running the following command:

    -
    $ npm install less
    -

    Once installed just run make from the root of your bootstrap directory and you're all set.

    -

    Additionally, if you have watchr installed, you may run make watch to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).

    -
    Javascript -

    Download the latest Less.js and include the path to it (and Bootstrap) in the <head>.

    + + +
    + +
    + Note: If you're submitting a pull request to GitHub with modified CSS, you must recompile the CSS via any of these methods. +
    +

    Tools for compiling

    +
    +
    +

    Node with makefile

    +

    Install the LESS command line compiler with npm by running the following command:

    +
    $ npm install less
    +

    Once installed just run make from the root of your bootstrap directory and you're all set.

    +

    Additionally, if you have watchr installed, you may run make watch to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).

    +
    +
    +

    Command line

    +

    Install the LESS command line tool via Node and run the following command:

    +
    $ lessc ./lib/bootstrap.less > bootstrap.css
    +

    Be sure to include --compress in that command if you're trying to save some bytes!

    +
    +
    +

    Javascript

    +

    Download the latest Less.js and include the path to it (and Bootstrap) in the <head>.

     <link rel="stylesheet/less" href="/path/to/bootstrap.less">
     <script src="/path/to/less.js"></script>
     
    -

    To recompile the .less files, just save them and reload your page. Less.js compiles them and stores them in local storage.

    -
    Command line -

    Install the LESS command line tool via Node and run the following command:

    -
    $ lessc ./lib/bootstrap.less > bootstrap.css
    -

    Be sure to include --compress in that command if you're trying to save some bytes!

    -
    Unofficial Mac app -

    The unofficial Mac app watches directories of .less files and compiles the code to local files after every save of a watched .less file.

    -

    If you like, you can toggle preferences in the app for automatic minifying and which directory the compiled files end up in.

    -
    CrunchCrunch is a great looking LESS editor and compiler built on Adobe Air.
    CodeKitCreated by the same guy as the unofficial Mac app, CodeKit is a Mac app that compiles LESS, SASS, Stylus, and CoffeeScript.
    SimplessMac, Linux, and PC app for drag and drop compiling of LESS files. Plus, the source code is on GitHub.
    -
    -
    - +

    To recompile the .less files, just save them and reload your page. Less.js compiles them and stores them in local storage.

    +
    +
    +
    +
    +

    Unofficial Mac app

    +

    The unofficial Mac app watches directories of .less files and compiles the code to local files after every save of a watched .less file.

    +

    If you like, you can toggle preferences in the app for automatic minifying and which directory the compiled files end up in.

    +
    +
    +

    More Mac apps

    +

    Crunch

    +

    Crunch is a great looking LESS editor and compiler built on Adobe Air.

    +

    CodeKit

    +

    Created by the same guy as the unofficial Mac app, CodeKit is a Mac app that compiles LESS, SASS, Stylus, and CoffeeScript.

    +

    Simpless

    +

    Mac, Linux, and PC app for drag and drop compiling of LESS files. Plus, the source code is on GitHub.

    +
    +
    +