From 05571db10990ff66d312abc9cd25144dad36517d Mon Sep 17 00:00:00 2001 From: Erik van der Kolk Date: Sat, 18 Aug 2012 13:40:37 +0200 Subject: [PATCH 01/26] Add to Supported table markup example --- docs/base-css.html | 1 + docs/templates/pages/base-css.mustache | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/base-css.html b/docs/base-css.html index 3ea3bdce36..b24d3eea41 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -802,6 +802,7 @@ For example, <code>section</code> should be wrapped as inline. 
 <table>
+  <caption>…</caption>
   <thead>
     <tr>
       <th>…</th>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 4cc21e9755..b6a88b8542 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -739,6 +739,7 @@
           
 
 <table>
+  <caption>…</caption>
   <thead>
     <tr>
       <th>…</th>

From 0c24f51d2a6e67446cf96c5a5a15319ff63f3f43 Mon Sep 17 00:00:00 2001
From: Erik van der Kolk 
Date: Sat, 18 Aug 2012 13:56:02 +0200
Subject: [PATCH 02/26] Change .help-block tag for "Forms => Default styles"
 example into 

---
 docs/base-css.html                     | 2 +-
 docs/templates/pages/base-css.mustache | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index b24d3eea41..41ef5526fd 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -835,7 +835,7 @@ For example, <code>section</code> should be wrapped as inline.
             Legend
             
             
-            
Example block-level help text here.

+            Example block-level help text here.
             
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index b6a88b8542..28e98439bc 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -772,7 +772,7 @@
             Legend
             
             
-            
{{_i}}Example block-level help text here.{{/i}}

+            {{_i}}Example block-level help text here.{{/i}}
             

From 7f5aa177f5f6e67801db7f17d93092aeb47bfd75 Mon Sep 17 00:00:00 2001
From: Erik van der Kolk 
Date: Sat, 18 Aug 2012 14:00:33 +0200
Subject: [PATCH 03/26] Make Forms => Default styles code snippet the same as
 example

---
 docs/base-css.html                     | 3 ++-
 docs/templates/pages/base-css.mustache | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 41ef5526fd..5e9cdf7b28 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -842,7 +842,8 @@ For example, <code>section</code> should be wrapped as inline.
             
           
 
-<form class="well">
+<form>
+  <legend>Legend</legend>
   <label>Label name</label>
   <input type="text" placeholder="Type something…">
   <span class="help-block">Example block-level help text here.</span>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 28e98439bc..a663d4a945 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -779,7 +779,8 @@
             
           {{! /example }}
 
-<form class="well">
+<form>
+  <legend>{{_i}}Legend{{/i}}</legend>
   <label>{{_i}}Label name{{/i}}</label>
   <input type="text" placeholder="{{_i}}Type something…{{/i}}">
   <span class="help-block">Example block-level help text here.</span>

From c8b8d914b83ffe736ce21b3848b6fb6467eaffe8 Mon Sep 17 00:00:00 2001
From: Erik van der Kolk 
Date: Sat, 18 Aug 2012 14:22:41 +0200
Subject: [PATCH 04/26] Make Forms => Textarea code snippet the same as example

---
 docs/base-css.html                     | 2 +-
 docs/templates/pages/base-css.mustache | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 5e9cdf7b28..05b0fdb980 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -974,7 +974,7 @@ For example, <code>section</code> should be wrapped as inline.
             
           
 
-<textarea id="textarea" rows="3"></textarea>
+<textarea rows="3"></textarea>
 

 
           
Checkboxes and radios

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index a663d4a945..61864aac6e 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -911,7 +911,7 @@
             
           
 
-<textarea id="textarea" rows="3"></textarea>
+<textarea rows="3"></textarea>
 

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


From 25f8ef32605a259648e2085102689bc797c9aa42 Mon Sep 17 00:00:00 2001
From: Erik van der Kolk 
Date: Sat, 18 Aug 2012 14:36:30 +0200
Subject: [PATCH 05/26] Add multiple="multiple" to Forms => Selects as
 described in explanation

---
 docs/base-css.html                     | 4 ++--
 docs/templates/pages/base-css.mustache | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 05b0fdb980..1d5e804e92 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1047,7 +1047,7 @@ For example, <code>section</code> should be wrapped as inline.
               
             
             

-            
               
               
               
@@ -1064,7 +1064,7 @@ For example, <code>section</code> should be wrapped as inline.
   <option>5</option>
 </select>
 
-<select>
+<select multiple="multiple">
   <option>1</option>
   <option>2</option>
   <option>3</option>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 61864aac6e..7101869c50 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -984,7 +984,7 @@
               
             
             

-            
               
               
               
@@ -1001,7 +1001,7 @@
   <option>5</option>
 </select>
 
-<select>
+<select multiple="multiple">
   <option>1</option>
   <option>2</option>
   <option>3</option>

