From bc9c89f1577aea454111a01a3d7a565c4cc63ded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= Date: Tue, 24 Jan 2012 21:29:55 +0100 Subject: [PATCH 1/3] Start adding tag for Base CSS translation --- docs/templates/pages/base-css.mustache | 154 ++++++++++++------------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 28ca2912bf..3b9cbd39a9 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1,14 +1,14 @@
-

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.

+

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

@@ -17,43 +17,43 @@ ================================================== -->
-

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

+

{{_i}}Typography Headings, paragraphs, lists, and other inline type elements{{/i}}

-

Headings & body copy

+

{{_i}}Headings & body copy{{/i}}

-

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.

+

{{_i}}Typographic scale{{/i}}

+

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

+

{{_i}}We use those variables, and some math, to create the margins, paddings, and line-heights of all our type and more.{{/i}}

-

Example body text

+

{{_i}}Example body text{{/i}}

Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula 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
+

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

+

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

+

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

+

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

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

Emphasis, address, and abbreviation

+

{{_i}}Emphasis, address, and abbreviation{{/i}}

- - - + + + @@ -62,10 +62,10 @@ <strong> @@ -73,10 +73,10 @@ <em> @@ -84,10 +84,10 @@ <abbr> @@ -95,10 +95,10 @@ <address> @@ -106,13 +106,13 @@
-

Using emphasis

+

{{_i}}Using emphasis{{/i}}

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.

+

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

-

Example addresses

-

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

+

{{_i}}Example addresses{{/i}}

+

{{_i}}Here are two examples of how the <address> tag can be used:{{/i}}

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

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.

+

{{_i}}Example abbreviations{{/i}}

+

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

+

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

+

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

@@ -138,9 +138,9 @@
ElementUsageOptional{{_i}}Element{{/i}}{{_i}}Usage{{/i}}{{_i}}Optional{{/i}}
- For emphasizing a snippet of text with important + {{_i}}For emphasizing a snippet of text with important{{/i}} - None + {{_i}}None{{/i}}
- For emphasizing a snippet of text with stress + {{_i}}For emphasizing a snippet of text with stress{{/i}} - None + {{_i}}None{{/i}}
- Wraps abbreviations and acronyms to show the expanded version on hover + {{_i}}Wraps abbreviations and acronyms to show the expanded version on hover{{/i}} - Include optional title for expanded text + {{_i}}Include optional title for expanded text{{/i}}
- For contact information for its nearest ancestor or the entire body of work + {{_i}}For contact information for its nearest ancestor or the entire body of work{{/i}} - Preserve formatting by ending all lines with <br> + {{_i}}Preserve formatting by ending all lines with <br>{{/i}}
- - - + + + @@ -149,11 +149,11 @@ <blockquote> @@ -161,53 +161,53 @@ <small>
ElementUsageOptional{{_i}}Element{{/i}}{{_i}}Usage{{/i}}{{_i}}Optional{{/i}}
- Block-level element for quoting content from another source + {{_i}}Block-level element for quoting content from another source{{/i}} -

Add cite attribute for source URL

- Use .pull-left and .pull-right classes for floated options +

{{_i}}Add cite attribute for source URL{{/i}}

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

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.

+

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

+

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

 <blockquote>
   <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p>
-  <small>Someone famous</small>
+  <small>{{_i}}Someone famous{{/i}}</small>
 </blockquote>
-

Example blockquotes

+

{{_i}}Example blockquotes{{/i}}

-

Default blockquotes are styled as such:

+

{{_i}}Default blockquotes are styled as such:{{/i}}

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

- Someone famous in Body of work + {{_i}}Someone famous in Body of work{{/i}}
-

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

+

{{_i}}To float your blockquote to the right, add class="pull-right":{{/i}}

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

- Someone famous in Body of work + {{_i}}Someone famous in Body of work{{/i}}
-

Lists

+

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

-

Unordered

+

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

