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/components.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/components.html') 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.

-- 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/components.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'docs/components.html') 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.
       

 
-- 
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/components.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/components.html')

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>
 

-- 
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/components.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'docs/components.html')

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 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
-- 
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/components.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'docs/components.html')

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.

 
-- 
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/components.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'docs/components.html')

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

-- 
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/components.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/components.html')

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

             

           

         
-- 
cgit v1.2.3


From d92523f3299c751d77ea43893fa39bbb687a5f80 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 5 Feb 2012 01:57:09 -0800
Subject: fix for #1658 to give .label-success proper text

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

(limited to 'docs/components.html')

diff --git a/docs/components.html b/docs/components.html
index 67fe16f13..2a31528ea 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1094,7 +1094,7 @@
           Success
         
         
-          <span class="label label-success">New</span>
+          <span class="label label-success">Success</span>
         
       
       
-- 
cgit v1.2.3


From c720d951be4481dab684955b7ef1a4ebb03ed0cf Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 10 Feb 2012 23:50:45 -0800
Subject: add best practices and re-org the button groups

---
 docs/components.html | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

(limited to 'docs/components.html')

diff --git a/docs/components.html b/docs/components.html
index 2a31528ea..cb41c736e 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -118,14 +118,34 @@
     

       
Button groups

       
Use button groups to join multiple buttons together as one composite component. Build them with a series of <a> or <button> elements.

-      
You can also combine sets of <div class="btn-group"> into a <div class="btn-toolbar"> for more complex projects.

-      

-        

+      
Best practices

+      
We recommend the following guidelines for using button groups and toolbars:

+      
    
+        
  • Always use the same element in a single button group, <a> or <button>.
    • 
+        
  • Don't mix buttons of different colors in the same button group.
    • 
+        
  • Use icons in addition to or instead of text, but be sure include alt and title text where appropriate.
    • 
+      

+      
Related Button groups with dropdowns (see below) should be called out separately and always include a dropdown caret to indicate intended behavior.

+    

+    

+      
Default example

+      
Here's how the HTML looks for a standard button group built with anchor tag buttons:

+      
+
+<div class="btn-group">
+  <a class="btn" href="#">1</a>
+  <a class="btn" href="#">2</a>
+  <a class="btn" href="#">3</a>
+</div>
+

+      
Toolbar example

+      
Combine sets of <div class="btn-group"> into a <div class="btn-toolbar"> for more complex components.

       

         

           1
@@ -142,18 +162,6 @@
           8
         

       

-    

-    

-      
Example markup

-      
Here's how the HTML looks for a standard button group built with anchor tag buttons:

-
-<div class="btn-group">
-  <a class="btn" href="#">1</a>
-  <a class="btn" href="#">2</a>
-  <a class="btn" href="#">3</a>
-</div>
-

-      
And with a toolbar for multiple groups:

 
 <div class="btn-toolbar">
   <div class="btn-group">
-- 
cgit v1.2.3


From a72ef967ba7e4870fb1d737dedf8bf8a10ae6587 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 11:08:33 -0800
Subject: re-add protocol to the shim

---
 docs/components.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'docs/components.html')

diff --git a/docs/components.html b/docs/components.html
index cb41c736e..a028c65ed 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -7,17 +7,17 @@
     
     
 
+    
+    
+
     
     
     
     
     
 
-    
-    
-
     
     
     
-- 
cgit v1.2.3


From c02df9390330b3fa6b9c7cd0b4390093c163fae9 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 11:08:58 -0800
Subject: move shim after css

---
 docs/components.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'docs/components.html')

diff --git a/docs/components.html b/docs/components.html
index a028c65ed..2af9df756 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
-- 
cgit v1.2.3


From 0ff88f2db3b9fa4604886494a711d74652a2fb4f Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 14:09:13 -0800
Subject: enable the use of .nav-header in dropdowns per #1827

---
 docs/components.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'docs/components.html')

diff --git a/docs/components.html b/docs/components.html
index 2af9df756..37f1a6511 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -771,7 +771,9 @@
                 
  • Another action
    • 
                 
  • Something else here
    • 
                 
  • 
+                
  • Nav header
    • 
                 
  • Separated link
    • 
+                
  • One more separated link
    • 
               
             
           
-- 
cgit v1.2.3


From 1b32e982ade1fc5275a851b711b45f6a0ed21b0c Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 14:47:09 -0800
Subject: add hero-unit docs per #1880

---
 docs/components.html | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'docs/components.html')

diff --git a/docs/components.html b/docs/components.html
index 37f1a6511..10725024b 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -98,6 +98,7 @@
         
       
       
  • Labels
    • 
+      
  • Hero
    • 
       
  • Thumbnails
    • 
       
  • Alerts
    • 
       
  • Progress bars
    • 
@@ -1137,6 +1138,42 @@
 
 
 
+
+
    
+  
    
+    
    Hero unit Jumbotron for your site's tagline
    
+  
    
+  
    
+    
    
+      
    About
    
+      
    Bootstrap provides a lightweight, flexible component called a hero unit to showcase content on your site. It works well on marketing and content-heavy sites.
    