From a8b18b6f54f42ab3d22357412933381998ed3f50 Mon Sep 17 00:00:00 2001
From: Erik van der Kolk 
Date: Sat, 18 Aug 2012 14:54:32 +0200
Subject: [PATCH 06/26] Fix typo

---
 docs/base-css.html                     | 2 +-
 docs/templates/pages/base-css.mustache | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 1d5e804e92..5fd44e3737 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1084,7 +1084,7 @@ For example, <code>section</code> should be wrapped as inline.
           
Add text or buttons before or after any text-based input. Do note that select elements are not supported here.

 
           
Default options

-          
Wrap a .add-on and an input with one of two classes to prepend or append text to an input.

+          
Wrap an .add-on and an input with one of two classes to prepend or append text to an input.

           

             

               @
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 7101869c50..e733abbb47 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1021,7 +1021,7 @@
           
{{_i}}Add text or buttons before or after any text-based input. Do note that select elements are not supported here.{{/i}}

 
           
{{_i}}Default options{{/i}}

-          
{{_i}}Wrap a .add-on and an input with one of two classes to prepend or append text to an input.{{/i}}

+          
{{_i}}Wrap an .add-on and an input with one of two classes to prepend or append text to an input.{{/i}}

           
             

               @

From 663fd4ff620b2a79cfba97623f24c3f1ff8c01fd Mon Sep 17 00:00:00 2001
From: Erik van der Kolk 
Date: Sat, 18 Aug 2012 15:29:55 +0200
Subject: [PATCH 07/26] Make Extending form ... => Search form code snippet the
 same as example

---
 docs/base-css.html                     | 10 ++++++++--
 docs/templates/pages/base-css.mustache | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 5fd44e3737..df307c3816 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1157,8 +1157,14 @@ For example, <code>section</code> should be wrapped as inline.
           
 
 <form class="form-search">
-  <input type="text" class="span2 search-query">
-  <button type="submit" class="btn">Search</button>
+  <div class="input-append">
+    <input type="text" class="span2 search-query">
+    <button type="submit" class="btn">Search</button>
+  </div>
+  <div class="input-prepend">
+    <input type="text" class="span2 search-query">
+    <button type="submit" class="btn">Search</button>
+  </div>
 </form>
 

 
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index e733abbb47..d80a0eeaa3 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1094,8 +1094,14 @@
           {{! /example }}
 
 <form class="form-search">
-  <input type="text" class="span2 search-query">
-  <button type="submit" class="btn">{{_i}}Search{{/i}}</button>
+  <div class="input-append">
+    <input type="text" class="span2 search-query">
+    <button type="submit" class="btn">{{_i}}Search{{/i}}</button>
+  </div>
+  <div class="input-prepend">
+    <input type="text" class="span2 search-query">
+    <button type="submit" class="btn">{{_i}}Search{{/i}}</button>
+  </div>
 </form>
 

 

From 01dadc05f4522250f7a06b28ce27f8a0c3a91997 Mon Sep 17 00:00:00 2001
From: Erik van der Kolk 
Date: Sat, 18 Aug 2012 15:31:11 +0200
Subject: [PATCH 08/26] Make Relative sizing code snippet the same as example

---
 docs/base-css.html                     | 12 ++++++------
 docs/templates/pages/base-css.mustache | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index df307c3816..85dab82e37 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1183,12 +1183,12 @@ For example, <code>section</code> should be wrapped as inline.
             

           
 
-<input class="input-mini" type="text">
-<input class="input-small" type="text">
-<input class="input-medium" type="text">
-<input class="input-large" type="text">
-<input class="input-xlarge" type="text">
-<input class="input-xxlarge" type="text">
+<input class="input-mini" type="text" placeholder=".input-mini">
+<input class="input-small" type="text" placeholder=".input-small">
+<input class="input-medium" type="text" placeholder=".input-medium">
+<input class="input-large" type="text" placeholder=".input-large">
+<input class="input-xlarge" type="text" placeholder=".input-xlarge">
+<input class="input-xxlarge" type="text" placeholder=".input-xxlarge">
 

           

             Heads up! In future versions, we'll be altering the use of these relative input classes to match our button sizes. For example, .input-large will increase the padding and font-size of an input.
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index d80a0eeaa3..ffc22de9d6 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1120,12 +1120,12 @@
             

           
 
-<input class="input-mini" type="text">
-<input class="input-small" type="text">
-<input class="input-medium" type="text">
-<input class="input-large" type="text">
-<input class="input-xlarge" type="text">
-<input class="input-xxlarge" type="text">
+<input class="input-mini" type="text" placeholder=".input-mini">
+<input class="input-small" type="text" placeholder=".input-small">
+<input class="input-medium" type="text" placeholder=".input-medium">
+<input class="input-large" type="text" placeholder=".input-large">
+<input class="input-xlarge" type="text" placeholder=".input-xlarge">
+<input class="input-xxlarge" type="text" placeholder=".input-xxlarge">
 

           

             {{_i}}Heads up!{{/i}} In future versions, we'll be altering the use of these relative input classes to match our button sizes. For example, .input-large will increase the padding and font-size of an input.