<ul>

  • Lorem ipsum dolor sit amet
    • @@ -228,7 +228,7 @@
-

Unstyled

+

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

<ul class="unstyled">

  • Lorem ipsum dolor sit amet
    • @@ -249,7 +249,7 @@
-

Ordered

+

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

<ol>

  1. Lorem ipsum dolor sit amet
    2. @@ -263,11 +263,11 @@
-

Description

+

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

<dl>

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

Code Inline and block

+

{{_i}}Code Inline and block{{/i}}

- - + + - + From a9c6dca0940f5f689e9e8d70eda42783265bee37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= Date: Tue, 24 Jan 2012 21:45:42 +0100 Subject: [PATCH 2/3] More translation tags in Base CSS --- docs/templates/pages/base-css.mustache | 162 ++++++++++++------------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 3b9cbd39a9..5a58b96638 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -134,7 +134,7 @@ -

Blockquotes

+

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

ElementResult{{_i}}Element{{/i}}{{_i}}Result{{/i}}
<code>In a line of text like this, your wrapped code will look like this <html> element.{{_i}}In a line of text like this, your wrapped code will look like this <html> element.{{/i}}
<pre> 
<div>
-  <h1>Heading</h1>
-  <p>Something right here...</p>
+  <h1>{{_i}}Heading{{/i}}</h1>
+  <p>{{_i}}Something right here…{{/i}}</p>
 </div>
-

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

+

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

+

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

<div>
-  <h1>Heading</h1>
-  <p>Something right here...</p>
+  <h1>{{_i}}Heading{{/i}}</h1>
+  <p>{{_i}}Something right here…{{/i}}</p>
 </div>
<div>
-  <h1>Heading</h1>
-  <p>Something right here...</p>
+  <h1>{{_i}}Heading{{/i}}</h1>
+  <p>{{_i}}Something right here…{{/i}}</p>
 </div>
-

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

+

{{_i}}Download google-code-prettify and view the readme for how to use.{{/i}}
@@ -322,53 +322,53 @@
-

Inline labels for special attention

+

{{_i}}Inline labels for special attention{{/i}}

- - + + @@ -382,17 +382,17 @@ ================================================== -->
-

Tables For, you guessed it, tabular data

+

{{_i}}Tables For, you guessed it, tabular data{{/i}}

-

Table markup

+

{{_i}}Table markup{{/i}}

LabelsMarkup{{_i}}Labels{{/i}}{{_i}}Markup{{/i}}
- Default + {{_i}}Default{{/i}} - <span class="label">Default</span> + <span class="label">{{_i}}Default{{/i}}</span>
- New + {{_i}}New{{/i}} - <span class="label success">New</span> + <span class="label success">{{/_i}}New{{/i}}</span>
- Warning + {{_i}}Warning{{/i}} - <span class="label warning">Warning</span> + <span class="label warning">{{_i}}Warning{{/i}}</span>
- Important + {{_i}}Important{{/i}} - <span class="label important">Important</span> + <span class="label important">{{_i}}Important{{/i}}</span>
- Notice + {{_i}}Notice{{/i}} - <span class="label notice">Notice</span> + <span class="label notice">{{_i}}Notice{{/i}}</span>
- - + + @@ -401,7 +401,7 @@ <table> @@ -409,7 +409,7 @@ <thead> @@ -417,7 +417,7 @@ <tbody> @@ -425,7 +425,7 @@ <tr> @@ -433,7 +433,7 @@ <td> @@ -441,8 +441,8 @@ <th> @@ -450,7 +450,7 @@ <caption> @@ -461,14 +461,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> @@ -476,62 +476,62 @@ -

Table options

+

{{_i}}Table options{{/i}}

