From b96e80cf3933cb5788cc21247e68b5cd2e0cbc94 Mon Sep 17 00:00:00 2001 From: Michael Shafrir Date: Wed, 1 Feb 2012 09:58:08 -0800 Subject: Fix broken named anchor link for LESS compiling instructions. --- docs/scaffolding.html | 2 +- docs/templates/pages/scaffolding.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 7f9c9de66..5dcfc7ca2 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -242,7 +242,7 @@

How to customize

-

Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grid variables in variables.less and use one of the four ways documented to recompile. If you're adding more columns, be sure to add the CSS for those in grid.less.

+

Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grid variables in variables.less and use one of the four ways documented to recompile. If you're adding more columns, be sure to add the CSS for those in grid.less.

Staying responsive

diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index bfbd879d5..dc2a1a6fc 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -166,7 +166,7 @@

{{_i}}How to customize{{/i}}

-

{{_i}}Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grid variables in variables.less and use one of the four ways documented to recompile. If you're adding more columns, be sure to add the CSS for those in grid.less.{{/i}}

+

{{_i}}Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grid variables in variables.less and use one of the four ways documented to recompile. If you're adding more columns, be sure to add the CSS for those in grid.less.{{/i}}

{{_i}}Staying responsive{{/i}}

-- cgit v1.2.3 From 4211f21e39631179753d6775e3ad90be05ab5f8f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 1 Feb 2012 22:27:11 -0800 Subject: #1571: remove fixed width on file inputs --- docs/assets/bootstrap.zip | Bin 56824 -> 56825 bytes docs/assets/css/bootstrap.css | 1 + 2 files changed, 1 insertion(+) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index a1ef66887..c4ddd0f26 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index a90e31930..9de317af5 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -570,6 +570,7 @@ input[type="image"], input[type="checkbox"], input[type="radio"] { border-radius: 0; } input[type="file"] { + width: auto; padding: initial; line-height: initial; border: initial; -- cgit v1.2.3 From 43d797dfff839013deb726a55edf082378444640 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 1 Feb 2012 22:29:15 -0800 Subject: #1566: add note about removal of secondary-nav in 2.0 --- docs/assets/bootstrap.zip | Bin 56825 -> 56825 bytes docs/templates/pages/upgrading.mustache | 1 + docs/upgrading.html | 1 + 3 files changed, 2 insertions(+) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index c4ddd0f26..deab7e441 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache index 02d1c7feb..30b843e0d 100644 --- a/docs/templates/pages/upgrading.mustache +++ b/docs/templates/pages/upgrading.mustache @@ -119,6 +119,7 @@
  • {{_i}}Base class changed from .topbar to .navbar{{/i}}
  • {{_i}}Now supports static position (default behavior, not fixed) and fixed to the top of viewport via .navbar-fixed-top (previously only supported fixed){{/i}}
    • +
  • {{_i}}Removed the .secondary-nav class; instead, just use .pull-right for right-aligned nav{{/i}}
  • {{_i}}Added vertical dividers to top-level nav{{/i}}
  • {{_i}}Improved support for inline forms in the navbar, which now require .navbar-form to properly scope styles to only the intended forms.{{/i}}
  • {{_i}}Navbar search form now requires use of the .navbar-search class and its input the use of .search-query. To position the search form, you must use .pull-left or .pull-right.{{/i}}
    • diff --git a/docs/upgrading.html b/docs/upgrading.html index 4d8328b7c..f3b18e4ed 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -195,6 +195,7 @@
    • Base class changed from .topbar to .navbar
    • Now supports static position (default behavior, not fixed) and fixed to the top of viewport via .navbar-fixed-top (previously only supported fixed)
      • +
    • Removed the .secondary-nav class; instead, just use .pull-right for right-aligned nav
    • Added vertical dividers to top-level nav
    • Improved support for inline forms in the navbar, which now require .navbar-form to properly scope styles to only the intended forms.
    • Navbar search form now requires use of the .navbar-search class and its input the use of .search-query. To position the search form, you must use .pull-left or .pull-right.
      • -- cgit v1.2.3 From 58fd0dea36173c8672fd77cf06df2ccfbeb4d068 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 1 Feb 2012 22:51:01 -0800 Subject: fixing some docs pages for i18n --- docs/assets/bootstrap.zip | Bin 56825 -> 56825 bytes docs/templates/pages/components.mustache | 10 +++++----- docs/templates/pages/index.mustache | 4 ++-- docs/templates/pages/javascript.mustache | 12 ++++++------ docs/templates/pages/less.mustache | 10 +++++----- docs/templates/pages/scaffolding.mustache | 4 ++-- docs/templates/pages/upgrading.mustache | 1 - docs/upgrading.html | 1 - 8 files changed, 20 insertions(+), 22 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index deab7e441..4647e747b 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index d7b3efcae..d8218ecc0 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -8,8 +8,8 @@
    • {{_i}}Buttons{{/i}}
    • @@ -752,17 +752,17 @@ <div class="navbar-inner"> <div class="container"> - <!-- .btn-navbar is used as the toggle for collapsed navbar content --> + <!-- {{_i}}.btn-navbar is used as the toggle for collapsed navbar content{{/i}} --> <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </a> - <!-- Be sure to leave the brand out there if you want it shown --> + <!-- {{_i}}Be sure to leave the brand out there if you want it shown{{/i}} --> <a class="brand" href="#">{{_i}}Project name{{/i}}</a> - <!-- Everything you want hidden at 940px or less, place within here --> + <!-- {{_i}}Everything you want hidden at 940px or less, place within here{{/i}} --> <div class="nav-collapse"> <!-- .nav, .navbar-search, .navbar-form, etc --> </div> diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index f7cadc081..2f3acc200 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -3,7 +3,7 @@

      {{_i}}Bootstrap, from Twitter{{/i}}

      -

      Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.

      +

      {{_i}}Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.{{/i}}

      {{_i}}View project on GitHub{{/i}} {{_i}}Download Bootstrap{{/i}} @@ -11,7 +11,7 @@

        -
      • Upgrading from 1.4
        • +
      • {{_i}}Upgrading from 1.4{{/i}}
      • {{_i}}Issues{{/i}}
      • {{_i}}Roadmap{{/i}}
      • {{_i}}Changelog{{/i}}
        • diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index aedd21f53..3233a9b76 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -947,17 +947,17 @@ $('#my-alert').bind('closed', function () {

        {{_i}}Markup{{/i}}

        {{_i}}Data attributes are integral to the button plugin. Check out the example code below for the various markup types.{{/i}}

        -<!-- Add data-toggle="button" to activate toggling on a single button -->
+<!-- {{_i}}Add data-toggle="button" to activate toggling on a single button{{/i}} -->
 <button class="btn" data-toggle="button">Single Toggle</button>
 
-<!-- Add data-toggle="buttons-checkbox" for checkbox style toggling on btn-group -->
+<!-- {{_i}}Add data-toggle="buttons-checkbox" for checkbox style toggling on btn-group{{/i}} -->
 <div class="btn-group" data-toggle="buttons-checkbox">
   <button class="btn">Left</button>
   <button class="btn">Middle</button>
   <button class="btn">Right</button>
 </div>
 
-<!-- Add data-toggle="buttons-radio" for radio style toggling on btn-group -->
+<!-- {{_i}}Add data-toggle="buttons-radio" for radio style toggling on btn-group{{/i}} -->
 <div class="btn-group" data-toggle="buttons-radio">
   <button class="btn">Left</button>
   <button class="btn">Middle</button>
@@ -1052,7 +1052,7 @@ $('#my-alert').bind('closed', function () {
 
           
        
           
        {{_i}}Using bootstrap-collapse.js{{/i}}
        
-          
        Enable via javascript:
        
+          
        {{_i}}Enable via javascript:{{/i}}
        
           
        $(".collapse").collapse()
        
           
        {{_i}}Options{{/i}}
        
           
@@ -1220,11 +1220,11 @@ $('#myCollapsible').on('hidden', function () {
           
        {{_i}}Data attributes are integral to the carousel plugin. Check out the example code below for the various markup types.{{/i}}
         <div class="carousel">
-  <!-- Carousel items -->
+  <!-- {{_i}}Carousel items{{/i}} -->
   <div class="carousel-inner">
     ...
   </div>
-  <!-- Carousel nav -->
+  <!-- {{_i}}Carousel nav{{/i}} -->
   <a class="carousel-control left" href="#myCarousel" data-slide="prev">&lsaquo;</a>
   <a class="carousel-control right" href="#myCarousel" data-slide="next">&rsaquo;</a>
 </div>
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index f69e43c20..eff8d3844 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -210,7 +210,7 @@
   
        {{_i}}Components{{/i}}
        
   
        
     
        
-      
        Buttons
        
+      
        {{_i}}Buttons{{/i}}
        
       
        
 
        
@@ -220,7 +220,7 @@
           
        
         
           
        
                 
       
        
-      
        Forms
        
+      
        {{_i}}Forms{{/i}}
        
       
@@ -230,7 +230,7 @@
           
        
         
           
        
                 
       
        
-      
        Navbar
        
+      
        {{_i}}Navbar{{/i}}
        
       
@@ -495,7 +495,7 @@
       
        
         
           
        
             
   
        
-  
        CSS3 properties
        
+  
        {{_i}}CSS3 properties{{/i}}
        
   
@@ -567,7 +567,7 @@
       
        
     
       
        
     
   
        
-  
        Backgrounds and gradients
        
+  
        {{_i}}Backgrounds and gradients{{/i}}
        
   
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index e20c52402..36df0973b 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -21,7 +21,7 @@
     
        {{_i}}Grid system 12 columns with a responsive twist{{/i}}
        
 
-  
        Default 940px grid
        
+  
        {{_i}}Default 940px grid{{/i}}
        
     
        1
        
     
        1
        
@@ -72,7 +72,7 @@
 
   
        
 
-  
        Offsetting columns
        
+  
        {{_i}}Offsetting columns{{/i}}
        
   
        
     
        4
        
     
        4 offset 4
        
diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
index 30b843e0d..02d1c7feb 100644
--- a/docs/templates/pages/upgrading.mustache
+++ b/docs/templates/pages/upgrading.mustache
@@ -119,7 +119,6 @@
   
          
     
        • {{_i}}Base class changed from .topbar to .navbar{{/i}}
          • 
     
        • {{_i}}Now supports static position (default behavior, not fixed) and fixed to the top of viewport via .navbar-fixed-top (previously only supported fixed){{/i}}
          • 
-    
        • {{_i}}Removed the .secondary-nav class; instead, just use .pull-right for right-aligned nav{{/i}}
          • 
     
        • {{_i}}Added vertical dividers to top-level nav{{/i}}
          • 
     
        • {{_i}}Improved support for inline forms in the navbar, which now require .navbar-form to properly scope styles to only the intended forms.{{/i}}
          • 
     
        • {{_i}}Navbar search form now requires use of the .navbar-search class and its input the use of .search-query. To position the search form, you must use .pull-left or .pull-right.{{/i}}
          • 
diff --git a/docs/upgrading.html b/docs/upgrading.html
index f3b18e4ed..4d8328b7c 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -195,7 +195,6 @@
   
            
     
          • Base class changed from .topbar to .navbar
            • 
     
          • Now supports static position (default behavior, not fixed) and fixed to the top of viewport via .navbar-fixed-top (previously only supported fixed)
            • 
-    
          • Removed the .secondary-nav class; instead, just use .pull-right for right-aligned nav
            • 
     
          • Added vertical dividers to top-level nav
            • 
     
          • Improved support for inline forms in the navbar, which now require .navbar-form to properly scope styles to only the intended forms.
            • 
     
          • Navbar search form now requires use of the .navbar-search class and its input the use of .search-query. To position the search form, you must use .pull-left or .pull-right.
            • 
-- 
cgit v1.2.3


From 25ffe14c1bf43539d12b459a3807d37d826d1246 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 1 Feb 2012 23:02:31 -0800
Subject: add line item to docs on upgrading per #1488

---
 docs/assets/bootstrap.zip               | Bin 52356 -> 52356 bytes
 docs/templates/pages/upgrading.mustache |   1 +
 docs/upgrading.html                     |   1 +
 3 files changed, 2 insertions(+)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index faef1d7ea..12aef2c01 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
index 02d1c7feb..5511e191b 100644
--- a/docs/templates/pages/upgrading.mustache
+++ b/docs/templates/pages/upgrading.mustache
@@ -128,6 +128,7 @@
   
              
     
            • {{_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}}Now requires you to add a data-toggle="dropdown" attribute to obtain toggling behavior{{/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}}
              • 
   
            
   
            {{_i}}Labels{{/i}}
            
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 4d8328b7c..7398952ba 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -204,6 +204,7 @@
   
              
     
            • Updated the .dropdown-menu to tighten up spacing
              • 
     
            • Now requires you to add a <span class="caret"></span> to show the dropdown arrow
              • 
+    
            • Now requires you to add a data-toggle="dropdown" attribute to obtain toggling behavior
              • 
     
            • 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.
              • 
   
            
   
            Labels
            
-- 
cgit v1.2.3


From 1ec6628e8005b17ecf16b194450874d8e988a45d Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 1 Feb 2012 23:10:00 -0800
Subject: add note for icon class usage per #1501

---
 docs/assets/bootstrap.zip              | Bin 52356 -> 52356 bytes
 docs/base-css.html                     |   4 ++++
 docs/templates/pages/base-css.mustache |   4 ++++
 3 files changed, 8 insertions(+)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 12aef2c01..c1b04c36b 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/base-css.html b/docs/base-css.html
index a198064f8..f6fcda10c 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1469,6 +1469,10 @@ For example, <code>section</code> should be wrapped as inline.
 <i class="icon-search icon-white"></i>
 
       
            There are 120 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.
            
+      
            
+        Heads up!
+        The .icon- class must be listed first in the class tag for proper CSS targeting.
+      
            
     
        
     
        
       
        Use cases
        
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 634809715..892442cee 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1393,6 +1393,10 @@
 <i class="icon-search icon-white"></i>
 
       
        {{_i}}There are 120 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.{{/i}}
        
+      
        
+        {{_i}}Heads up!{{/i}}
+        {{_i}}The .icon- class must be listed first in the class tag for proper CSS targeting.{{/i}}
+      
        
     
        
     
        
       
        {{_i}}Use cases{{/i}}
        
-- 
cgit v1.2.3


From 8dd2b3d3f8c84ac242469ae24fe7981b0a916b25 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 1 Feb 2012 23:10:37 -0800
Subject: follow up to #1501 to update notes in sprites.less

---
 docs/assets/bootstrap.zip | Bin 52356 -> 52356 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index c1b04c36b..b5e20a25e 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
-- 
cgit v1.2.3


From 99f395bcd7ad18ec1ef63b88516e98b294b5bc12 Mon Sep 17 00:00:00 2001
From: Kyle Robinson Young 
Date: Wed, 1 Feb 2012 23:30:37 -0800
Subject: Typo fixes

---
 docs/base-css.html                       | 4 ++--
 docs/components.html                     | 4 ++--
 docs/javascript.html                     | 6 +++---
 docs/less.html                           | 2 +-
 docs/templates/pages/base-css.mustache   | 4 ++--
 docs/templates/pages/components.mustache | 4 ++--
 docs/templates/pages/javascript.mustache | 6 +++---
 docs/templates/pages/less.mustache       | 2 +-
 docs/templates/pages/upgrading.mustache  | 2 +-
 docs/upgrading.html                      | 2 +-
 10 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'docs')

diff --git a/docs/base-css.html b/docs/base-css.html
index 5176c3ecf..efe55cbcf 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -530,7 +530,7 @@ For example, <code>section</code> should be wrapped as inline.
         
        
-        
+        
@@ -1446,7 +1446,7 @@ For example, <code>section</code> should be wrapped as inline.
     
        
-    Heads up! Icon classes are echoed via CSS :after. In the docs, we show a light red background color on hover to hightlight the icon's size.
+    Heads up! Icon classes are echoed via CSS :after. In the docs, we show a light red background color on hover to highlight the icon's size.
   

        
diff --git a/docs/components.html b/docs/components.html
index a71788eca..22708c170 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1021,7 +1021,7 @@
   
        
     
        
       
        About pager
        
-      
        The pager component is a set of links for simple pagination implemenations with light markup and even lighter styles. It's great for simple sites like blogs or magazines.
        
+      
        The pager component is a set of links for simple pagination implementations with light markup and even lighter styles. It's great for simple sites like blogs or magazines.
        
     
        
     
        
       
        Default example
        
@@ -1282,7 +1282,7 @@
   
        
     
        
       
        Rewritten base class
        
-      
        With Bootstrap 2, we've simplified the base class: .alert instead of .alert-message. We've also reduced the minimum required markup—no <p> is required by default, just the outter <div>.
        
+      
        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>.
        
       
        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 db6948392..65deacbd9 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -134,7 +134,7 @@
         
        
           
         
        
         
        
@@ -628,7 +628,7 @@ $('#myModal').on('hidden', function () {
   <li><a href="#home" data-toggle="tab">Home</a></li>
   <li><a href="#profile" data-toggle="tab">Profile</a></li>
   <li><a href="#messages" data-toggle="tab">Messages</a></li>
-  <li><a href="#ettings" data-toggle="tab">Settings</a></li>
+  <li><a href="#settings" data-toggle="tab">Settings</a></li>
 </ul>
           
        Methods
        
           
        $().tab
        
@@ -1145,7 +1145,7 @@ $('#my-alert').bind('closed', function () {
                
        
-               
+               
diff --git a/docs/less.html b/docs/less.html
index 739ebf2cd..7fd68123f 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -614,7 +614,7 @@
       
-        
+        
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 634809715..aff5ec089 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -454,7 +454,7 @@
         
-        
+        
@@ -1370,7 +1370,7 @@
     
        
-    {{_i}}Heads up! Icon classes are echoed via CSS :after. In the docs, we show a light red background color on hover to hightlight the icon's size.{{/i}}
+    {{_i}}Heads up! Icon classes are echoed via CSS :after. In the docs, we show a light red background color on hover to highlight the icon's size.{{/i}}
   

        
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index d7b3efcae..43aa5ad8f 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -945,7 +945,7 @@
   
        
     
        
       
        {{_i}}About pager{{/i}}
        
-      
        {{_i}}The pager component is a set of links for simple pagination implemenations with light markup and even lighter styles. It's great for simple sites like blogs or magazines.{{/i}}
        
+      
        {{_i}}The pager component is a set of links for simple pagination implementations with light markup and even lighter styles. It's great for simple sites like blogs or magazines.{{/i}}
        
     
        
     
        
       
        {{_i}}Default example{{/i}}
        
@@ -1206,7 +1206,7 @@
   
        
     
        
       
        {{_i}}Rewritten base class{{/i}}
        
-      
        {{_i}}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>.{{/i}}
        
+      
        {{_i}}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>.{{/i}}
        
       
        {{_i}}Single alert message{{/i}}
        
       
        {{_i}}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.{{/i}}
        
       
        
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index aedd21f53..961428dbf 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -58,7 +58,7 @@
         
        
           
         
        
         
        
@@ -552,7 +552,7 @@ $('#myModal').on('hidden', function () {
   <li><a href="#home" data-toggle="tab">{{_i}}Home{{/i}}</a></li>
   <li><a href="#profile" data-toggle="tab">{{_i}}Profile{{/i}}</a></li>
   <li><a href="#messages" data-toggle="tab">{{_i}}Messages{{/i}}</a></li>
-  <li><a href="#ettings" data-toggle="tab">{{_i}}Settings{{/i}}</a></li>
+  <li><a href="#settings" data-toggle="tab">{{_i}}Settings{{/i}}</a></li>
 </ul>
           
        {{_i}}Methods{{/i}}
        
           
        $().tab
        
@@ -1069,7 +1069,7 @@ $('#my-alert').bind('closed', function () {
                
        
-               
+               
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index f69e43c20..68e444566 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -538,7 +538,7 @@
       
-        
+        
diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
index 02d1c7feb..5c40e0798 100644
--- a/docs/templates/pages/upgrading.mustache
+++ b/docs/templates/pages/upgrading.mustache
@@ -144,7 +144,7 @@
   
          
     
        • {{_i}}New base class: .alert instead of .alert-message{{/i}}
          • 
     
        • {{_i}}Class names standardized for other options, now all starting with .alert-{{/i}}
          • 
-    
        • {{_i}}Redesigned base alert styles to combine the deafult alerts and block-level alerts into one{{/i}}
          • 
+    
        • {{_i}}Redesigned base alert styles to combine the default alerts and block-level alerts into one{{/i}}
          • 
     
        • {{_i}}Block level alert class changed: .alert-block instead of .block-message{{/i}}
          • 
   
        {{_i}}Progress bars{{/i}}
        
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 098bcbdc9..9ee5e3fbe 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -220,7 +220,7 @@
   
          
     
        • New base class: .alert instead of .alert-message
          • 
     
        • Class names standardized for other options, now all starting with .alert-
          • 
-    
        • Redesigned base alert styles to combine the deafult alerts and block-level alerts into one
          • 
+    
        • Redesigned base alert styles to combine the default alerts and block-level alerts into one
          • 
     
        • Block level alert class changed: .alert-block instead of .block-message
          • 
   
        Progress bars
        
-- 
cgit v1.2.3


From dfdc63e87293efec9196897079ce3826a1a57275 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 2 Feb 2012 09:31:07 -0800
Subject: fix incorrect use of 'caret'

---
 docs/assets/bootstrap.zip              | Bin 52356 -> 52356 bytes
 docs/base-css.html                     |   2 +-
 docs/templates/pages/base-css.mustache |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index b5e20a25e..a71011ad2 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/base-css.html b/docs/base-css.html
index f6fcda10c..38f851164 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -375,7 +375,7 @@ For example, <code>section</code> should be wrapped as inline.
     
     
        
       
        Basic block
        
-      
        Use <pre> for multiple lines of code. Be sure to turn any carets into their unicode characters for proper rendering.
        
+      
        Use <pre> for multiple lines of code. Be sure to turn any angle brackets into unicode characters for proper rendering.
        
 
         <p>Sample text here...</p>
 
        
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 892442cee..c1656ee6b 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -299,7 +299,7 @@
     
        
     
        
       
        Basic block
        
-      
        {{_i}}Use <pre> for multiple lines of code. Be sure to turn any carets into their unicode characters for proper rendering.{{/i}}
        
+      
        {{_i}}Use <pre> for multiple lines of code. Be sure to turn any angle brackets into unicode characters for proper rendering.{{/i}}
        
 
         <p>{{_i}}Sample text here...{{/i}}</p>
 
        
-- 
cgit v1.2.3


From cf488c2800293f4f243f59658b691741f4b78175 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 2 Feb 2012 09:33:18 -0800
Subject: fix incorrect uses of it's in the docs

---
 docs/assets/bootstrap.zip                | Bin 52356 -> 52356 bytes
 docs/base-css.html                       |   2 +-
 docs/javascript.html                     |   4 ++--
 docs/less.html                           |   4 ++--
 docs/templates/pages/base-css.mustache   |   2 +-
 docs/templates/pages/javascript.mustache |   4 ++--
 docs/templates/pages/less.mustache       |   4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index a71011ad2..f9690b608 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/base-css.html b/docs/base-css.html
index 38f851164..ac297c645 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1056,7 +1056,7 @@ For example, <code>section</code> should be wrapped as inline.
     
        
     
        
       
        Redesigned browser states
        
-      
        Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in it's place for :focus.
        
+      
        Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in its place for :focus.
        
       
        
       
        Form validation
        
       
        It also includes validation styles for errors, warnings, and success. To use, add the error class to the surrounding .control-group.
        
diff --git a/docs/javascript.html b/docs/javascript.html
index 92e327d19..4c432ee7c 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1042,7 +1042,7 @@ $('#my-alert').bind('closed', function () {
 
           
        Methods
        
           
        $().button('toggle')
        
-          
        Toggles push state. Gives btn the look that it's been activated.
        
+          
        Toggles push state. Gives btn the look that it hass been activated.
        
           
        
             Heads up!
             You can enable auto toggling of a button by using the data-toggle attribute.
@@ -1339,7 +1339,7 @@ $('.myCarousel').carousel({
              
        
-               
+               
        
     
       
        
   
   
           .table-bordered
         Rounds corners and adds outter borderRounds corners and adds outer border
       
        
       
        
         Zebra-stripe
   
   
 
   parent
                selector
                falseIf selector then all collapsible elements under the specified parent will be closed when this collasabile item is shown. (similar to traditional accordion behavior)If selector then all collapsible elements under the specified parent will be closed when this collapsible item is shown. (similar to traditional accordion behavior)
              
        
              
        
                toggle
        
         .background-clip()
         @clipCrop the backgroud of an element (useful for border-radius)Crop the background of an element (useful for border-radius)
       
        
       
        
         .background-size()
           .table-bordered
         {{_i}}Rounds corners and adds outter border{{/i}}{{_i}}Rounds corners and adds outer border{{/i}}
       
        
       
        
         {{_i}}Zebra-stripe{{/i}}
   
   
 
   {{_i}}parent{{/i}}
                {{_i}}selector{{/i}}
                false{{_i}}If selector then all collapsible elements under the specified parent will be closed when this collasabile item is shown. (similar to traditional accordion behavior){{/i}}{{_i}}If selector then all collapsible elements under the specified parent will be closed when this collapsible item is shown. (similar to traditional accordion behavior){{/i}}
              
        
              
        
                {{_i}}toggle{{/i}}
        
         .background-clip()
         @clip{{_i}}Crop the backgroud of an element (useful for border-radius){{/i}}{{_i}}Crop the background of an element (useful for border-radius){{/i}}
       
        
       
        
         .background-size()
   
   
        
              
        
                slidThis event is fired when the carousel has completed it's slide transition.This event is fired when the carousel has completed its slide transition.
              
        
             
           
        
diff --git a/docs/less.html b/docs/less.html
index bb033cfa3..181ae9b26 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -100,7 +100,7 @@
   
        
     
        
       
        Why LESS?
        
-      
        Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by our good friend, Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.
        
+      
        Bootstrap is made with LESS at its core, a dynamic stylesheet language created by our good friend, Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.
        
     
        
     
        
       
        What's included?
        
@@ -604,7 +604,7 @@
       
         .scale()
         @ratio
-        Scale an element to n times it's original size
+        Scale an element to n times its original size
       
       
         .translate()
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index c1656ee6b..420b00226 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -980,7 +980,7 @@
     
        
     
        
       
        {{_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}}
        
+      
        {{_i}}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.{{/i}}
        
       
        
       
        {{_i}}Form validation{{/i}}
        
       
        {{_i}}It also includes validation styles for errors, warnings, and success. To use, add the error class to the surrounding .control-group.{{/i}}
        
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 3233a9b76..b8b1f3da4 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -966,7 +966,7 @@ $('#my-alert').bind('closed', function () {

        {{_i}}Methods{{/i}}

        $().button('toggle')

        -

        {{_i}}Toggles push state. Gives btn the look that it's been activated.{{/i}}

        +

        {{_i}}Toggles push state. Gives btn the look that it hass been activated.{{/i}}

        {{_i}}Heads up!{{/i}} {{_i}}You can enable auto toggling of a button by using the data-toggle attribute.{{/i}} @@ -1263,7 +1263,7 @@ $('.myCarousel').carousel({ {{_i}}slid{{/i}} - {{_i}}This event is fired when the carousel has completed it's slide transition.{{/i}} + {{_i}}This event is fired when the carousel has completed its slide transition.{{/i}} diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index eff8d3844..3b04164d0 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -24,7 +24,7 @@

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

        -

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

        +

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

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

        @@ -528,7 +528,7 @@ .scale() @ratio - {{_i}}Scale an element to n times it's original size{{/i}} + {{_i}}Scale an element to n times its original size{{/i}} .translate() -- cgit v1.2.3 From bd0e95200390d773b4440d0b7e4cc46091300bbd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 2 Feb 2012 09:36:33 -0800 Subject: fix inverted warning text and bg colors in less docs page --- docs/assets/bootstrap.zip | Bin 52356 -> 52356 bytes docs/less.html | 8 ++++---- docs/templates/pages/less.mustache | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index f9690b608..9b35eae93 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/less.html b/docs/less.html index 181ae9b26..16d3d02de 100644 --- a/docs/less.html +++ b/docs/less.html @@ -348,13 +348,13 @@ @warningText - #f3edd2 - + #c09853 + @warningBackground - #c09853 - + #f3edd2 + @errorText diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 3b04164d0..0826a9e31 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -272,13 +272,13 @@ @warningText - #f3edd2 - + #c09853 + @warningBackground - #c09853 - + #f3edd2 + @errorText -- cgit v1.2.3 From e92e9f1138d8aa6a7ccc640ce3fb091bbf07acfd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 2 Feb 2012 09:46:14 -0800 Subject: add count to follow button, tweak links to fit on one line for 940px --- docs/assets/bootstrap.zip | Bin 52356 -> 52356 bytes docs/index.html | 9 ++++----- docs/templates/pages/index.mustache | 9 ++++----- 3 files changed, 8 insertions(+), 10 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 9b35eae93..12e0c76b2 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/index.html b/docs/index.html index dcf39a792..1c9c6e05f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -89,18 +89,17 @@
        • Upgrading from 1.4
        • Issues
          • -
        • Roadmap
          • -
        • Changelog
          • +
        • Roadmap & changelog
        • ·
        • - +
        • - +
        • ·
        • diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index 2f3acc200..4f0573cfd 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -13,18 +13,17 @@
          • {{_i}}Upgrading from 1.4{{/i}}
          • {{_i}}Issues{{/i}}
            • -
          • {{_i}}Roadmap{{/i}}
            • -
          • {{_i}}Changelog{{/i}}
            • +
          • {{_i}}Roadmap & changelog{{/i}}
          • ·
          • - +
          • - +
          • ·
          • -- cgit v1.2.3 From 9ab843b936a6bc9889f0f55a83f13cb25a3990bd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 2 Feb 2012 09:57:22 -0800 Subject: add mention of classes to use for button sizes --- docs/assets/bootstrap.zip | Bin 52356 -> 52356 bytes docs/base-css.html | 2 +- docs/templates/pages/base-css.mustache | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 12e0c76b2..b4d58a8ac 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/base-css.html b/docs/base-css.html index 8c504d814..3c9e9a187 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1262,7 +1262,7 @@ For example, <code>section</code> should be wrapped as inline.

            Multiple sizes

            -

            Fancy larger or smaller buttons? Have at it!

            +

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

            Primary action Action diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 27c9a96fd..5c0444d1a 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1186,7 +1186,7 @@

            {{_i}}Multiple sizes{{/i}}

            -

            {{_i}}Fancy larger or smaller buttons? Have at it!{{/i}}

            +

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

            {{_i}}Primary action{{/i}} {{_i}}Action{{/i}} -- cgit v1.2.3 From f922a0800b4ec46fe3aa1e31427308954e86940e Mon Sep 17 00:00:00 2001 From: Noah Blon Date: Fri, 3 Feb 2012 10:34:03 -0600 Subject: Fixes typo on download page Changed chose to choose spelling error on download template --- docs/templates/pages/download.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index f6d319d6a..fe38d1450 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -17,7 +17,7 @@

            {{_i}}Toggle all{{/i}}

            - {{_i}}1. Chose components{{/i}} + {{_i}}1. Choose components{{/i}} {{_i}}Get just the CSS you need{{/i}}

            -- cgit v1.2.3 From ac98cee6092738eb431ebd4c944886358dab721f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 18:26:04 -0800 Subject: allow alternate form layouts to hide inputs with .hide on them --- docs/assets/bootstrap.zip | Bin 52356 -> 52387 bytes docs/assets/css/bootstrap.css | 3 +++ docs/base-css.html | 2 +- docs/templates/pages/base-css.mustache | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index b4d58a8ac..b10376a63 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9de317af5..1ded1be23 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -940,6 +940,9 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec display: inline-block; margin-bottom: 0; } +.form-search .hide, .form-inline .hide, .form-horizontal .hide { + display: none; +} .form-search label, .form-inline label, .form-search .input-append, diff --git a/docs/base-css.html b/docs/base-css.html index 3c9e9a187..48f042417 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -886,7 +886,7 @@ For example, <code>section</code> should be wrapped as inline.

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

            -
            + diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 5c0444d1a..fd9a82f50 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -810,7 +810,7 @@

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

            - + -- cgit v1.2.3 From 9259e24f7370185b33520681000854d421ae1e1d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 18:27:05 -0800 Subject: fix cutoff follow button --- docs/assets/bootstrap.zip | Bin 52387 -> 52387 bytes docs/index.html | 2 +- docs/templates/pages/index.mustache | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index b10376a63..7f9ed29aa 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/index.html b/docs/index.html index 1c9c6e05f..51da2a55f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -99,7 +99,7 @@
          • ·
          • diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index 4f0573cfd..9fee412a5 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -23,7 +23,7 @@
          • ·
          • -- cgit v1.2.3 From 81d1f3b96ea5c78d2e570c07c4c419a32a9b212c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 18:52:25 -0800 Subject: remove max-width on dropdown menus --- docs/assets/bootstrap.zip | Bin 52387 -> 52381 bytes docs/assets/css/bootstrap.css | 1 - 2 files changed, 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 7f9ed29aa..ae23a7c98 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1ded1be23..7d28ab36d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1533,7 +1533,6 @@ table .span12 { float: left; display: none; min-width: 160px; - max-width: 220px; _width: 160px; padding: 4px 0; margin: 0; -- cgit v1.2.3 From 7e81f84b29da8ba87fb4aefcc11946002ad9962c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 22:22:19 -0800 Subject: buttons and icons updated for improved placement and variable support for icon paths --- docs/assets/bootstrap.zip | Bin 52381 -> 52391 bytes docs/assets/css/bootstrap.css | 9 +++++---- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index ae23a7c98..1ebcf34ce 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7d28ab36d..459e207b7 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1122,8 +1122,9 @@ table .span12 { display: inline-block; width: 14px; height: 14px; + line-height: 14px; vertical-align: text-top; - background-image: url(../img/glyphicons-halflings.png); + background-image: url("../img/glyphicons-halflings.png"); background-position: 14px 14px; background-repeat: no-repeat; *margin-right: .3em; @@ -1132,7 +1133,7 @@ table .span12 { *margin-left: 0; } .icon-white { - background-image: url(../img/glyphicons-halflings-white.png); + background-image: url("../img/glyphicons-halflings-white.png"); } .icon-glass { background-position: 0 0; @@ -1733,7 +1734,7 @@ table .span12 { -moz-border-radius: 5px; border-radius: 5px; } -.btn-large .icon { +.btn-large [class^="icon-"] { margin-top: 1px; } .btn-small { @@ -1741,7 +1742,7 @@ table .span12 { font-size: 11px; line-height: 16px; } -.btn-small .icon { +.btn-small [class^="icon-"] { margin-top: -1px; } .btn-primary, -- cgit v1.2.3 From 468688638d69e23141ec4abda074a36e888c12c7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 22:23:20 -0800 Subject: #1715: strip code of styles when in a pre --- docs/assets/bootstrap.zip | Bin 52391 -> 52410 bytes docs/assets/css/bootstrap.css | 2 ++ 2 files changed, 2 insertions(+) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 1ebcf34ce..3656b6fd3 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 459e207b7..d51e3d6f9 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -494,7 +494,9 @@ pre.prettyprint { } pre code { padding: 0; + color: inherit; background-color: transparent; + border: 0; } form { margin: 0 0 18px; -- cgit v1.2.3 From b297a61f82e567a5dccb99d1a01d46c5d8329e95 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 22:31:09 -0800 Subject: #1732: make examples of alerts in docs components page dismissable --- docs/assets/bootstrap.zip | Bin 52410 -> 52410 bytes docs/components.html | 14 +++++++------- docs/templates/pages/components.mustache | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 3656b6fd3..d4b01e1ad 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/components.html b/docs/components.html index bd2e437a5..1d3971c06 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1294,24 +1294,24 @@

            Example alerts

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

            - × + × Warning! Best check yo self, you're not looking too good. 
             <div class="alert">
-  <a class="close">×</a>
+  <a class="close data-dismiss="alert"gt;×</a>
   <strong>Warning!</strong> Best check yo self, you're not looking too good.
 </div>

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

            - × + ×

            Warning!

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

             <div class="alert alert-block">
-  <a class="close">×</a>
+  <a class="close" data-dismiss="alert">×</a>
   <h4 class="alert-heading">Warning!</h4>
   Best check yo self, you're not...
 </div>
@@ -1324,7 +1324,7 @@
     
            
       
            Error or danger
            
       
            
-        ×
+        ×
         Oh snap! Change a few things up and try submitting again.
       
            
 
            @@ -1336,7 +1336,7 @@
     
            
       
            Success
            
       
            
-        ×
+        ×
         Well done! You successfully read this important alert message.
       
            
 
            @@ -1348,7 +1348,7 @@
     
            
       
            Information
            
       
            
-        ×
+        ×
         Heads up! This alert needs your attention, but it's not super important.
       
            
 
            diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 1f726c35a..466a8a2e5 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1218,24 +1218,24 @@
       
            {{_i}}Example alerts{{/i}}
            
       
            {{_i}}Wrap your message and an optional close icon in a div with simple class.{{/i}}
            
       
            
-        ×
+        ×
         {{_i}}Warning!{{/i}} {{_i}}Best check yo self, you're not looking too good.{{/i}}
       
            
 
             <div class="alert">
-  <a class="close">×</a>
+  <a class="close data-dismiss="alert"gt;×</a>
   <strong>{{_i}}Warning!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}}
 </div>
 
            
       
            {{_i}}Easily extend the standard alert message with two optional classes: .alert-block for more padding and text controls and .alert-heading for a matching heading.{{/i}}
            
       
            
-        ×
+        ×
         
            {{_i}}Warning!{{/i}}
            
         
            {{_i}}Best check yo self, you're not looking too good.{{/i}} Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.
            
       
            
 
             <div class="alert alert-block">
-  <a class="close">×</a>
+  <a class="close" data-dismiss="alert">×</a>
   <h4 class="alert-heading">{{_i}}Warning!{{/i}}</h4>
   {{_i}}Best check yo self, you're not...{{/i}}
 </div>
@@ -1248,7 +1248,7 @@
     
            
       
            {{_i}}Error or danger{{/i}}
            
       
            
-        ×
+        ×
         {{_i}}Oh snap!{{/i}} {{_i}}Change a few things up and try submitting again.{{/i}}
       
            
 
            @@ -1260,7 +1260,7 @@
     
            
       
            {{_i}}Success{{/i}}
            
       
            
-        ×
+        ×
         {{_i}}Well done!{{/i}} {{_i}}You successfully read this important alert message.{{/i}}
       
            
 
            @@ -1272,7 +1272,7 @@
     
            
       
            {{_i}}Information{{/i}}
            
       
            
-        ×
+        ×
         {{_i}}Heads up!{{/i}} {{_i}}This alert needs your attention, but it's not super important.{{/i}}
       
            
 
            -- 
cgit v1.2.3


From 6d8ac203e5b07a116336e172e9e1ebdb9ad76c33 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 4 Feb 2012 22:32:04 -0800
Subject: fix broken alert example with data-dismiss

---
 docs/assets/bootstrap.zip                | Bin 52410 -> 52410 bytes
 docs/components.html                     |   2 +-
 docs/templates/pages/components.mustache |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index d4b01e1ad..7295b9caa 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/components.html b/docs/components.html
index 1d3971c06..f96134040 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1299,7 +1299,7 @@
       
            
 
             <div class="alert">
-  <a class="close data-dismiss="alert"gt;×</a>
+  <a class="close" data-dismiss="alert">×</a>
   <strong>Warning!</strong> Best check yo self, you're not looking too good.
 </div>
 
            
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 466a8a2e5..1bf6b11d4 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1223,7 +1223,7 @@
       
            
 
             <div class="alert">
-  <a class="close data-dismiss="alert"gt;×</a>
+  <a class="close" data-dismiss="alert">×</a>
   <strong>{{_i}}Warning!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}}
 </div>
 
            
-- 
cgit v1.2.3


From 679cd5ea02ca83d9c3755d6ac74f4a0bacd02897 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 4 Feb 2012 22:38:49 -0800
Subject: #1706: protocol independent html5shim added, and moved after the CSS
 for loading time's sake

---
 docs/assets/bootstrap.zip      | Bin 52410 -> 52410 bytes
 docs/base-css.html             |  10 +++++-----
 docs/components.html           |  10 +++++-----
 docs/download.html             |  10 +++++-----
 docs/examples.html             |  10 +++++-----
 docs/index.html                |  10 +++++-----
 docs/javascript.html           |  10 +++++-----
 docs/less.html                 |  10 +++++-----
 docs/scaffolding.html          |  10 +++++-----
 docs/templates/layout.mustache |  10 +++++-----
 docs/upgrading.html            |  10 +++++-----
 11 files changed, 50 insertions(+), 50 deletions(-)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 7295b9caa..842661748 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/base-css.html b/docs/base-css.html
index 48f042417..1e9f6e8c4 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/components.html b/docs/components.html
index f96134040..f0559e5fa 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/download.html b/docs/download.html
index 1765b8a7d..8442dcad1 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/examples.html b/docs/examples.html
index 42faf93c0..aabd65b46 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/index.html b/docs/index.html
index 51da2a55f..180a1211b 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/javascript.html b/docs/javascript.html
index 8d44fa03d..7ffb96cff 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/less.html b/docs/less.html
index 0eb5211d3..92b9099f5 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 25c394458..9819846a8 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 5f49bb62a..a885b25be 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 456afe6a5..ad3236f2b 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
-- 
cgit v1.2.3


From 87a8c9b677bff0d831f920922c86d5b0cff9949c Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 4 Feb 2012 22:40:50 -0800
Subject: #1707: remove rgba() background override on navbar active items for
 customization

---
 docs/assets/bootstrap.zip     | Bin 52410 -> 52391 bytes
 docs/assets/css/bootstrap.css |   1 -
 2 files changed, 1 deletion(-)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 842661748..feedf5997 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index d51e3d6f9..6bbed834b 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2550,7 +2550,6 @@ button.btn.small, input[type="submit"].btn.small {
   color: #ffffff;
   text-decoration: none;
   background-color: #222222;
-  background-color: rgba(0, 0, 0, 0.5);
 }
 .navbar .divider-vertical {
   height: 40px;
-- 
cgit v1.2.3


From 418bf5221a70440aeecffe9ad9006b444aaf1747 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 4 Feb 2012 22:50:26 -0800
Subject: #1712: fix typo in js docs

---
 docs/assets/bootstrap.zip                | Bin 52391 -> 52391 bytes
 docs/javascript.html                     |   2 +-
 docs/templates/pages/javascript.mustache |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index feedf5997..3f20466dc 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/javascript.html b/docs/javascript.html
index 7ffb96cff..5d505eb4f 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1422,7 +1422,7 @@ $('.myCarousel').carousel({
 
            
           
            Methods
            
           
            .typeahead(options)
            
-          
            Initializes an input with a typahead.
            
+          
            Initializes an input with a typeahead.
            
         
            
       
            
     
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 29632a090..67bc83a1c 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -1346,7 +1346,7 @@ $('.myCarousel').carousel({
 
            
           
            {{_i}}Methods{{/i}}
            
           
            .typeahead({{_i}}options{{/i}})
            
-          
            {{_i}}Initializes an input with a typahead.{{/i}}
            
+          
            {{_i}}Initializes an input with a typeahead.{{/i}}
            
         
            
       
            
     
\ No newline at end of file
-- 
cgit v1.2.3


From 35fdddbc4fdd134953ce2b1e4a88047850aa47a0 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 4 Feb 2012 22:55:47 -0800
Subject: correct css selector for .control-label, required in the docs but not
 in the CSS files

---
 docs/assets/bootstrap.zip     | Bin 52391 -> 52391 bytes
 docs/assets/css/bootstrap.css |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 3f20466dc..f35f984ce 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 6bbed834b..f954835b2 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -977,7 +977,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
 .form-horizontal .control-group:after {
   clear: both;
 }
-.form-horizontal .control-group > label {
+.form-horizontal .control-label {
   float: left;
   width: 140px;
   padding-top: 5px;
-- 
cgit v1.2.3


From 93fea1f1cf7902261a3743acadd9bb2a196e2190 Mon Sep 17 00:00:00 2001
From: Chris Rebert 
Date: Sat, 4 Feb 2012 23:21:56 -0800
Subject: The < and > escapes have nothing to do with Unicode.

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

(limited to 'docs')

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

        Basic block

        -

        Use <pre> for multiple lines of code. Be sure to turn any angle brackets into unicode characters for proper rendering.

        +

        Use <pre> for multiple lines of code. Be sure to escape any angle brackets in the code for proper rendering.

         <p>Sample text here...</p>
        -- cgit v1.2.3 From a2848ebb0000f3dbe9ba29ec91713bef072b1668 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 23:53:24 -0800 Subject: fix meta tag for viewport in examples and shims --- docs/examples/fluid.html | 11 ++++++----- docs/examples/hero.html | 11 ++++++----- docs/examples/starter-template.html | 11 ++++++----- 3 files changed, 18 insertions(+), 15 deletions(-) (limited to 'docs') diff --git a/docs/examples/fluid.html b/docs/examples/fluid.html index 7fe5df151..3c7059f9d 100644 --- a/docs/examples/fluid.html +++ b/docs/examples/fluid.html @@ -3,14 +3,10 @@ Bootstrap, from Twitter + - - - + + + diff --git a/docs/examples/hero.html b/docs/examples/hero.html index 7d60d1a48..ee64646f3 100644 --- a/docs/examples/hero.html +++ b/docs/examples/hero.html @@ -3,14 +3,10 @@ Bootstrap, from Twitter + - - - + + + diff --git a/docs/examples/starter-template.html b/docs/examples/starter-template.html index c8b2a09cf..31cc57cf8 100644 --- a/docs/examples/starter-template.html +++ b/docs/examples/starter-template.html @@ -3,14 +3,10 @@ Bootstrap, from Twitter + - - - + + + -- cgit v1.2.3 From 125368d4db04fa5b2300975ed2ba59983309ee0f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 23:57:15 -0800 Subject: update docs with call on meta tag for responsive --- docs/assets/bootstrap.zip | Bin 52391 -> 52391 bytes docs/scaffolding.html | 4 ++++ docs/templates/pages/scaffolding.mustache | 4 ++++ 3 files changed, 8 insertions(+) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index f35f984ce..99ff15c06 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 9819846a8..b8dc42664 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -357,6 +357,10 @@ +

        Requires meta tag

        +

        To ensure devices display responsive pages properly, include the viewport meta tag.

        + 
        <meta name="viewport" content="width=device-width, initial-scale=1.0">
        +

        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.

          diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index ba2076f31..c81f2e535 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -281,6 +281,10 @@ +

          {{_i}}Requires meta tag{{/i}}

          +

          {{_i}}To ensure devices display responsive pages properly, include the viewport meta tag.{{/i}}

          + 
          <meta name="viewport" content="width=device-width, initial-scale=1.0">
          +

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

            -- cgit v1.2.3 From 31abeec0f2d84b3861d0c80c56c3112546bf0bfd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 00:05:01 -0800 Subject: manually handle #1703 for note on horizontal forms --- docs/assets/bootstrap.zip | Bin 52391 -> 52391 bytes docs/templates/pages/upgrading.mustache | 1 + docs/upgrading.html | 1 + 3 files changed, 2 insertions(+) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 99ff15c06..d43ca5f9a 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache index d92cc04dd..56b0d4bf7 100644 --- a/docs/templates/pages/upgrading.mustache +++ b/docs/templates/pages/upgrading.mustache @@ -82,6 +82,7 @@
          • {{_i}}Default form style is now vertical (stacked) to use less CSS and add greater flexibility{{/i}}
          • {{_i}}Form classes standardized with .form- required as a prefix{{/i}}
          • {{_i}}New built-in form defaults for search, inline, and horizontal forms{{/i}}
            • +
          • {{_i}}For horizontal forms, previous classes .clearfix and .input are equivalent to the new .control-group and .controls.{{/i}}
          • {{_i}}More flexible horizontal form markup with classes for all styling, including new optional class for the label{{/i}}
          • {{_i}}Form states: colors updated and customizable via new LESS variables{{/i}}
          diff --git a/docs/upgrading.html b/docs/upgrading.html index ad3236f2b..5a7b0d2f6 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -158,6 +158,7 @@
        • Default form style is now vertical (stacked) to use less CSS and add greater flexibility
        • Form classes standardized with .form- required as a prefix
        • New built-in form defaults for search, inline, and horizontal forms
          • +
        • For horizontal forms, previous classes .clearfix and .input are equivalent to the new .control-group and .controls.
        • More flexible horizontal form markup with classes for all styling, including new optional class for the label
        • Form states: colors updated and customizable via new LESS variables
        -- cgit v1.2.3 From cdb1ad1a52a9f55c63003b7b62ef8b1e9c6fcfaf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 00:11:21 -0800 Subject: #1702: add callout to navbar for component alignment --- docs/assets/bootstrap.zip | Bin 52391 -> 52391 bytes docs/components.html | 2 ++ docs/templates/pages/components.mustache | 2 ++ 3 files changed, 4 insertions(+) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index d43ca5f9a..3c655b03a 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/components.html b/docs/components.html index f0559e5fa..1c5bc5abe 100644 --- a/docs/components.html +++ b/docs/components.html @@ -864,6 +864,8 @@ <li><a href="#">Link</a></li> </ul> +

        Component alignment

        +

        To align a nav, search form, or text, use the .pull-left or .pull-right utility classes. Both classes will add a CSS float in the specified direction.

        Adding dropdowns

        Adding dropdowns to the nav is super simple, but does require the use of our javascript plugin.

        diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 1bf6b11d4..1f466aa5d 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -788,6 +788,8 @@
   <li><a href="#">{{_i}}Link{{/i}}</a></li>
 </ul>
        +

        {{_i}}Component alignment{{/i}}

        +

        {{_i}}To align a nav, search form, or text, use the .pull-left or .pull-right utility classes. Both classes will add a CSS float in the specified direction.{{/i}}

        {{_i}}Adding dropdowns{{/i}}

        {{_i}}Adding dropdowns to the nav is super simple, but does require the use of our javascript plugin.{{/i}}

        -- 
cgit v1.2.3


From f29e3263b04fd2ecbd42e864e03abc15439b4a1b Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 5 Feb 2012 00:16:25 -0800
Subject: follow up to #1702, add callout on component alignment in tabs/pills

---
 docs/assets/bootstrap.zip                | Bin 52391 -> 52391 bytes
 docs/components.html                     |   7 ++++---
 docs/templates/pages/components.mustache |   7 ++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 3c655b03a..d3f2da9ad 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/components.html b/docs/components.html
index 1c5bc5abe..06ca2560c 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -354,9 +354,10 @@
     
        
       
        Powerful base class
        
       
        All nav components here—tabs, pills, and lists—share the same base markup and styles through the .nav class.
        
-      
        Why tabs and pills
        
-      
        Tabs and pills in Bootstrap are built on a <ul> with the same core HTML, a list of links. Swap between tabs or pills with only a class.
        
-      
        Both options are great for sub-sections of content or navigating between pages of related content.
        
+      
        When to use
        
+      
        Tabs and pills are great for sections of content or navigating between pages of related content.
        
+      
        Component alignment
        
+      
        To align nav links, use the .pull-left or .pull-right utility classes. Both classes will add a CSS float in the specified direction.
        
     
        
     
        
       
        Basic tabs
        
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 1f466aa5d..0a7affafe 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -278,9 +278,10 @@
     
        
       
        {{_i}}Powerful base class{{/i}}
        
       
        {{_i}}All nav components here—tabs, pills, and lists—share the same base markup and styles through the .nav class.{{/i}}
        
-      
        {{_i}}Why tabs and pills{{/i}}
        
-      
        {{_i}}Tabs and pills in Bootstrap are built on a <ul> with the same core HTML, a list of links. Swap between tabs or pills with only a class.{{/i}}
        
-      
        {{_i}}Both options are great for sub-sections of content or navigating between pages of related content.{{/i}}
        
+      
        {{_i}}When to use{{/i}}
        
+      
        {{_i}}Tabs and pills are great for sections of content or navigating between pages of related content.{{/i}}
        
+      
        {{_i}}Component alignment{{/i}}
        
+      
        {{_i}}To align nav links, use the .pull-left or .pull-right utility classes. Both classes will add a CSS float in the specified direction.{{/i}}
        
     
        
     
        
       
        {{_i}}Basic tabs{{/i}}
        
-- 
cgit v1.2.3


From dfcb2d1ed83e2c1bc76b4646ba28dccae4205d08 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 5 Feb 2012 00:25:40 -0800
Subject: #1697: update upgrading docs to include mention of no more secondary
 class in modals

---
 docs/assets/bootstrap.zip               | Bin 52391 -> 52391 bytes
 docs/templates/pages/upgrading.mustache |   1 +
 docs/upgrading.html                     |   1 +
 3 files changed, 2 insertions(+)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index d3f2da9ad..5e37b7d983 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
index 56b0d4bf7..23a53da0e 100644
--- a/docs/templates/pages/upgrading.mustache
+++ b/docs/templates/pages/upgrading.mustache
@@ -76,6 +76,7 @@
     
      • {{_i}}IE9: removed gradients and added rounded corners{{/i}}
        • 
     
      • {{_i}}Updated active state to make styling clearer in button groups (new) and look better with custom transition{{/i}}
        • 
     
      • {{_i}}New mixin, .buttonBackground, to set button gradients{{/i}}
        • 
+    
      • {{_i}}The .secondary class was removed from modal examples in our docs as it never had associated styles.{{/i}}
        •

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

        diff --git a/docs/upgrading.html b/docs/upgrading.html index 5a7b0d2f6..39da8e1f7 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -152,6 +152,7 @@
      • IE9: removed gradients and added rounded corners
      • Updated active state to make styling clearer in button groups (new) and look better with custom transition
      • New mixin, .buttonBackground, to set button gradients
        • +
      • The .secondary class was removed from modal examples in our docs as it never had associated styles.

      Forms

        -- cgit v1.2.3 From 0336f1e644b2b2e76bf797aab6d26644c41de897 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 00:27:08 -0800 Subject: #1695: manually fix broken primary button instances --- docs/assets/bootstrap.zip | Bin 52391 -> 52391 bytes docs/components.html | 4 ++-- docs/templates/pages/components.mustache | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 5e37b7d983..2c140266b 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/components.html b/docs/components.html index 06ca2560c..67fe16f13 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1171,7 +1171,7 @@
        Thumbnail label

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

        -

        Action Action

        +

        Action Action

@@ -1181,7 +1181,7 @@
Thumbnail label

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

-

Action Action

+

Action Action

diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 0a7affafe..6be6cd601 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -1095,7 +1095,7 @@
{{_i}}Thumbnail label{{/i}}

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

-

{{_i}}Action{{/i}} {{_i}}Action{{/i}}

+

{{_i}}Action{{/i}} {{_i}}Action{{/i}}

@@ -1105,7 +1105,7 @@
{{_i}}Thumbnail label{{/i}}

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

-

{{_i}}Action{{/i}} {{_i}}Action{{/i}}

+

{{_i}}Action{{/i}} {{_i}}Action{{/i}}

-- cgit v1.2.3 From 6661639b37a6e577c4795e4394a0f0b6b75f4a01 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 00:29:19 -0800 Subject: #1693: manual fix of the pull request to add class name changes to pills/tabs to upgrade guide --- docs/assets/bootstrap.zip | Bin 52391 -> 52391 bytes docs/templates/pages/upgrading.mustache | 2 +- docs/upgrading.html | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 2c140266b..0a56f52fd 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache index 23a53da0e..45ab0703b 100644 --- a/docs/templates/pages/upgrading.mustache +++ b/docs/templates/pages/upgrading.mustache @@ -111,7 +111,7 @@

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

Navigation