From f37d4b0918bbcdd507c31f81d00621d03acf0248 Mon Sep 17 00:00:00 2001
From: Erik van der Kolk 
Date: Sat, 18 Aug 2012 15:43:00 +0200
Subject: [PATCH 09/26] Add missing placeholders and  into Help text code snippet as shown in
 example

---
 docs/base-css.html                     | 4 ++--
 docs/templates/pages/base-css.mustache | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 50fa1a8f8c..b3cb0466a1 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1303,7 +1303,7 @@ For example, <code>section</code> should be wrapped as inline.
              Inline help text
           
 
-<span class="help-inline">Inline help text</span>
+<input type="text"><span class="help-inline">Inline help text</span>
 

 
           
Block help

@@ -1312,7 +1312,7 @@ For example, <code>section</code> should be wrapped as inline.
             A longer block of help text that breaks onto a new line and may extend beyond one line.
           
 
-<span class="help-block">A longer block of help text that breaks onto a new line and may extend beyond one line.</span>
+<input type="text"><span class="help-block">A longer block of help text that breaks onto a new line and may extend beyond one line.</span>
 

 
 
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index f263c9f6cb..51438ec2b6 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1240,7 +1240,7 @@
              Inline help text
           
 
-<span class="help-inline">Inline help text</span>
+<input type="text"><span class="help-inline">Inline help text</span>
 

 
           
{{_i}}Block help{{/i}}

@@ -1249,7 +1249,7 @@
             A longer block of help text that breaks onto a new line and may extend beyond one line.
           
 
-<span class="help-block">A longer block of help text that breaks onto a new line and may extend beyond one line.</span>
+<input type="text"><span class="help-block">A longer block of help text that breaks onto a new line and may extend beyond one line.</span>
 

 
 

From a3c474c4048eff0c43b24bc8134b7ca753ced975 Mon Sep 17 00:00:00 2001
From: Erik van der Kolk 
Date: Sat, 18 Aug 2012 16:07:48 +0200
Subject: [PATCH 12/26] Move code within 
 tags as close to the left for
 Input focus

---
 docs/base-css.html                     | 6 +++---
 docs/templates/pages/base-css.mustache | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index b3cb0466a1..7b09e7175c 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1327,9 +1327,9 @@ For example, <code>section</code> should be wrapped as inline.
           

             
           

-  
-  <input class="input-xlarge" id="focusedInput" type="text" value="This is focused...">
-  

+
+<input class="input-xlarge" id="focusedInput" type="text" value="This is focused...">
+

 
           
Disabled inputs

           
Add the disabled attribute on an input to prevent user input and trigger a slightly different look.

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 51438ec2b6..ef896d4868 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1264,9 +1264,9 @@
           

             
           

-  
-  <input class="input-xlarge" id="focusedInput" type="text" value="{{_i}}This is focused...{{/i}}">
-  

+
+<input class="input-xlarge" id="focusedInput" type="text" value="{{_i}}This is focused...{{/i}}">
+

 
           
{{_i}}Disabled inputs{{/i}}

           
{{_i}}Add the disabled attribute on an input to prevent user input and trigger a slightly different look.{{/i}}


From 41253fb07366e49557d611b98d68b6057ca47417 Mon Sep 17 00:00:00 2001
From: Erik van der Kolk 
Date: Sat, 18 Aug 2012 16:36:40 +0200
Subject: [PATCH 13/26] Improve doc for Button sizes

---
 docs/base-css.html                     | 38 +++++++++++++++++---------
 docs/templates/pages/base-css.mustache | 38 +++++++++++++++++---------
 2 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 7b09e7175c..c84a42cf7c 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1460,30 +1460,42 @@ For example, <code>section</code> should be wrapped as inline.
 
 
           
Button sizes

-          
Fancy larger or smaller buttons? Add .btn-large, .btn-small, or .btn-mini for two additional sizes.

+          
Fancy larger or smaller buttons? Add .btn-large, .btn-small, or .btn-mini for additional sizes.

           

             

-              
-              
+              
+              
             

             

-              
-              
+              
+              
             

             

-              
-              
+              
+              
             

             

-              
-              
+              
+              
             

           

 
-<button class="btn btn-large" type="button">Large button</button>
-<button class="btn btn-small" type="button">Small button</button>
-<button class="btn" type="button">Default button</button>
-<button class="btn btn-mini" type="button">Mini button</button>
+<p>
+  <button class="btn btn-large btn-primary" type="button">Large button</button>
+  <button class="btn btn-large" type="button">Large button</button>
+</p>
+<p>
+  <button class="btn btn-primary" type="button">Default button</button>
+  <button class="btn" type="button">Default button</button>
+</p>
+<p>
+  <button class="btn btn-small btn-primary" type="button">Small button</button>
+  <button class="btn btn-small" type="button">Small button</button>
+</p>
+<p>
+  <button class="btn btn-mini btn-primary" type="button">Mini button</button>
+  <button class="btn btn-mini" type="button">Mini button</button>
+</p>
 

           
Create block level buttons—those that span the full width of a parent— by adding .btn-block.

           

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index ef896d4868..26a4129a67 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1397,30 +1397,42 @@
 
 
           