TagDescription{{_i}}Tag{{/i}}{{_i}}Description{{/i}}
- Wrapping element for displaying data in a tabular format + {{_i}}Wrapping element for displaying data in a tabular format{{/i}}
- Container element for table header rows (<tr>) to label table columns + {{_i}}Container element for table header rows (<tr>) to label table columns{{/i}}
- Container element for table rows (<tr>) in the body of the table + {{_i}}Container element for table rows (<tr>) in the body of the table{{/i}}
- Container element for a set of table cells (<td> or <th>) that appears on a single row + {{_i}}Container element for a set of table cells (<td> or <th>) that appears on a single row{{/i}}
- Default table cell + {{_i}}Default table cell{{/i}}
- Special table cell for column (or row, depending on scope and placement) labels
- Must be used within a <thead> + {{_i}}Special table cell for column (or row, depending on scope and placement) labels{{/i}}
+ {{_i}}Must be used within a <thead>{{/i}}
- Description or summary of what the table holds, especially useful for screen readers + {{_i}}Description or summary of what the table holds, especially useful for screen readers{{/i}}
- - - + + + - - - + + + - + - + - + - + - + - + - + - +
NameClassDescription{{_i}}Name{{/i}}{{_i}}Class{{/i}}{{_i}}Description{{/i}}
DefaultNoneNo styles, just columns and rows{{_i}}Default{{/i}}{{_i}}None{{/i}}{{_i}}No styles, just columns and rows{{/i}}
Basic{{_i}}Basic{{/i}} .table Only horizontal lines between rows{{_i}}Only horizontal lines between rows{{/i}}
Bordered{{_i}}Bordered{{/i}} .table-bordered Rounds corners and adds outter border{{_i}}Rounds corners and adds outter border{{/i}}
Zebra-stripe{{_i}}Zebra-stripe{{/i}} .table-striped Adds light gray background color to odd rows (1, 3, 5, etc){{_i}}Adds light gray background color to odd rows (1, 3, 5, etc){{/i}}
Condensed{{_i}}Condensed{{/i}} .table-condensed Cuts vertical padding in half, from 8px to 4px, within all td and th elements{{_i}}Cuts vertical padding in half, from 8px to 4px, within all td and th elements{{/i}}
-

Example tables

+

{{_i}}Example tables{{/i}}

-

1. Default table styles

+

1. {{_i}}Default table styles{{/i}}

-

Tables are automatically styled with only a few borders to ensure readability and maintain structure. With 2.0, the .table class is required.

+

{{_i}}Tables are automatically styled with only a few borders to ensure readability and maintain structure. With 2.0, the .table class is required.{{/i}}

 <table class="table">
-  ...
+  …
 </table>
@@ -539,9 +539,9 @@ # - First Name - Last Name - Language + {{_i}}First Name{{/i}} + {{_i}}Last Name{{/i}} + {{_i}}Language{{/i}} @@ -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 @@ # - First Name - Last Name - Language + {{_i}}First Name{{/i}} + {{_i}}Last Name{{/i}} + {{_i}}Language{{/i}} @@ -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 @@ # - First Name - Last Name - Language + {{_i}}First Name{{/i}} + {{_i}}Last Name{{/i}} + {{_i}}Language{{/i}} @@ -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 @@ # - First Name - Last Name - Language + {{_i}}First Name{{/i}} + {{_i}}Last Name{{/i}} + {{_i}}Language{{/i}} @@ -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 @@ # - First Name - Last Name - Language + {{_i}}First Name{{/i}} + {{_i}}Last Name{{/i}} + {{_i}}Language{{/i}} @@ -762,14 +762,14 @@ -

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

- - - + + + 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: [PATCH 3/3] Final translation tags in Base CSS --- docs/templates/pages/base-css.mustache | 325 +++++++++++++------------ 1 file changed, 163 insertions(+), 162 deletions(-) diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 5a58b96638..b8c413888a 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -809,125 +809,125 @@ ================================================== -->
-

Forms

+

{{_i}}Forms{{/i}}

-

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

Buttons

+

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

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

Icons Graciously provided by Glyphicons

+

{{_i}}Icons Graciously provided by Glyphicons{{/i}}

@@ -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}}