+      
    Markup
    
+      
    Wrap your content in a div like so:
    
+
    +<div class="hero-unit">
+  <h1>Heading</h1>
+  <p>Tagline</p>
+  <p>
+    <a class="btn btn-primary btn-large">
+      Learn more
+    </a>
+  </p>
+</div>
+
    
+    
    
+    
    
+      
    
+        
    Hello, world!
    
+        
    This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.
    
+        
    Learn more
    
+      
    
+    
    
+  
    
+
    
+
+
+
 
 
    
-- 
cgit v1.2.3


From ac9ac4ddae7fc9f9c030d8ade789ec65d9a2ec05 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 15:49:04 -0800
Subject: add note to button dropdowns about js plugin dependency per #1746

---
 docs/components.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'docs/components.html')

diff --git a/docs/components.html b/docs/components.html
index 10725024b..8cd2e58d8 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -248,7 +248,9 @@
             
  • Separated link
    • 
           
         
    
-      
    
+      
    
+      
    
+      
    Heads up! Button dropdowns require the Bootstrap dropdown plugin to function.
    
     
    
     
    
       
    Example markup
    
-- 
cgit v1.2.3


From 81d101a6a7195f8575296b19fbf4d36dd145a602 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 19:50:36 -0800
Subject: update docs on fixed nav per #1726

---
 docs/components.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'docs/components.html')

diff --git a/docs/components.html b/docs/components.html
index 8cd2e58d8..ac87f74b5 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -815,12 +815,14 @@
   </div>
 </div>
    -

    To make the navbar fixed to the top of the viewport, add .navbar-fixed-top to the outermost div, .navbar. In your CSS, you will also need to account for the overlap it causes by adding padding-top: 40px; to your <body>.

    +

    Fixed navbar

    +

    To make the navbar fixed to the top of the viewport, add .navbar-fixed-top to the outermost div, .navbar.

     <div class="navbar navbar-fixed-top">
   ...
 </div>
    +

    In your CSS, you will also need to account for the overlap it causes by adding 40px or more of padding to your <body>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.

    Brand name

    A simple link to show your brand or project name only requires an anchor tag.

    -- 
cgit v1.2.3


From 4d1f1f0fc7117b9edae1c1b1c0c2c899ffcd72e3 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 20:07:25 -0800
Subject: add typography pattern .page-header to components per #1701

---
 docs/components.html | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

(limited to 'docs/components.html')

diff --git a/docs/components.html b/docs/components.html
index ac87f74b5..d0b5de632 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -98,7 +98,7 @@
         
       
       
  • Labels
    • 
-      
  • Hero
    • 
+      
  • Typography
    • 
       
  • Thumbnails
    • 
       
  • Alerts
    • 
       
  • Progress bars
    • 
@@ -1142,15 +1142,15 @@
 
 
 
-
-
    
+
    
   
    
-    
    Hero unit Jumbotron for your site's tagline
    
+    
    Typographic components Page header and hero unit for segmenting content
    
   
    
+  
    Hero unit
    
   
    
     
    
-      
    About
    
       
    Bootstrap provides a lightweight, flexible component called a hero unit to showcase content on your site. It works well on marketing and content-heavy sites.
    
       
    Markup
    
       
    Wrap your content in a div like so:
    
@@ -1173,7 +1173,20 @@
         
    Learn more
    
       
    
     
    
-
    +
    +

    Page header

    +
    +
    +

    A simple shell for an h1 to appropratiely space out and segment sections of content on a page. It can utilize the h1's default small, element as well most other components (with additional styles).

    +
    +
    +
    +<div class="page-haeder">
+  <h1>Example page header</h1>
+</div>
+
    +
    +
    -- cgit v1.2.3 From 1520ec446ce9fc748efa3390a58c447841c48e73 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 16 Feb 2012 20:30:18 -0800 Subject: rebuild bro --- docs/components.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index d0b5de632..af00ece97 100644 --- a/docs/components.html +++ b/docs/components.html @@ -843,14 +843,14 @@ <div class="navbar"> <div class="navbar-inner"> <div class="container"> - + <!-- .btn-navbar is used as the toggle for collapsed navbar content --> <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 --> <a class="brand" href="#">Project name</a> @@ -883,7 +883,7 @@

    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.

    +

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

     <ul class="nav">
   <li class="dropdown">
@@ -899,7 +899,7 @@
   </li>
 </ul>
    -

    Get the javascript →

    +

    Get the javascript →

    -- cgit v1.2.3 From 0369c1fcfc22530171fdf6a1d6400767dc13f609 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Feb 2012 21:04:16 -0800 Subject: add mention of navbar vertical divider in docs --- docs/components.html | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index af00ece97..cf11e6998 100644 --- a/docs/components.html +++ b/docs/components.html @@ -879,6 +879,14 @@ <li><a href="#">Link</a></li> <li><a href="#">Link</a></li> </ul> + +

    You can easily add dividers to your nav links with an empty list item and a simple class. Just add this between links:

    +
    +<ul class="nav">
+  ...
+  <li class="divider-vertical"></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.

    -- cgit v1.2.3