{{_i}}Button sizes{{/i}}

-          
{{_i}}Fancy larger or smaller buttons? Add .btn-large, .btn-small, or .btn-mini for two additional sizes.{{/i}}

+          
{{_i}}Fancy larger or smaller buttons? Add .btn-large, .btn-small, or .btn-mini for additional sizes.{{/i}}

           

             

-              
-              
+              
+              
             

             

-              
-              
+              
+              
             

             

-              
-              
+              
+              
             

             

-              
-              
+              
+              
             

           

 
-<button class="btn btn-large" type="button">{{_i}}Large button{{/i}}</button>
-<button class="btn btn-small" type="button">{{_i}}Small button{{/i}}</button>
-<button class="btn" type="button">{{_i}}Default button{{/i}}</button>
-<button class="btn btn-mini" type="button">{{_i}}Mini button{{/i}}</button>
+<p>
+  <button class="btn btn-large btn-primary" type="button">{{_i}}Large button{{/i}}</button>
+  <button class="btn btn-large" type="button">{{_i}}Large button{{/i}}</button>
+</p>
+<p>
+  <button class="btn btn-primary" type="button">{{_i}}Default button{{/i}}</button>
+  <button class="btn" type="button">{{_i}}Default button{{/i}}</button>
+</p>
+<p>
+  <button class="btn btn-small btn-primary" type="button">{{_i}}Small button{{/i}}</button>
+  <button class="btn btn-small" type="button">{{_i}}Small button{{/i}}</button>
+</p>
+<p>
+  <button class="btn btn-mini btn-primary" type="button">{{_i}}Mini button{{/i}}</button>
+  <button class="btn btn-mini" type="button">{{_i}}Mini button{{/i}}</button>
+</p>
 

           
{{_i}}Create block level buttons—those that span the full width of a parent— by adding .btn-block.{{/i}}

           


From 7b7a02542b5fa46338bc14fd83ca9b84d43c6b55 Mon Sep 17 00:00:00 2001
From: Erik van der Kolk 
Date: Sat, 18 Aug 2012 16:41:40 +0200
Subject: [PATCH 14/26] Improve doc for block level buttons

---
 docs/base-css.html                     | 7 +++++--
 docs/templates/pages/base-css.mustache | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index c84a42cf7c..584ce7d078 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1500,11 +1500,14 @@ For example, <code>section</code> should be wrapped as inline.
           
Create block level buttons—those that span the full width of a parent— by adding .btn-block.

           

             

-              
+              
               
             

           

-          
<button class="btn btn-large btn-block" type="button">Block level button</button>

+
+<button class="btn btn-large btn-block btn-primary" type="button">Block level button</button>
+<button class="btn btn-large btn-block" type="button">Block level button</button>
+

 
 
           
Disabled state

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 26a4129a67..02b5afaff5 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1437,11 +1437,14 @@
           
{{_i}}Create block level buttons—those that span the full width of a parent— by adding .btn-block.{{/i}}

           

             

-              
+              
               
             

           

-          
<button class="btn btn-large btn-block" type="button">{{_i}}Block level button{{/i}}</button>

+
+<button class="btn btn-large btn-block btn-primary" type="button">{{_i}}Block level button{{/i}}</button>
+<button class="btn btn-large btn-block" type="button">{{_i}}Block level button{{/i}}</button>
+

 
 
           
{{_i}}Disabled state{{/i}}


From 04a20fb402e45c4362c6e7804efb21d77f45e6a6 Mon Sep 17 00:00:00 2001
From: Erik van der Kolk 
Date: Sat, 18 Aug 2012 16:47:15 +0200
Subject: [PATCH 15/26] Use one line per tag in code snippet for One class,
 multiple tags

---
 docs/base-css.html                     | 10 +++-------
 docs/templates/pages/base-css.mustache | 10 +++-------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 584ce7d078..c1b13655da 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1550,13 +1550,9 @@ For example, <code>section</code> should be wrapped as inline.
           
 
 <a class="btn" href="">Link</a>
-<button class="btn" type="submit">
-  Button
-</button>
-<input class="btn" type="button"
-         value="Input">
-<input class="btn" type="submit"
-         value="Submit">
+<button class="btn" type="submit">Button</button>
+<input class="btn" type="button" value="Input">
+<input class="btn" type="submit" value="Submit">
 

           
As a best practice, try to match the element for you context to ensure matching cross-browser rendering. If you have an input, use an <input type="submit"> for your button.

 
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 02b5afaff5..8ab4b9c2a7 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1487,13 +1487,9 @@
           
 
 <a class="btn" href="">{{_i}}Link{{/i}}</a>
