From 84a8aa1beac447cbbe77983730f7590fc955b312 Mon Sep 17 00:00:00 2001 From: Jon Stevens Date: Tue, 24 Jan 2012 11:08:03 -0800 Subject: [PATCH 01/10] 2.0-wip: fix js heads --- js/bootstrap-button.js | 2 +- js/bootstrap-carousel.js | 2 +- js/bootstrap-collapse.js | 4 ++-- js/bootstrap-dropdown.js | 2 +- js/bootstrap-modal.js | 2 +- js/bootstrap-popover.js | 2 +- js/bootstrap-tab.js | 2 +- js/bootstrap-tooltip.js | 2 +- js/bootstrap-transition.js | 4 ++-- js/bootstrap-typeahead.js | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js index 046d256142..2461ffec6e 100644 --- a/js/bootstrap-button.js +++ b/js/bootstrap-button.js @@ -1,5 +1,5 @@ /* ============================================================ - * bootstrap-buttons.js v2.0.0 + * bootstrap-button.js v2.0.0 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 4e12e31b54..3262f0cab0 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -1,6 +1,6 @@ /* ========================================================== * bootstrap-carousel.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#alerts + * http://twitter.github.com/bootstrap/javascript.html#carousel * ========================================================== * Copyright 2012 Twitter, Inc. * diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 9278f66d0e..ac434dcf37 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -1,6 +1,6 @@ /* ============================================================= - * bootstrap-collapsible.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#collapsible + * bootstrap-collapse.js v2.0.0 + * http://twitter.github.com/bootstrap/javascript.html#collapse * ============================================================= * Copyright 2012 Twitter, Inc. * diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index 923da6bfa6..f9d93fc72a 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -1,6 +1,6 @@ /* ============================================================ * bootstrap-dropdown.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#dropdown + * http://twitter.github.com/bootstrap/javascript.html#dropdowns * ============================================================ * Copyright 2012 Twitter, Inc. * diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index 3652f5c8b5..ecb7b5add7 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -1,6 +1,6 @@ /* ========================================================= * bootstrap-modal.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#modal + * http://twitter.github.com/bootstrap/javascript.html#modals * ========================================================= * Copyright 2012 Twitter, Inc. * diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index a0de0f08dc..57864fc6e9 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -1,6 +1,6 @@ /* =========================================================== * bootstrap-popover.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#popover + * http://twitter.github.com/bootstrap/javascript.html#popovers * =========================================================== * Copyright 2012 Twitter, Inc. * diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js index e5b85e2325..d52be872f1 100644 --- a/js/bootstrap-tab.js +++ b/js/bootstrap-tab.js @@ -1,5 +1,5 @@ /* ======================================================== - * bootstrap-tabs.js v2.0.0 + * bootstrap-tab.js v2.0.0 * http://twitter.github.com/bootstrap/javascript.html#tabs * ======================================================== * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index 07a5d46f56..21f2311fb2 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -1,6 +1,6 @@ /* =========================================================== * bootstrap-tooltip.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#tooltip + * http://twitter.github.com/bootstrap/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index 8f6e86e442..94f1dbdf80 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -1,6 +1,6 @@ /* =================================================== - * bootstrap-transitions.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html + * bootstrap-transition.js v2.0.0 + * http://twitter.github.com/bootstrap/javascript.html#transitions * =================================================== * Copyright 2012 Twitter, Inc. * diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js index b8ff5aab00..f64fcca01e 100644 --- a/js/bootstrap-typeahead.js +++ b/js/bootstrap-typeahead.js @@ -1,6 +1,6 @@ /* ============================================================= * bootstrap-typeahead.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#collapsible + * http://twitter.github.com/bootstrap/javascript.html#typeahead * ============================================================= * Copyright 2012 Twitter, Inc. * 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 02/10] 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 @@ ================================================== -->
-

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 03/10] 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 @@ ================================================== -->
-

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 04/10] 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 @@ ================================================== -->
-

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

From 7d52e1dcd479e017d85fee8df4032644970525bd Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 24 Jan 2012 13:47:24 -0800 Subject: [PATCH 05/10] 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(-) diff --git a/docs/base-css.html b/docs/base-css.html index f21f25f6b3..6485d76a22 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 3a15541c4a..9d28b9e06b 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 bdcc622dec..a35c299136 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 cc8197118c..cd486ac986 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?

From 3aea86370d7d6c717939eebcd6f3a93776c567d4 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 24 Jan 2012 13:48:05 -0800 Subject: [PATCH 06/10] rebuild base-css --- docs/base-css.html | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/docs/base-css.html b/docs/base-css.html index 6485d76a22..92117b80ef 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.

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

-   + +

From 72117c3f9751d9ccb7bebf76f8a5776c99a51857 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 24 Jan 2012 13:57:44 -0800 Subject: [PATCH 07/10] add i18n for less.mustache --- docs/templates/pages/less.mustache | 138 ++++++++++++++--------------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 568e857bef..d6376ae2f6 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}}

- - - + + + - + - +
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}}
From f03e170054be081738493c6dace4b37a7a3d40cd Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 24 Jan 2012 14:08:03 -0800 Subject: [PATCH 08/10] scaffolding i18n --- docs/templates/pages/scaffolding.mustache | 134 +++++++++++----------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index c586af1b91..7c0c12e8f4 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) { .. }
 
From f4543ecb19f41f93db94e56601e0a4132ea4828f Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 24 Jan 2012 14:14:01 -0800 Subject: [PATCH 09/10] add i18n to upgrading --- docs/templates/pages/upgrading.mustache | 74 ++++++++++++------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache index 475539284b..cc731eae12 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}}
From a800d6ceac11eb834295567c20e890abf88c64af Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 24 Jan 2012 14:22:02 -0800 Subject: [PATCH 10/10] i18n index --- docs/index.html | 2 +- docs/templates/pages/index.mustache | 106 ++++++++++++++-------------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/docs/index.html b/docs/index.html index 1743676b6c..d0c0bcae60 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 8927bc640d..1e77d4a25a 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}}