-<button class="btn" type="submit">
-  {{_i}}Button{{/i}}
-</button>
-<input class="btn" type="button"
-         value="{{_i}}Input{{/i}}">
-<input class="btn" type="submit"
-         value="{{_i}}Submit{{/i}}">
+<button class="btn" type="submit">{{_i}}Button{{/i}}</button>
+<input class="btn" type="button" value="{{_i}}Input{{/i}}">
+<input class="btn" type="submit" value="{{_i}}Submit{{/i}}">
 

           
{{_i}}As a best practice, try to match the element for you context to ensure matching cross-browser rendering. If you have an input, use an <input type="submit"> for your button.{{/i}}

 

From 2ab0c8de1ab01986d4dacdd3455eaea6fe8a65a4 Mon Sep 17 00:00:00 2001
From: Erik van der Kolk 
Date: Sat, 18 Aug 2012 16:50:08 +0200
Subject: [PATCH 16/26] Fix typo in One class, multiple tags section

---
 docs/base-css.html                     | 2 +-
 docs/templates/pages/base-css.mustache | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index c1b13655da..069b790476 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1554,7 +1554,7 @@ For example, <code>section</code> should be wrapped as inline.
 <input class="btn" type="button" value="Input">
 <input class="btn" type="submit" value="Submit">
 

-          
As a best practice, try to match the element for you context to ensure matching cross-browser rendering. If you have an input, use an <input type="submit"> for your button.

+          
As a best practice, try to match the element for your context to ensure matching cross-browser rendering. If you have an input, use an <input type="submit"> for your button.

 
         
 
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 8ab4b9c2a7..8c2155b210 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1491,7 +1491,7 @@
 <input class="btn" type="button" value="{{_i}}Input{{/i}}">
 <input class="btn" type="submit" value="{{_i}}Submit{{/i}}">
 

-          
{{_i}}As a best practice, try to match the element for you context to ensure matching cross-browser rendering. If you have an input, use an <input type="submit"> for your button.{{/i}}

+          
{{_i}}As a best practice, try to match the element for your context to ensure matching cross-browser rendering. If you have an input, use an <input type="submit"> for your button.{{/i}}

 
         
 

From f1854a3cec75c56093ae920ab532bca51d6fdbb6 Mon Sep 17 00:00:00 2001
From: Erik van der Kolk 
Date: Sat, 18 Aug 2012 16:53:43 +0200
Subject: [PATCH 17/26] Move code within 
 tags as close to the left for
 Images section

---
 docs/base-css.html                     | 6 +++---
 docs/templates/pages/base-css.mustache | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 069b790476..cd46ec0471 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1574,9 +1574,9 @@ For example, <code>section</code> should be wrapped as inline.
             
           
 
-  <img src="..." class="img-rounded">
-  <img src="..." class="img-circle">
-  <img src="..." class="img-polaroid">
+<img src="..." class="img-rounded">
+<img src="..." class="img-circle">
+<img src="..." class="img-polaroid">
 

 
 
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 8c2155b210..bc1e29f17f 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1511,9 +1511,9 @@
             
           
 
-  <img src="..." class="img-rounded">
-  <img src="..." class="img-circle">
-  <img src="..." class="img-polaroid">
+<img src="..." class="img-rounded">
+<img src="..." class="img-circle">
+<img src="..." class="img-polaroid">
 

 
 

From d8eb75d6e83a20f087856258cbd66ef01edee823 Mon Sep 17 00:00:00 2001
From: Erik van der Kolk 
Date: Sat, 18 Aug 2012 18:14:20 +0200
Subject: [PATCH 18/26] Fix Heads up! part for Images section

---
 docs/base-css.html                     | 3 ++-
 docs/templates/pages/base-css.mustache | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index cd46ec0471..67065bcc0d 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1567,7 +1567,8 @@ For example, <code>section</code> should be wrapped as inline.
             
Images

           
 
-          
Simple classes to easily style images in any project. Heads up: .img-rounded and .img-circle don't work in IE7-8.

+          
Simple classes to easily style images in any project.

+          
Heads up! .img-rounded and .img-circle don't work in IE7-8.

           

             
             
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index bc1e29f17f..3620d5b06a 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1504,7 +1504,8 @@
             
{{_i}}Images{{/i}}

           

 
-          
{{_i}}Simple classes to easily style images in any project. Heads up: .img-rounded and .img-circle don't work in IE7-8.{{/i}}

+          
{{_i}}Simple classes to easily style images in any project.

+          
{{_i}}Heads up!{{/i}} .img-rounded and .img-circle don't work in IE7-8.{{/i}}

           

             
             

From 97247a157c6d8c5a1c42461a3a7b569ecb930e86 Mon Sep 17 00:00:00 2001
From: Erik van der Kolk 
Date: Sat, 18 Aug 2012 18:24:18 +0200
Subject: [PATCH 19/26] Improve description for Images section

---
 docs/base-css.html                     | 2 +-
 docs/templates/pages/base-css.mustache | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 67065bcc0d..1428e38ec0 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1567,7 +1567,7 @@ For example, <code>section</code> should be wrapped as inline.
             
Images

           

 
-          
Simple classes to easily style images in any project.

+          
Add the .img-rounded, .img-circle or .img-polaroid class to a <img> element to easily style images in any project.

           
Heads up! .img-rounded and .img-circle don't work in IE7-8.

           

             
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 3620d5b06a..d8af4eaabf 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1504,8 +1504,8 @@
             
{{_i}}Images{{/i}}

           

 
-          
{{_i}}Simple classes to easily style images in any project.

-          
{{_i}}Heads up!{{/i}} .img-rounded and .img-circle don't work in IE7-8.{{/i}}

+          
{{_i}}Add the .img-rounded, .img-circle or .img-polaroid class to a <img> element to easily style images in any project.{{/i}}

+          
{{_i}}Heads up!{{/i}} {{_i}}.img-rounded and .img-circle don't work in IE7-8.{{/i}}

           

             
             

From d71efb855bda3ecd0b0fd079d2d9cb231c8ba71b Mon Sep 17 00:00:00 2001
From: Erik van der Kolk 
Date: Sat, 18 Aug 2012 19:21:01 +0200
Subject: [PATCH 20/26] Separate Buttons examples in Icon examples section and
 add code snippets

---
 docs/base-css.html                     | 66 ++++++++++++++++++++------
 docs/templates/pages/base-css.mustache | 66 ++++++++++++++++++++------
 2 files changed, 102 insertions(+), 30 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 1428e38ec0..40bfbcf066 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1770,30 +1770,66 @@ For example, <code>section</code> should be wrapped as inline.
           
Use them in buttons, button groups for a toolbar, navigation, or prepended form inputs.

 
           
Buttons

+
+          
Button group in a button toolbar

           

-            

+            

               

                 
                 
                 
                 
               

-              


-              

-                 User
-                
-                
-              

-              


-              
             

           

+
+<div class="btn-toolbar">
+  <div class="btn-group">
+
+    <a class="btn" href="#"><i class="icon-align-left"></i></a>
+    <a class="btn" href="#"><i class="icon-align-center"></i></a>
+    <a class="btn" href="#"><i class="icon-align-right"></i></a>
+    <a class="btn" href="#"><i class="icon-align-justify"></i></a>
+  </div>
+</div>
+

+
+          
Dropdown in a button group

+          

+            

+               User
+              
+              
+            

+          

+
+<div class="btn-group">
+  <a class="btn btn-primary" href="#"><i class="icon-user icon-white"></i> User</a>
+  <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
+  <ul class="dropdown-menu">
+    <li><a href="#"><i class="icon-pencil"></i> Edit</a></li>
+    <li><a href="#"><i class="icon-trash"></i> Delete</a></li>
+    <li><a href="#"><i class="icon-ban-circle"></i> Ban</a></li>
+    <li class="divider"></li>
+    <li><a href="#"><i class="i"></i> Make admin</a></li>
+  </ul>
+</div>
+

+
+          
Button

+          

+            
+          

+
+<a class="btn btn-small" href="#"><i class="icon-star"></i></a>
+

+
 
           
Navigation

           

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index d8af4eaabf..e1e14a4a0d 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1707,30 +1707,66 @@
           
{{_i}}Use them in buttons, button groups for a toolbar, navigation, or prepended form inputs.{{/i}}

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

+
+          
{{_i}}Button group in a button toolbar{{/i}}

           

-            

+            

               

                 
                 
                 
                 
               

-              


-              

-                 {{_i}}User{{/i}}
-                
-                
-              

-              


-              
             

           
{{! /bs-docs-example }}
+
+<div class="btn-toolbar">
+  <div class="btn-group">
+
+    <a class="btn" href="#"><i class="icon-align-left"></i></a>
+    <a class="btn" href="#"><i class="icon-align-center"></i></a>
+    <a class="btn" href="#"><i class="icon-align-right"></i></a>
+    <a class="btn" href="#"><i class="icon-align-justify"></i></a>
+  </div>
+</div>
+

+
+          
{{_i}}Dropdown in a button group{{/i}}

+          

+            

+               {{_i}}User{{/i}}
+              
+              
+            

+          
{{! /bs-docs-example }}
+
+<div class="btn-group">
+  <a class="btn btn-primary" href="#"><i class="icon-user icon-white"></i> {{_i}}User{{/i}}</a>
+  <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
+  <ul class="dropdown-menu">
+    <li><a href="#"><i class="icon-pencil"></i> {{_i}}Edit{{/i}}</a></li>
+    <li><a href="#"><i class="icon-trash"></i> {{_i}}Delete{{/i}}</a></li>
+    <li><a href="#"><i class="icon-ban-circle"></i> {{_i}}Ban{{/i}}</a></li>
+    <li class="divider"></li>
+    <li><a href="#"><i class="i"></i> {{_i}}Make admin{{/i}}</a></li>
+  </ul>
+</div>
+

+
+          
{{_i}}Button{{/i}}

+          

+            
+          
{{! /bs-docs-example }}
+
+<a class="btn btn-small" href="#"><i class="icon-star"></i></a>
+

+
 
           
{{_i}}Navigation{{/i}}

           


From 8b763286df34d4eadd8e5a254b7390a6c1ccbc3e Mon Sep 17 00:00:00 2001
From: Erik van der Kolk 
Date: Sat, 18 Aug 2012 19:31:29 +0200
Subject: [PATCH 21/26] Add code snippet to Icon examples => Navigation section

---
 docs/base-css.html                     | 8 ++++++++
 docs/templates/pages/base-css.mustache | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/docs/base-css.html b/docs/base-css.html
index 40bfbcf066..3a8a928d09 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1842,6 +1842,14 @@ For example, <code>section</code> should be wrapped as inline.
               
             

           

+
+<ul class="nav nav-list">
+  <li class="active"><a href="#"><i class="icon-home icon-white"></i> Home</a></li>
+  <li><a href="#"><i class="icon-book"></i> Library</a></li>
+  <li><a href="#"><i class="icon-pencil"></i> Applications</a></li>
+  <li><a href="#"><i class="i"></i> Misc</a></li>
+</ul>
+

 
           
Form fields

           

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index e1e14a4a0d..e8482b0e16 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1779,6 +1779,14 @@
               
             
{{! /well }}
           
{{! /bs-docs-example }}
+
+<ul class="nav nav-list">
+  <li class="active"><a href="#"><i class="icon-home icon-white"></i> {{_i}}Home{{/i}}</a></li>
+  <li><a href="#"><i class="icon-book"></i> {{_i}}Library{{/i}}</a></li>
+  <li><a href="#"><i class="icon-pencil"></i> {{_i}}Applications{{/i}}</a></li>
+  <li><a href="#"><i class="i"></i> {{_i}}Misc{{/i}}</a></li>
+</ul>
+

 
           
{{_i}}Form fields{{/i}}

           

From 2327d30ef5bcbebd5519488178534f2b09de89af Mon Sep 17 00:00:00 2001
From: Erik van der Kolk 
Date: Sat, 18 Aug 2012 19:40:42 +0200
Subject: [PATCH 22/26] Add code snippet to Icon examples => Form fields
 section

---
 docs/base-css.html                     | 9 +++++++++
 docs/templates/pages/base-css.mustache | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/docs/base-css.html b/docs/base-css.html
index 3a8a928d09..549bb415d1 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1862,6 +1862,15 @@ For example, <code>section</code> should be wrapped as inline.
               

             
           
+
+<div class="control-group">
+  <label class="control-label" for="inputIcon">Email address</label>
+  <div class="controls">
+    <div class="input-prepend">
+    <span class="add-on"><i class="icon-envelope"><i><span><input class="span2" id="inputIcon" type="text">
+  </div>
+</div>
+

 
         
 
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index e8482b0e16..242559dbe7 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1799,6 +1799,15 @@
               
             
           
+
+<div class="control-group">
+  <label class="control-label" for="inputIcon">{{_i}}Email address{{/i}}</label>
+  <div class="controls">
+    <div class="input-prepend">
+    <span class="add-on"><i class="icon-envelope"><i><span><input class="span2" id="inputIcon" type="text">
+  </div>
+</div>
+

 
         
 

From 3f12c746e59de41fc13964a70eaa31891f71c760 Mon Sep 17 00:00:00 2001
From: Erik van der Kolk 
Date: Sat, 18 Aug 2012 19:49:27 +0200
Subject: [PATCH 23/26] Replace Note: by Heads up!

---
 docs/base-css.html                     | 2 +-
 docs/templates/pages/base-css.mustache | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 549bb415d1..30c7f8d3f6 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -420,7 +420,7 @@ For example, <code>section</code> should be wrapped as inline.
   &lt;p&gt;Sample text here...&lt;/p&gt;
 </pre>
 

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

+          
Heads up! Be sure to keep code within <pre> tags as close to the left as possible; it will render all tabs.

           
You may optionally add the .pre-scrollable class which will set a max-height of 350px and provide a y-axis scrollbar.

         
 
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 242559dbe7..a25862c18e 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -357,7 +357,7 @@
   &lt;p&gt;{{_i}}Sample text here...{{/i}}&lt;/p&gt;
 </pre>
 

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

+          
{{_i}}Heads up!{{/i}} {{_i}}Be sure to keep code within <pre> tags as close to the left as possible; it will render all tabs.{{/i}}

           
{{_i}}You may optionally add the .pre-scrollable class which will set a max-height of 350px and provide a y-axis scrollbar.{{/i}}

         
 

From b7233a49dd42a17032389351f340c8175d77f36a Mon Sep 17 00:00:00 2001
From: Erik van der Kolk 
Date: Sat, 18 Aug 2012 19:51:57 +0200
Subject: [PATCH 24/26] Move code within code snippet as close to the left for
 Basic block

---
 docs/base-css.html                     | 2 +-
 docs/templates/pages/base-css.mustache | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 30c7f8d3f6..718beee6dd 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -417,7 +417,7 @@ For example, <code>section</code> should be wrapped as inline.
 

 
 <pre>
-  &lt;p&gt;Sample text here...&lt;/p&gt;
+&lt;p&gt;Sample text here...&lt;/p&gt;
 </pre>
 

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

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index a25862c18e..8496a05073 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -354,7 +354,7 @@
 
 <pre>
-  &lt;p&gt;{{_i}}Sample text here...{{/i}}&lt;/p&gt;
+&lt;p&gt;{{_i}}Sample text here...{{/i}}&lt;/p&gt;
 </pre>

{{_i}}Heads up!{{/i}} {{_i}}Be sure to keep code within <pre> tags as close to the left as possible; it will render all tabs.{{/i}}

From ae275dccb82023c9e8f0b8d8b689566ad07db8d9 Mon Sep 17 00:00:00 2001 From: Erik van der Kolk Date: Sat, 18 Aug 2012 21:44:57 +0200 Subject: [PATCH 25/26] Fix empty for attribute on labels in Horizontal form --- docs/base-css.html | 16 ++++++++-------- docs/templates/pages/base-css.mustache | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/base-css.html b/docs/base-css.html index 718beee6dd..6c92089077 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -906,15 +906,15 @@ For example, <code>section</code> should be wrapped as inline.
Legend
- +
- +
- +
- +
@@ -929,15 +929,15 @@ For example, <code>section</code> should be wrapped as inline. 
 <form class="form-horizontal">
   <div class="control-group">
-    <label class="control-label" for="">Email</label>
+    <label class="control-label" for="inputEmail">Email</label>
     <div class="controls">
-      <input type="text" placeholder="Email">
+      <input type="text" id="inputEmail" placeholder="Email">
     </div>
   </div>
   <div class="control-group">
-    <label class="control-label" for="">Password</label>
+    <label class="control-label" for="inputPassword">Password</label>
     <div class="controls">
-      <input type="password" placeholder="Password">
+      <input type="password" id="inputPassword" placeholder="Password">
     </div>
   </div>
   <div class="control-group">
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 8496a05073..35d5118a25 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -843,15 +843,15 @@
           
             Legend
             

-              
+              
               

-                
+                
               

             

             

-              
+              
               

-                
+                
               

             

             

@@ -866,15 +866,15 @@
 
 <form class="form-horizontal">
   <div class="control-group">
-    <label class="control-label" for="">{{_i}}Email{{/i}}</label>
+    <label class="control-label" for="inputEmail">{{_i}}Email{{/i}}</label>
     <div class="controls">
-      <input type="text" placeholder="{{_i}}Email{{/i}}">
+      <input type="text" id="inputEmail" placeholder="{{_i}}Email{{/i}}">
     </div>
   </div>
   <div class="control-group">
-    <label class="control-label" for="">{{_i}}Password{{/i}}</label>
+    <label class="control-label" for="inputPassword">{{_i}}Password{{/i}}</label>
     <div class="controls">
-      <input type="password" placeholder="{{_i}}Password{{/i}}">
+      <input type="password" id="inputPassword" placeholder="{{_i}}Password{{/i}}">
     </div>
   </div>
   <div class="control-group">

From dda951d1e1283738c132f1132e9dec28f27fa1ec Mon Sep 17 00:00:00 2001
From: Erik van der Kolk 
Date: Sat, 18 Aug 2012 21:52:43 +0200
Subject: [PATCH 26/26] Remove inexisting end tag 

---
 docs/base-css.html                     | 8 ++++----
 docs/templates/pages/base-css.mustache | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 6c92089077..363f91a020 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -855,7 +855,7 @@ For example, <code>section</code> should be wrapped as inline.
 

 
 
-          

+          

 
 
           
Optional layouts

@@ -952,7 +952,7 @@ For example, <code>section</code> should be wrapped as inline.
-
+

Supported form controls

@@ -1074,7 +1074,7 @@ For example, <code>section</code> should be wrapped as inline. -
+

Extending form controls

@@ -1316,7 +1316,7 @@ For example, <code>section</code> should be wrapped as inline. -
+

Form control states

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 35d5118a25..f2fb96b4bb 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -792,7 +792,7 @@ -
+

{{_i}}Optional layouts{{/i}}

@@ -889,7 +889,7 @@ -
+

{{_i}}Supported form controls{{/i}}

@@ -1011,7 +1011,7 @@ -
+

{{_i}}Extending form controls{{/i}}

@@ -1253,7 +1253,7 @@ -
+

{{_i}}Form control states{{/i}}