From f12946be5a8e8529f64606ca73fe06e48f9fd583 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 25 Sep 2012 22:40:48 -0700 Subject: thumbnails cleanup: no more UL or LI elements needed, instead just use standard grid markup --- docs/components.html | 119 ++++++++++++++++----------------------------------- 1 file changed, 38 insertions(+), 81 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index ea0e12272..6422c1611 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1884,38 +1884,48 @@

Thumbnails Grids of images, videos, text, and more

-

Default thumbnails

+

Default thumbnails

By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.

-
-
+
- -
  • +
  • +
    - -
  • +
  • +
    - - +
    + +
    +<div class="row">
    +  <div class="span3">
    +    <a href="#" class="thumbnail">
    +      <img src="http://placehold.it/260x180" alt="">
    +    </a>
    +  </div>
    +  ...
    +</div>
    +
    -

    Highly customizable

    +

    Custom content thumbnails

    With a bit of extra markup, it's possible to add any kind of HTML content like headings, paragraphs, or buttons into thumbnails.

    -
    -
    +
    @@ -1934,8 +1944,8 @@

    Action Action

    - -
  • +
  • +
    @@ -1944,75 +1954,22 @@

    Action Action

    - - +
    + - -

    Why use thumbnails

    -

    Thumbnails (previously .media-grid up until v1.4) are great for grids of photos or videos, image search results, retail products, portfolios, and much more. They can be links or static content.

    - -

    Simple, flexible markup

    -

    Thumbnail markup is simple—a ul with any number of li elements is all that is required. It's also super flexible, allowing for any type of content with just a bit more markup to wrap your contents.

    - -

    Uses grid column sizes

    -

    Lastly, the thumbnails component uses existing grid system classes—like .span2 or .span3—for control of thumbnail dimensions.

    - -

    Markup

    -

    As mentioned previously, the required markup for thumbnails is light and straightforward. Here's a look at the default setup for linked images:

    -<ul class="thumbnails">
    -  <li class="span4">
    -    <a href="#" class="thumbnail">
    -      <img src="http://placehold.it/300x200" alt="">
    -    </a>
    -  </li>
    -  ...
    -</ul>
    -
    -

    For custom HTML content in thumbnails, the markup changes slightly. To allow block level content anywhere, we swap the <a> for a <div> like so:

    -
    -<ul class="thumbnails">
    -  <li class="span4">
    +<div class="row">
    +  <div class="span4">
         <div class="thumbnail">
           <img src="http://placehold.it/300x200" alt="">
           <h3>Thumbnail label</h3>
           <p>Thumbnail caption...</p>
         </div>
    -  </li>
    +  </div>
       ...
    -</ul>
    +</div>
     
    -

    More examples

    -

    Explore all your options with the various grid classes available to you. You can also mix and match different sizes.

    - - @@ -2144,7 +2101,7 @@

    Striped

    -

    Uses a gradient to create a striped effect. Not available in IE7-8.

    +

    Uses a gradient to create a striped effect. Not available in IE8.

    @@ -2259,7 +2216,7 @@

    Browser support

    -

    Progress bars use CSS3 gradients, transitions, and animations to achieve all their effects. These features are not supported in IE7-9 or older versions of Firefox.

    +

    Progress bars use CSS3 gradients, transitions, and animations to achieve all their effects. These features are not supported in IE8-9 or older versions of Firefox.

    Versions earlier than Internet Explorer 10 and Opera 12 do not support animations.

    -- cgit v1.2.3 From c59e5251e12a57b5f305b4996d6f164b71c7f22c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 25 Sep 2012 22:48:02 -0700 Subject: initial pass at removing navbar-inner from .navbar component --- docs/components.html | 382 ++++++++++++++++++++++++--------------------------- 1 file changed, 178 insertions(+), 204 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 6422c1611..53c416d55 100644 --- a/docs/components.html +++ b/docs/components.html @@ -32,39 +32,37 @@ -

    Hero unit

    +

    Jumbotron

    A lightweight, flexible component to showcase key content on your site. It works well on marketing and content-heavy sites.

    -
    +

    Hello, world!

    This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.

    Learn more

    -<div class="hero-unit">
    +<div class="jumbotron">
       <h1>Heading</h1>
       <p>Tagline</p>
       <p>
    -- 
    cgit v1.2.3
    
    
    From 65edc9cd6e453a7bf30ccbd6a57b3ea340e21907 Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Wed, 19 Dec 2012 21:42:36 -0800
    Subject: Change .jumbotron usage in docs layout to .bs-docs-jumbotron
    
    ---
     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 3c070e2e4..b603c3ab8 100644
    --- a/docs/components.html
    +++ b/docs/components.html
    @@ -68,7 +68,7 @@
     
     
    -
    +

    Components

    Dozens of reusable components built to provide navigation, alerts, popovers, and more.

    -- cgit v1.2.3 From 4e54e7bb358b3cc4ad5c228c76aa13c7ce94fe75 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Dec 2012 00:27:46 -0800 Subject: Remove dropdown submenu docs --- docs/components.html | 84 ---------------------------------------------------- 1 file changed, 84 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index b603c3ab8..0f375ebfa 100644 --- a/docs/components.html +++ b/docs/components.html @@ -159,90 +159,6 @@ ... </ul>
    - -

    Sub menus on dropdowns

    -

    Add an extra level of dropdown menus, appearing on hover like those of OS X, with some simple markup additions. Add .dropdown-submenu to any li in an existing dropdown menu for automatic styling.

    - -
    -<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
    -  ...
    -  <li class="dropdown-submenu">
    -    <a tabindex="-1" href="#">More options</a>
    -    <ul class="dropdown-menu">
    -      ...
    -    </ul>
    -  </li>
    -</ul>
    -
    - -- cgit v1.2.3 From 7c04d573d0a08a365f3350c9d52d7cc870f702be Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Dec 2012 21:44:45 -0800 Subject: update docs regarding normalize and clearfix --- docs/components.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 0f375ebfa..ac9dc91ce 100644 --- a/docs/components.html +++ b/docs/components.html @@ -2138,17 +2138,16 @@ class="muted"

    .clearfix

    -

    Clear the float on any element

    +

    Clear the float on any element.

     class="clearfix"
     
     .clearfix {
    -  *zoom: 1;
       &:before,
       &:after {
    +    content: " ";
         display: table;
    -    content: "";
       }
       &:after {
         clear: both;
    -- 
    cgit v1.2.3
    
    
    From c11f41ba04791a0c408071527994dfb22c91a436 Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Fri, 21 Dec 2012 00:50:28 -0800
    Subject: flatten buttons and forms
    
    ---
     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 ac9dc91ce..4f49688f5 100644
    --- a/docs/components.html
    +++ b/docs/components.html
    @@ -223,10 +223,10 @@
               

    Make a set of buttons appear vertically stacked rather than horizontally.

    - - - - + + + +
    -- 
    cgit v1.2.3
    
    
    From d206ec16595a022f10955eb025fd5756512399a8 Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Mon, 24 Dec 2012 02:06:28 -0800
    Subject: Remove .badge-info and .badge-inverse; change docs label of
     .badge-important to .badge-danger
    
    ---
     docs/components.html | 24 +-----------------------
     1 file changed, 1 insertion(+), 23 deletions(-)
    
    (limited to 'docs/components.html')
    
    diff --git a/docs/components.html b/docs/components.html
    index ac9dc91ce..b870c1f3f 100644
    --- a/docs/components.html
    +++ b/docs/components.html
    @@ -1478,7 +1478,7 @@
                   
                   
                     
    -                  Important
    +                  Danger
                     
                     
                       6
    @@ -1487,28 +1487,6 @@
                       <span class="badge badge-danger">6</span>
                     
                   
    -              
    -                
    -                  Info
    -                
    -                
    -                  8
    -                
    -                
    -                  <span class="badge badge-info">8</span>
    -                
    -              
    -              
    -                
    -                  Inverse
    -                
    -                
    -                  10
    -                
    -                
    -                  <span class="badge badge-inverse">10</span>
    -                
    -              
                 
               
     
    -- 
    cgit v1.2.3
    
    
    From c063f7c9c26abad3d9ac605d70b60d86e4d79343 Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Mon, 24 Dec 2012 02:08:45 -0800
    Subject: Update docs to reflect latest on .clearfix
    
    ---
     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 b870c1f3f..e528837da 100644
    --- a/docs/components.html
    +++ b/docs/components.html
    @@ -2116,7 +2116,7 @@ class="muted"
     

    .clearfix

    -

    Clear the float on any element.

    +

    Clear the float on any element. Utilizes the micro clearfix as popularized by Nicollas Gallagher.

     class="clearfix"
     
    -- cgit v1.2.3 From 3d04d9ba751c08ab7909ee6146719171609d5cf9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 28 Dec 2012 19:24:13 -0600 Subject: Super lame typo on my part, sorry @necolas :) --- 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 e528837da..a8a71842f 100644 --- a/docs/components.html +++ b/docs/components.html @@ -2116,7 +2116,7 @@ class="muted"

    .clearfix

    -

    Clear the float on any element. Utilizes the micro clearfix as popularized by Nicollas Gallagher.

    +

    Clear the float on any element. Utilizes the micro clearfix as popularized by Nicolas Gallagher.

     class="clearfix"
     
    -- cgit v1.2.3 From a7231854c91399aafb371ccdf2b930037a7ac5ed Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 12 Jan 2013 00:33:12 -0800 Subject: Address #6459 and add mention of disabled links in dropdowns to le docs --- docs/components.html | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 751418816..bbb0dc39d 100644 --- a/docs/components.html +++ b/docs/components.html @@ -161,6 +161,25 @@ <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dLabel"> ... </ul> + + +

    Disabled menu options

    +

    Add .disabled to a <li> in the dropdown to disable the link.

    + +
    +<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu">
    +  <li><a tabindex="-1" href="#">Regular link</a></li>
    +  <li><a tabindex="-1" href="#">Disabled link</a></li>
    +  <li><a tabindex="-1" href="#">Another link</a></li>
    +</ul>
     

    Sub menus on dropdowns

    -- cgit v1.2.3 From 7a3f078fb487323246ccf64460b7efaf7d478afc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 12 Jan 2013 13:15:19 -0800 Subject: Remove parent div from pagination component * No more div.pagination; it's now just ul.pagination * No more .pagination-right or .pagination-centered * Sizes remain * Any further customization, such as alignment, should be done on the individual application or site level. --- docs/components.html | 171 +++++++++++++++++---------------------------------- 1 file changed, 57 insertions(+), 114 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index a8a71842f..8811a7e5e 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1189,29 +1189,25 @@

    Standard pagination

    Simple pagination inspired by Rdio, great for apps and search results. The large block is hard to miss, easily scalable, and provides large click areas.

    - +
    -<div class="pagination">
    -  <ul>
    -    <li><a href="#">Prev</a></li>
    -    <li><a href="#">1</a></li>
    -    <li><a href="#">2</a></li>
    -    <li><a href="#">3</a></li>
    -    <li><a href="#">4</a></li>
    -    <li><a href="#">Next</a></li>
    -  </ul>
    -</div>
    +<ul class="pagination">
    +  <li><a href="#">Prev</a></li>
    +  <li><a href="#">1</a></li>
    +  <li><a href="#">2</a></li>
    +  <li><a href="#">3</a></li>
    +  <li><a href="#">4</a></li>
    +  <li><a href="#">Next</a></li>
    +</ul>
     
    @@ -1223,43 +1219,37 @@

    Disabled and active states

    Links are customizable for different circumstances. Use .disabled for unclickable links and .active to indicate the current page.

    - -
    -
    -<div class="pagination">
    -  <ul>
    -    <li class="disabled"><a href="#">Prev</a></li>
    -    <li class="active"><a href="#">1</a></li>
    -    ...
    -  </ul>
    -</div>
    +            
    +          
    +
    +<ul class="pagination">
    +  <li class="disabled"><a href="#">Prev</a></li>
    +  <li class="active"><a href="#">1</a></li>
    +  ...
    +</ul>
     

    You can optionally swap out active or disabled anchors for spans to remove click functionality while retaining intended styles.

    -<div class="pagination">
    -  <ul>
    -    <li class="disabled"><span>Prev</span></li>
    -    <li class="active"><span>1</span></li>
    -    ...
    -  </ul>
    -</div>
    +<ul class="pagination">
    +  <li class="disabled"><span>Prev</span></li>
    +  <li class="active"><span>1</span></li>
    +  ...
    +</ul>
     

    Sizes

    Fancy larger or smaller pagination? Add .pagination-large, .pagination-small, or .pagination-mini for additional sizes.

    -
    @@ -448,28 +428,6 @@
                       
  • Separated link
  • - -
    -- 
    cgit v1.2.3
    
    
    From f9ee99cf6febd0b59ee95aa1866a3c1eb5c61320 Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Mon, 14 Jan 2013 00:11:55 -0800
    Subject: Upgrade to newest HTML5 shiv, and make it a local dependency rather
     than CDNing
    
    ---
     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 bbb0dc39d..7a670998d 100644
    --- a/docs/components.html
    +++ b/docs/components.html
    @@ -15,7 +15,7 @@
     
         
         
     
         
    -- 
    cgit v1.2.3
    
    
    From 60bb95e611b6a096e5d50263e278b4be92e7468f Mon Sep 17 00:00:00 2001
    From: Yohn 
    Date: Wed, 16 Jan 2013 07:45:31 -0500
    Subject: adding class to example code
    
    ---
     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 7a670998d..e8b74cf82 100644
    --- a/docs/components.html
    +++ b/docs/components.html
    @@ -177,7 +177,7 @@
     
     <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu">
       <li><a tabindex="-1" href="#">Regular link</a></li>
    -  <li><a tabindex="-1" href="#">Disabled link</a></li>
    +  <li class="disabled"><a tabindex="-1" href="#">Disabled link</a></li>
       <li><a tabindex="-1" href="#">Another link</a></li>
     </ul>
     
    -- cgit v1.2.3 From 9ba14cfb7c0daa75453fd226d09198ffec142b1b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 16 Jan 2013 16:14:41 -0800 Subject: More navbar derping --- docs/components.html | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 17ea3a0d4..c1049747c 100644 --- a/docs/components.html +++ b/docs/components.html @@ -859,31 +859,16 @@
    -<form class="navbar-form pull-left">
    -  <input type="text" class="span2">
    +<form class="pull-left">
    +  <input type="text" style="width: 200px;">
       <button type="submit" class="btn">Submit</button>
     </form>
    -
    - -

    Search form

    -

    For a more customized search form, add .navbar-search to the form and .search-query to the input for specialized styles in the navbar.

    -
    - -
    -
    -<form class="navbar-search pull-left">
    -  <input type="text" class="search-query" placeholder="Search">
    -</form>
     

    Component alignment

    -- cgit v1.2.3 From 7e46b6f6364d754cb87fca35e0897cf2fad09206 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 17 Jan 2013 00:58:34 -0800 Subject: Update nav and add bounds for tablet container --- 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 c1049747c..73261610c 100644 --- a/docs/components.html +++ b/docs/components.html @@ -47,7 +47,7 @@ Get started
  • - Core CSS + CSS
  • Components -- cgit v1.2.3 From 7c23d889bb89fa7dc5ea17347a6b3a44c01f652d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 17 Jan 2013 12:13:37 -0800 Subject: Change subheading of alerts page --- 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 73261610c..22894dd4f 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1549,7 +1549,7 @@ ================================================== -->

    Default alert

    -- cgit v1.2.3 From 5c76518f7d4eb5e71ce3e196a1bc98496d3cc80c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 17 Jan 2013 14:00:03 -0800 Subject: Add respond.js to main docs pages, but only for IE8 and down --- 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 22894dd4f..f52cfc844 100644 --- a/docs/components.html +++ b/docs/components.html @@ -15,6 +15,7 @@ @@ -2112,6 +2113,5 @@ class="clearfix" - -- cgit v1.2.3 From f6226c9b91c38afc7d5050a3cfd7217edef7fc16 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 17 Jan 2013 14:49:52 -0800 Subject: Update Getting Started page to include mention of Respond --- 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 f52cfc844..76035431a 100644 --- a/docs/components.html +++ b/docs/components.html @@ -12,7 +12,7 @@ - + -- cgit v1.2.3 From fd89531f6ae7c2ec9fdaf32f2a8ced34875571e6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 17 Jan 2013 20:26:17 -0800 Subject: Update commenting and structure of layout.mustache --- docs/components.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 4293454b2..d946a937e 100644 --- a/docs/components.html +++ b/docs/components.html @@ -7,18 +7,20 @@ - + + + - + - + @@ -2062,10 +2064,9 @@ class="clearfix" - - @@ -2081,6 +2082,7 @@ class="clearfix" + -- cgit v1.2.3 From 1b128b34310898382e1af54abbf6be3ec6e55361 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 17 Jan 2013 20:28:05 -0800 Subject: comment tweaks and updating starter template --- 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 d946a937e..1c98fdd46 100644 --- a/docs/components.html +++ b/docs/components.html @@ -2064,7 +2064,7 @@ class="clearfix" - -- cgit v1.2.3 From 665de0455cb433c9e3c3b6d6ad72318b46098650 Mon Sep 17 00:00:00 2001 From: Vickash Mahabir Date: Fri, 18 Jan 2013 17:35:23 -0400 Subject: Change .badge to .counter, make appearance more OSX-ish, and remove colors --- docs/components.html | 47 +++++++---------------------------------------- 1 file changed, 7 insertions(+), 40 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 76590a1ca..d432dda58 100644 --- a/docs/components.html +++ b/docs/components.html @@ -91,7 +91,7 @@
  • Navbar
  • Breadcrumbs
  • Pagination
  • -
  • Badges
  • +
  • Counters
  • Typography
  • Thumbnails
  • Alerts
  • @@ -1333,11 +1333,11 @@ - -
    +
    @@ -1354,50 +1354,17 @@ Default - - - - - - - - - - - - - - -
    - 1 + 42 - <span class="badge">1</span> -
    - Success - - 2 - - <span class="badge badge-success">2</span> -
    - Warning - - 4 - - <span class="badge badge-warning">4</span> -
    - Danger - - 6 - - <span class="badge badge-danger">6</span> + <span class="counter">42</span>

    Easily collapsible

    -

    For easy implementation, badges will simply collapse (via CSS's :empty selector) when no content exists within.

    +

    For easy implementation, counters will simply collapse (via CSS's :empty selector) when no content exists within.

    -- cgit v1.2.3 From 964cb773838379319903bcf4b678addc07a55e98 Mon Sep 17 00:00:00 2001 From: Vickash Mahabir Date: Fri, 18 Jan 2013 17:50:58 -0400 Subject: Make the counter example more meaningful --- 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 d432dda58..2040029a3 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1354,7 +1354,7 @@ Default - 42 + Inbox 42 <span class="counter">42</span> -- cgit v1.2.3 From 67ec13a44c945c61735882ce7e78174ea9e32d74 Mon Sep 17 00:00:00 2001 From: Vickash Mahabir Date: Fri, 18 Jan 2013 18:03:43 -0400 Subject: Counters example doesn't need to be a table --- docs/components.html | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 2040029a3..eeb104168 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1340,29 +1340,13 @@

    Counters

    - - - - - - - - - - - - - - - -
    NameExampleMarkup
    - Default - - Inbox 42 - - <span class="counter">42</span> -
    +
    + Inbox 42 +
    +
    +<a href="#">Inbox</a> <span class="counter">42</span>
    +

    Easily collapsible

    For easy implementation, counters will simply collapse (via CSS's :empty selector) when no content exists within.

    -- cgit v1.2.3 From d30f47efb2580b0f435128940b48d5e5d30ca529 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 19 Jan 2013 18:53:41 -0800 Subject: Tighten up badges docs; less bottom margin on h3 --- docs/components.html | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 6710e8338..b88e54b88 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1342,13 +1342,49 @@

    Counters

    +

    Basic usage

    +

    Counters are used to indicator unread or new items. Add a <span class="counter"> to links, Bootstrap navs, and more.

    Inbox 42
    -
     <a href="#">Inbox</a> <span class="counter">42</span>
     
    + +

    Built-in styles are included for placing counters in active states in pill and list navigations.

    + +
    +<ul class="nav nav-list">
    +  <li class="active">
    +    <a href="#">Home</a>
    +  </li>
    +  <li><a href="#">...</a></li>
    +  <li><a href="#">...</a></li>
    +</ul>
    +
    +

    Easily collapsible

    For easy implementation, counters will simply collapse (via CSS's :empty selector) when no content exists within.

    -- cgit v1.2.3 From f20c3368e41cb654dfcb568968b171c45de22127 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 30 Jan 2013 17:42:03 -0800 Subject: Update pagination example HTML to match examples --- docs/components.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index e8b74cf82..849d1f9c3 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1515,6 +1515,7 @@ <li><a href="#">2</a></li> <li><a href="#">3</a></li> <li><a href="#">4</a></li> + <li><a href="#">5</a></li> <li><a href="#">Next</a></li> </ul> </div> @@ -1544,7 +1545,7 @@
     <div class="pagination">
       <ul>
    -    <li class="disabled"><a href="#">Prev</a></li>
    +    <li class="disabled"><a href="#">&laquo;</a></li>
         <li class="active"><a href="#">1</a></li>
         ...
       </ul>
    @@ -1554,7 +1555,7 @@
     
     <div class="pagination">
       <ul>
    -    <li class="disabled"><span>Prev</span></li>
    +    <li class="disabled"><span>&laquo;</span></li>
         <li class="active"><span>1</span></li>
         ...
       </ul>
    -- 
    cgit v1.2.3
    
    
    From 5e5670a1b4c81bcfeaac67d6b25ca9649839097f Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Thu, 31 Jan 2013 18:00:11 -0800
    Subject: Remove gallery link from navbar; add to homepage examples section
     instead
    
    ---
     docs/components.html | 3 ---
     1 file changed, 3 deletions(-)
    
    (limited to 'docs/components.html')
    
    diff --git a/docs/components.html b/docs/components.html
    index aff2088cc..a79ce01fd 100644
    --- a/docs/components.html
    +++ b/docs/components.html
    @@ -61,9 +61,6 @@
                 
  • Customize
  • -
  • - Gallery -
  • -- cgit v1.2.3 From d53af49afea5af5ac2c3cf74f0f5439b58021198 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 1 Feb 2013 16:21:38 -0800 Subject: Refactor colors and progress bars * Buttons and progress bars now make use of more semantic global @brand- colors * Progress bars have been rewritten to reduce the number of possible selectors * Instead of .progress .bar, it's .progress-bar for individual bars of color, ultimately making for less CSS --- docs/components.html | 90 ++++++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index a79ce01fd..4293e43bf 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1614,7 +1614,7 @@ ================================================== -->

    Examples and markup

    @@ -1623,12 +1623,12 @@

    Default progress bar with a vertical gradient.

    -
    +
     <div class="progress">
    -  <div class="bar" style="width: 60%;"></div>
    +  <div class="progress-bar" style="width: 60%;"></div>
     </div>
     
    @@ -1636,12 +1636,12 @@

    Uses a gradient to create a striped effect. Not available in IE8.

    -
    +
     <div class="progress progress-striped">
    -  <div class="bar" style="width: 20%;"></div>
    +  <div class="progress-bar" style="width: 20%;"></div>
     </div>
     
    @@ -1649,12 +1649,12 @@

    Add .active to .progress-striped to animate the stripes right to left. Not available in all versions of IE.

    -
    +
     <div class="progress progress-striped active">
    -  <div class="bar" style="width: 40%;"></div>
    +  <div class="progress-bar" style="width: 40%;"></div>
     </div>
     
    @@ -1662,16 +1662,16 @@

    Place multiple bars into the same .progress to stack them.

    -
    -
    -
    +
    +
    +
     <div class="progress">
    -  <div class="bar bar-success" style="width: 35%;"></div>
    -  <div class="bar bar-warning" style="width: 20%;"></div>
    -  <div class="bar bar-danger" style="width: 10%;"></div>
    +  <div class="progress-bar progress-bar-success" style="width: 35%;"></div>
    +  <div class="progress-bar progress-bar-warning" style="width: 20%;"></div>
    +  <div class="progress-bar progress-bar-danger" style="width: 10%;"></div>
     </div>
     
    @@ -1684,62 +1684,62 @@

    Additional colors

    Progress bars use some of the same button and alert classes for consistent styles.

    -
    -
    +
    +
    -
    -
    +
    +
    -
    -
    +
    +
    -
    -
    +
    +
    -<div class="progress progress-info">
    -  <div class="bar" style="width: 20%"></div>
    +<div class="progress">
    +  <div class="progress-bar progress-bar-info" style="width: 20%"></div>
     </div>
    -<div class="progress progress-success">
    -  <div class="bar" style="width: 40%"></div>
    +<div class="progress">
    +  <div class="progress-bar progress-bar-success" style="width: 40%"></div>
     </div>
    -<div class="progress progress-warning">
    -  <div class="bar" style="width: 60%"></div>
    +<div class="progress">
    +  <div class="progress-bar progress-bar-warning" style="width: 60%"></div>
     </div>
    -<div class="progress progress-danger">
    -  <div class="bar" style="width: 80%"></div>
    +<div class="progress">
    +  <div class="progress-bar progress-bar-danger" style="width: 80%"></div>
     </div>
     

    Striped bars

    Similar to the solid colors, we have varied striped progress bars.

    -
    -
    +
    +
    -
    -
    +
    +
    -
    -
    +
    +
    -
    -
    +
    +
    -<div class="progress progress-info progress-striped">
    -  <div class="bar" style="width: 20%"></div>
    +<div class="progress progress-striped">
    +  <div class="progress-bar progress-bar-info" style="width: 20%"></div>
     </div>
    -<div class="progress progress-success progress-striped">
    -  <div class="bar" style="width: 40%"></div>
    +<div class="progress progress-striped">
    +  <div class="progress-bar progress-bar-success" style="width: 40%"></div>
     </div>
    -<div class="progress progress-warning progress-striped">
    -  <div class="bar" style="width: 60%"></div>
    +<div class="progress progress-striped">
    +  <div class="progress-bar progress-bar-warning" style="width: 60%"></div>
     </div>
    -<div class="progress progress-danger progress-striped">
    -  <div class="bar" style="width: 80%"></div>
    +<div class="progress progress-striped">
    +  <div class="progress-bar progress-bar-danger" style="width: 80%"></div>
     </div>
     
    -- cgit v1.2.3 From 94e256c0162748dcddd6401d57a186576254f884 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 1 Feb 2013 22:56:09 -0800 Subject: Refactor navbar dividers * Instead of .divider-vertical, use .divider * Makes use of .nav-divider mixin * Dividers are horizontal to start, matching the default state of navbar nav links * Dividers become vertical above 768px via media queries --- 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 4293e43bf..ade79e7b5 100644 --- a/docs/components.html +++ b/docs/components.html @@ -831,17 +831,17 @@ <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:

    +

    You can easily add dividers to your nav links with an empty list item and a simple class. Just add the appropriate class to <li> elements between links. Dividers will be horizontal to start, but at resolutions above 768px they become vertical with the navigation.

    @@ -849,7 +849,7 @@
     <ul class="nav">
       ...
    -  <li class="divider-vertical"></li>
    +  <li class="divider"></li>
       ...
     </ul>
     
    @@ -999,7 +999,7 @@
    -

    Examples

    -

    Two basic options, along with two more specific variations.

    +

    Group a series of buttons together on a single line with the button group. Add on optional JavaScript radio and checkbox style behavior with our buttons plugin.

    Single button group

    Wrap a series of buttons with .btn in .btn-group.

    @@ -254,15 +238,21 @@ </div>
    +

    Justified button groups

    +

    Make a group of buttons stretch at the same size to span the entire width of its parent. This only works with <a> elements as the <button> doesn't pick up these styles.

    +
    +
    + Left + Right + Middle +
    +
    +
    +<div class="btn-group btn-group-justified">
    +  ...
    +</div>
    +
    -
    - - -

    Checkbox and radio flavors

    -

    Button groups can also function as radios, where only one button may be active, or checkboxes, where any number of buttons may be active. View the JavaScript docs for that.

    - -

    Dropdowns in button groups

    -

    Buttons with dropdowns must be individually wrapped in their own .btn-group within a .btn-toolbar for proper rendering.

    -- cgit v1.2.3 From 74c8a5611d64b2efd0b60774e184125ed4b5549f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 5 Feb 2013 00:49:54 -0800 Subject: Increase margins and line-height on h3; overhaul button dropdown docs --- docs/components.html | 119 +++++++++++---------------------------------------- 1 file changed, 26 insertions(+), 93 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 49db6f6bb..fdc317e8c 100644 --- a/docs/components.html +++ b/docs/components.html @@ -174,7 +174,6 @@ -

    Group a series of buttons together on a single line with the button group. Add on optional JavaScript radio and checkbox style behavior with our buttons plugin.

    Single button group

    @@ -263,12 +262,12 @@ +

    Use any button to trigger a dropdown menu by placing it within a .btn-group and providing the proper menu markup. Requires the Bootstrap dropdown plugin.

    - -

    Overview and examples

    -

    Use any button to trigger a dropdown menu by placing it within a .btn-group and providing the proper menu markup.

    +

    Single or split button

    +

    Turn a button into dropdown toggle, or add a second button to toggle the dropdown while retaining the primary button action.

    -
    +
    -
    -
    -
    -<div class="btn-group">
    -  <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
    -    Action
    -    <span class="caret"></span>
    -  </a>
    -  <ul class="dropdown-menu">
    -    <!-- dropdown menu links -->
    -  </ul>
    -</div>
    -
    - -

    Works with all button sizes

    -

    Button dropdowns work at any size: .btn-large, .btn-small, or .btn-mini.

    -
    -
    -
    - - -
    -
    - - -
    - -
    -
    - -

    Requires JavaScript

    -

    Button dropdowns require the Bootstrap dropdown plugin to function.

    -

    In some cases—like mobile—dropdown menus will extend outside the viewport. You need to resolve the alignment manually or with custom JavaScript.

    - - -
    - +
    -

    Split button dropdowns

    -

    Building on the button group styles and markup, we can easily create a split button. Split buttons feature a standard action on the left and a dropdown toggle on the right with contextual links.

    -
    @@ -440,6 +379,18 @@
    +<-- Single button -->
    +<div class="btn-group">
    +  <button type="button" class="btn dropdown-toggle" data-toggle="dropdown">
    +    Action
    +    <span class="caret"></span>
    +  </button>
    +  <ul class="dropdown-menu">
    +    <!-- dropdown menu links -->
    +  </ul>
    +</div>
    +
    +<-- Split button -->
     <div class="btn-group">
       <button class="btn">Action</button>
       <button class="btn dropdown-toggle" data-toggle="dropdown">
    @@ -451,13 +402,12 @@
     </div>
     
    -

    Sizes

    -

    Utilize the extra button classes .btn-mini, .btn-small, or .btn-large for sizing.

    +

    Works with all button sizes

    +

    Button dropdowns work at any size: .btn-large, .btn-small, or .btn-mini.

    -
    +
    - - +
    -
    -
    - - +
    -
    -
    - - +
    -
    -<div class="btn-group">
    -  <button class="btn btn-mini">Action</button>
    -  <button class="btn btn-mini dropdown-toggle" data-toggle="dropdown">
    -    <span class="caret"></span>
    -  </button>
    -  <ul class="dropdown-menu">
    -    <!-- dropdown menu links -->
    -  </ul>
    -</div>
    -
    -

    Dropup menus

    -

    Dropdown menus can also be toggled from the bottom up by adding a single class to the immediate parent of .dropdown-menu. It will flip the direction of the .caret and reposition the menu itself to move from the bottom up instead of top down.

    +

    Dropup buttons

    +

    Trigger dropdown menus above elements by adding .dropup to the parent.

    -
    +
    -- cgit v1.2.3 From 1f673b77bbe6f3a8400b901f8825edd1d4e33353 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 5 Feb 2013 00:51:19 -0800 Subject: simpler breadcrumbs docs --- docs/components.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index fdc317e8c..323fd8aab 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1035,9 +1035,8 @@ +

    Indicate the current page's location within a navigational hierarchy.

    -

    Examples

    -

    A single example shown as it might be displayed across multiple pages.

  • - -
    - - -

    Options

    -

    Disabled and active states

    Links are customizable for different circumstances. Use .disabled for unclickable links and .active to indicate the current page.

    @@ -1193,11 +1188,7 @@ </ul> - -
    - - -

    Pager

    +

    Pager

    Quick previous and next links for simple pagination implementations with light markup and styles. It's great for simple sites like blogs or magazines.

    Default example

    -- cgit v1.2.3 From 2576e6d1d6fe36fdec782a44bccf0d9ab239ef2b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 5 Feb 2013 00:59:22 -0800 Subject: reorder counters docs --- docs/components.html | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 463c2678e..46b4fde49 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1252,16 +1252,22 @@ +

    Easily highlight new or unread items by adding a <span class="counter"> to links, Bootstrap navs, and more.

    -

    Basic usage

    -

    Counters are used to indicator unread or new items. Add a <span class="counter"> to links, Bootstrap navs, and more.

    - Inbox 42 + Inbox 42
    -<a href="#">Inbox</a> <span class="counter">42</span>
    +<a href="#">
    +  Inbox
    +  <span class="counter">42</span>
    +</a>
     
    +

    Self collapsing

    +

    When there are no new or unread items, counters will simply collapse (via CSS's :empty selector) provided no content exists within.

    + +

    Adapts to active nav states

    Built-in styles are included for placing counters in active states in pill and list navigations.

    Abstract object styles for building various types of components (like blog comments, Tweets, etc) that feature a left- or right-aligned image alongside textual content.

    -

    Default example

    +

    Default example

    The default media allow to float a media object (images, video, audio) to the left or right of a content block.

    @@ -1692,11 +1692,7 @@ </div> - -
    - - -

    Media list

    +

    Media list

    With a bit of extra markup, you can use media inside list (useful for comment threads or articles lists).

      -- cgit v1.2.3 From 2fa77bf197050a385e479e1b2e8f61d634499505 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 5 Feb 2013 22:46:45 -0800 Subject: Update link to changelog --- 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 849d1f9c3..7b960543b 100644 --- a/docs/components.html +++ b/docs/components.html @@ -2589,7 +2589,7 @@ class="clearfix"
    • ·
    • Issues
    • ·
    • -
    • Roadmap and changelog
    • +
    • Changelog
    -- cgit v1.2.3 From 8b9733b288a3daca0da04fe60e0b5a0ae8681362 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 12 Feb 2013 12:25:05 -0800 Subject: nuke what we don't need for jekyll --- docs/components.html | 1954 -------------------------------------------------- 1 file changed, 1954 deletions(-) delete mode 100644 docs/components.html (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html deleted file mode 100644 index e74e6d223..000000000 --- a/docs/components.html +++ /dev/null @@ -1,1954 +0,0 @@ - - - - - Components · Bootstrap - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    -

    Components

    -

    Dozens of reusable components built to provide navigation, alerts, popovers, and more.

    -
    -
    - - -
    - - -
    - -
    - - - - - - - - - - -
    - -

    Group a series of buttons together on a single line with the button group. Add on optional JavaScript radio and checkbox style behavior with our buttons plugin.

    - -

    Single button group

    -

    Wrap a series of buttons with .btn in .btn-group.

    -
    -
    - - - -
    -
    -
    -<div class="btn-group">
    -  <button class="btn">Left</button>
    -  <button class="btn">Middle</button>
    -  <button class="btn">Right</button>
    -</div>
    -
    - -

    Multiple button groups

    -

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

    -
    -
    -
    - - - - -
    -
    - - - -
    -
    - -
    -
    -
    -
    -<div class="btn-toolbar">
    -  <div class="btn-group">
    -    ...
    -  </div>
    -</div>
    -
    - -

    Vertical button groups

    -

    Make a set of buttons appear vertically stacked rather than horizontally.

    -
    -
    - - - - -
    -
    -
    -<div class="btn-group btn-group-vertical">
    -  ...
    -</div>
    -
    - -

    Justified button groups

    -

    Make a group of buttons stretch at the same size to span the entire width of its parent. This only works with <a> elements as the <button> doesn't pick up these styles.

    -
    -
    - Left - Right - Middle -
    -
    -
    -<div class="btn-group btn-group-justified">
    -  ...
    -</div>
    -
    - -
    - - - - -
    - -

    Use any button to trigger a dropdown menu by placing it within a .btn-group and providing the proper menu markup. Requires the Bootstrap dropdown plugin.

    - -

    Single or split button

    -

    Turn a button into dropdown toggle, or add a second button to toggle the dropdown while retaining the primary button action.

    - -
    -<-- Single button -->
    -<div class="btn-group">
    -  <button type="button" class="btn dropdown-toggle" data-toggle="dropdown">
    -    Action
    -    <span class="caret"></span>
    -  </button>
    -  <ul class="dropdown-menu">
    -    <!-- dropdown menu links -->
    -  </ul>
    -</div>
    -
    -<-- Split button -->
    -<div class="btn-group">
    -  <button class="btn">Action</button>
    -  <button class="btn dropdown-toggle" data-toggle="dropdown">
    -    <span class="caret"></span>
    -  </button>
    -  <ul class="dropdown-menu">
    -    <!-- dropdown menu links -->
    -  </ul>
    -</div>
    -
    - -

    Works with all button sizes

    -

    Button dropdowns work at any size: .btn-large, .btn-small, or .btn-mini.

    -
    -
    -
    - - -
    -
    - - -
    - -
    -
    - -

    Dropup buttons

    -

    Trigger dropdown menus above elements by adding .dropup to the parent.

    -
    -
    - -
    - - - -
    -
    -
    -
    -<div class="btn-group dropup">
    -  <button class="btn">Dropup</button>
    -  <button class="btn dropdown-toggle" data-toggle="dropdown">
    -    <span class="caret"></span>
    -  </button>
    -  <ul class="dropdown-menu">
    -    <!-- dropdown menu links -->
    -  </ul>
    -</div>
    -
    - -
    - - - - - - - - - - - - - - - - - - - -
    - -

    Provide pagination links for your site or app with the multi-page pagination component, or the simpler pager alternative.

    - -

    Standard pagination

    -

    Simple pagination inspired by Rdio, great for apps and search results. The large block is hard to miss, easily scalable, and provides large click areas.

    -
    - -
    -
    -<ul class="pagination">
    -  <li><a href="#">Prev</a></li>
    -  <li><a href="#">1</a></li>
    -  <li><a href="#">2</a></li>
    -  <li><a href="#">3</a></li>
    -  <li><a href="#">4</a></li>
    -  <li><a href="#">5</a></li>
    -  <li><a href="#">Next</a></li>
    -</ul>
    -
    - -

    Disabled and active states

    -

    Links are customizable for different circumstances. Use .disabled for unclickable links and .active to indicate the current page.

    -
    - -
    -
    -<ul class="pagination">
    -  <li class="disabled"><a href="#">&laquo;</a></li>
    -  <li class="active"><a href="#">1</a></li>
    -  ...
    -</ul>
    -
    -

    You can optionally swap out active or disabled anchors for spans to remove click functionality while retaining intended styles.

    -
    -<ul class="pagination">
    -  <li class="disabled"><span>&laquo;</span></li>
    -  <li class="active"><span>1</span></li>
    -  ...
    -</ul>
    -
    - -

    Sizes

    -

    Fancy larger or smaller pagination? Add .pagination-large, .pagination-small, or .pagination-mini for additional sizes.

    -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    -<ul class="pagination pagination-large">
    -  ...
    -</ul>
    -<ul class="pagination">
    -  ...
    -</ul>
    -<ul class="pagination pagination-small">
    -  ...
    -</ul>
    -<ul class="pagination pagination-mini">
    -  ...
    -</ul>
    -
    - -

    Pager

    -

    Quick previous and next links for simple pagination implementations with light markup and styles. It's great for simple sites like blogs or magazines.

    - -

    Default example

    -

    By default, the pager centers links.

    -
    - -
    -
    -<ul class="pager">
    -  <li><a href="#">Previous</a></li>
    -  <li><a href="#">Next</a></li>
    -</ul>
    -
    - -

    Aligned links

    -

    Alternatively, you can align each link to the sides:

    -
    - -
    -
    -<ul class="pager">
    -  <li class="previous">
    -    <a href="#">&larr; Older</a>
    -  </li>
    -  <li class="next">
    -    <a href="#">Newer &rarr;</a>
    -  </li>
    -</ul>
    -
    - -

    Optional disabled state

    -

    Pager links also use the general .disabled utility class from the pagination.

    -
    - -
    -
    -<ul class="pager">
    -  <li class="previous disabled">
    -    <a href="#">&larr; Older</a>
    -  </li>
    -  ...
    -</ul>
    -
    - -
    - - - - -
    - -

    Easily highlight new or unread items by adding a <span class="counter"> to links, Bootstrap navs, and more.

    - -
    - Inbox 42 -
    -
    -<a href="#">
    -  Inbox
    -  <span class="counter">42</span>
    -</a>
    -
    - -

    Self collapsing

    -

    When there are no new or unread items, counters will simply collapse (via CSS's :empty selector) provided no content exists within.

    - -

    Adapts to active nav states

    -

    Built-in styles are included for placing counters in active states in pill and list navigations.

    - -
    -<ul class="nav nav-list">
    -  <li class="active">
    -    <a href="#">Home</a>
    -  </li>
    -  <li><a href="#">...</a></li>
    -  <li><a href="#">...</a></li>
    -</ul>
    -
    - -
    - - - - -
    - - -

    Jumbotron

    -

    A lightweight, flexible component to showcase key content on your site. It works well on marketing and content-heavy sites.

    -
    -
    -

    Hello, world!

    -

    This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.

    -

    Learn more

    -
    -
    -
    -<div class="jumbotron">
    -  <h1>Heading</h1>
    -  <p>Tagline</p>
    -  <p>
    -    <a class="btn btn-primary btn-large">
    -      Learn more
    -    </a>
    -  </p>
    -</div>
    -
    - -

    Page header

    -

    A simple shell for an h1 to appropriately 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-header">
    -  <h1>Example page header <small>Subtext for header</small></h1>
    -</div>
    -
    - -
    - - - - -
    - -

    Extend Bootstrap's grid system with the thumbnail component to easily display grids of images, videos, text, and more.

    - -

    Default thumbnails

    -

    By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.

    -
    -
    -
    - - - -
    -
    - - - -
    -
    - - - -
    -
    - - - -
    -
    -
    -
    -<div class="row">
    -  <div class="span3">
    -    <a href="#" class="thumbnail">
    -      <img src="holder.js/260x180" alt="">
    -    </a>
    -  </div>
    -  ...
    -</div>
    -
    - -

    Custom content thumbnails

    -

    With a bit of extra markup, it's possible to add any kind of HTML content like headings, paragraphs, or buttons into thumbnails.

    -
    -
    -
    -
    - -
    -

    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

    -
    -
    -
    -
    -
    - -
    -

    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

    -
    -
    -
    -
    -
    - -
    -

    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

    -
    -
    -
    -
    -
    -
    -<div class="row">
    -  <div class="span4">
    -    <div class="thumbnail">
    -      <img data-src="holder.js/300x200" alt="">
    -      <h3>Thumbnail label</h3>
    -      <p>Thumbnail caption...</p>
    -    </div>
    -  </div>
    -  ...
    -</div>
    -
    - -
    - - - - - -
    - -

    Provide contextual feedback messages for typical user actions with the handful of available and flexible alert messages. For inline dismissal, use the alerts jQuery plugin.

    - -

    Default alert

    -

    Wrap any text and an optional dismiss button in .alert for a basic warning alert message. To ensure proper behavior across all devices, be sure to use <button> element with the data-dismiss="alert" data attribute.

    -
    -
    - - Warning! Best check yo self, you're not looking too good. -
    -
    -
    -<div class="alert">
    -  <button type="button" class="close" data-dismiss="alert">&times;</button>
    -  <strong>Warning!</strong> Best check yo self, you're not looking too good.
    -</div>
    -
    - -

    Block alerts

    -

    For longer messages, increase the padding on the top and bottom of the alert wrapper by adding .alert-block.

    -
    -
    - -

    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">
    -  <button type="button" class="close" data-dismiss="alert">&times;</button>
    -  <h4>Warning!</h4>
    -  Best check yo self, you're not...
    -</div>
    -
    - -

    Contextual alternatives

    -

    Add optional classes to change an alert's connotation.

    -
    -
    - - Oh snap! Change a few things up and try submitting again. -
    -
    - - Well done! You successfully read this important alert message. -
    -
    - - Heads up! This alert needs your attention, but it's not super important. -
    -
    -
    -<div class="alert alert-error">... </div>
    -<div class="alert alert-success">...</div>
    -<div class="alert alert-info">...</div>
    -
    -
    - - - - - -
    - -

    Provide up-to-date feedback on the progress of a workflow or action with simple yet flexible progress bars.

    - -

    Progress bars use CSS3 transitions and animations to achieve some of their effects. These features are not supported in IE8-9 or older versions of Firefox. Internet Explorer 10 and below, as well as Opera 12, do not support animations.

    - -

    Basic

    -

    Default progress bar with a vertical gradient.

    -
    -
    -
    -
    -
    -
    -<div class="progress">
    -  <div class="progress-bar" style="width: 60%;"></div>
    -</div>
    -
    - -

    Additional colors

    -

    Progress bars use some of the same button and alert classes for consistent styles.

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -<div class="progress">
    -  <div class="progress-bar progress-bar-info" style="width: 20%"></div>
    -</div>
    -<div class="progress">
    -  <div class="progress-bar progress-bar-success" style="width: 40%"></div>
    -</div>
    -<div class="progress">
    -  <div class="progress-bar progress-bar-warning" style="width: 60%"></div>
    -</div>
    -<div class="progress">
    -  <div class="progress-bar progress-bar-danger" style="width: 80%"></div>
    -</div>
    -
    - -

    Striped

    -

    Uses a gradient to create a striped effect. Not available in IE8.

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -<div class="progress progress-striped">
    -  <div class="progress-bar progress-bar-info" style="width: 20%"></div>
    -</div>
    -<div class="progress progress-striped">
    -  <div class="progress-bar progress-bar-success" style="width: 40%"></div>
    -</div>
    -<div class="progress progress-striped">
    -  <div class="progress-bar progress-bar-warning" style="width: 60%"></div>
    -</div>
    -<div class="progress progress-striped">
    -  <div class="progress-bar progress-bar-danger" style="width: 80%"></div>
    -</div>
    -
    - -

    Animated

    -

    Add .active to .progress-striped to animate the stripes right to left. Not available in all versions of IE.

    -
    -
    -
    -
    -
    -
    -<div class="progress progress-striped active">
    -  <div class="progress-bar" style="width: 40%;"></div>
    -</div>
    -
    - -

    Stacked

    -

    Place multiple bars into the same .progress to stack them.

    -
    -
    -
    -
    -
    -
    -
    -
    -<div class="progress">
    -  <div class="progress-bar progress-bar-success" style="width: 35%;"></div>
    -  <div class="progress-bar progress-bar-warning" style="width: 20%;"></div>
    -  <div class="progress-bar progress-bar-danger" style="width: 10%;"></div>
    -</div>
    -
    - -
    - - - - - -
    - -

    Abstract object styles for building various types of components (like blog comments, Tweets, etc) that feature a left- or right-aligned image alongside textual content.

    - -

    Default example

    -

    The default media allow to float a media object (images, video, audio) to the left or right of a content block.

    -
    -
    - - - -
    -

    Media heading

    - Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus. -
    -
    -
    - - - -
    -

    Media heading

    - Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus. -
    - - - -
    -

    Media heading

    - Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus. -
    -
    -
    -
    -
    -
    -<div class="media">
    -  <a class="pull-left" href="#">
    -    <img class="media-object" data-src="holder.js/64x64">
    -  </a>
    -  <div class="media-body">
    -    <h4 class="media-heading">Media heading</h4>
    -    ...
    -
    -    <!-- Nested media object -->
    -    <div class="media">
    -      ...
    -    </div>
    -  </div>
    -</div>
    -
    - -

    Media list

    -

    With a bit of extra markup, you can use media inside list (useful for comment threads or articles lists).

    -
    -
      -
    • - - - -
      -

      Media heading

      -

      Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.

      - -
      - - - -
      -

      Nested media heading

      - Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. - -
      - - - -
      -

      Nested media heading

      - Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. -
      -
      -
      -
      - -
      - - - -
      -

      Nested media heading

      - Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. -
      -
      -
      -
    • -
    • - - - -
      -

      Media heading

      - Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. -
      -
    • -
    -
    -
    -<ul class="media-list">
    -  <li class="media">
    -    <a class="pull-left" href="#">
    -      <img class="media-object" data-src="holder.js/64x64">
    -    </a>
    -    <div class="media-body">
    -      <h4 class="media-heading">Media heading</h4>
    -      ...
    -
    -      <!-- Nested media object -->
    -      <div class="media">
    -        ...
    -     </div>
    -    </div>
    -  </li>
    -</ul>
    -
    - -
    - - - - - - -
    - - -

    Wells

    -

    Use the well as a simple effect on an element to give it an inset effect.

    -
    -
    - Look, I'm in a well! -
    -
    -
    -<div class="well">
    -  ...
    -</div>
    -
    -

    Optional classes

    -

    Control padding and rounded corners with two optional modifier classes.

    -
    -
    - Look, I'm in a well! -
    -
    -
    -<div class="well well-large">
    -  ...
    -</div>
    -
    -
    -
    - Look, I'm in a well! -
    -
    -
    -<div class="well well-small">
    -  ...
    -</div>
    -
    - -

    Close icon

    -

    Use the generic close icon for dismissing content like modals and alerts.

    -
    -

    -
    -
    <button class="close">&times;</button>
    -

    iOS devices require an href="#" for click events if you would rather use an anchor.

    -
    <a class="close" href="#">&times;</a>
    - -

    Helper classes

    -

    Simple, focused classes for small display or behavior tweaks.

    - -

    .pull-left

    -

    Float an element left

    -
    -class="pull-left"
    -
    -
    -.pull-left {
    -  float: left;
    -}
    -
    - -

    .pull-right

    -

    Float an element right

    -
    -class="pull-right"
    -
    -
    -.pull-right {
    -  float: right;
    -}
    -
    - -

    .muted

    -

    Change an element's color to #999

    -
    -class="muted"
    -
    -
    -.muted {
    -  color: #999;
    -}
    -
    - -

    .clearfix

    -

    Clear the float on any element. Utilizes the micro clearfix as popularized by Nicolas Gallagher.

    -
    -class="clearfix"
    -
    -
    -.clearfix {
    -  &:before,
    -  &:after {
    -    content: " ";
    -    display: table;
    -  }
    -  &:after {
    -    clear: both;
    -  }
    -}
    -
    - -
    - - - -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3 From e45f12ad427fddc9d9859fe86423bd49795d4f43 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 12 Feb 2013 12:44:41 -0800 Subject: rearrange jekyll and docs --- docs/components.html | 1824 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1824 insertions(+) create mode 100644 docs/components.html (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html new file mode 100644 index 000000000..62a47d7c6 --- /dev/null +++ b/docs/components.html @@ -0,0 +1,1824 @@ +--- +layout: default +title: Components +--- + + + +
    +
    +

    Components

    +

    Dozens of reusable components built to provide navigation, alerts, popovers, and more.

    +
    +
    + + +
    + + +
    + +
    + + + + + + + + + + +
    + +

    Group a series of buttons together on a single line with the button group. Add on optional JavaScript radio and checkbox style behavior with our buttons plugin.

    + +

    Single button group

    +

    Wrap a series of buttons with .btn in .btn-group.

    +
    +
    + + + +
    +
    +
    +<div class="btn-group">
    +  <button class="btn">Left</button>
    +  <button class="btn">Middle</button>
    +  <button class="btn">Right</button>
    +</div>
    +
    + +

    Multiple button groups

    +

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

    +
    +
    +
    + + + + +
    +
    + + + +
    +
    + +
    +
    +
    +
    +<div class="btn-toolbar">
    +  <div class="btn-group">
    +    ...
    +  </div>
    +</div>
    +
    + +

    Vertical button groups

    +

    Make a set of buttons appear vertically stacked rather than horizontally.

    +
    +
    + + + + +
    +
    +
    +<div class="btn-group btn-group-vertical">
    +  ...
    +</div>
    +
    + +

    Justified button groups

    +

    Make a group of buttons stretch at the same size to span the entire width of its parent. This only works with <a> elements as the <button> doesn't pick up these styles.

    +
    +
    + Left + Right + Middle +
    +
    +
    +<div class="btn-group btn-group-justified">
    +  ...
    +</div>
    +
    + +
    + + + + +
    + +

    Use any button to trigger a dropdown menu by placing it within a .btn-group and providing the proper menu markup. Requires the Bootstrap dropdown plugin.

    + +

    Single or split button

    +

    Turn a button into dropdown toggle, or add a second button to toggle the dropdown while retaining the primary button action.

    + +
    +<-- Single button -->
    +<div class="btn-group">
    +  <button type="button" class="btn dropdown-toggle" data-toggle="dropdown">
    +    Action
    +    <span class="caret"></span>
    +  </button>
    +  <ul class="dropdown-menu">
    +    <!-- dropdown menu links -->
    +  </ul>
    +</div>
    +
    +<-- Split button -->
    +<div class="btn-group">
    +  <button class="btn">Action</button>
    +  <button class="btn dropdown-toggle" data-toggle="dropdown">
    +    <span class="caret"></span>
    +  </button>
    +  <ul class="dropdown-menu">
    +    <!-- dropdown menu links -->
    +  </ul>
    +</div>
    +
    + +

    Works with all button sizes

    +

    Button dropdowns work at any size: .btn-large, .btn-small, or .btn-mini.

    +
    +
    +
    + + +
    +
    + + +
    + +
    +
    + +

    Dropup buttons

    +

    Trigger dropdown menus above elements by adding .dropup to the parent.

    +
    +
    + +
    + + + +
    +
    +
    +
    +<div class="btn-group dropup">
    +  <button class="btn">Dropup</button>
    +  <button class="btn dropdown-toggle" data-toggle="dropdown">
    +    <span class="caret"></span>
    +  </button>
    +  <ul class="dropdown-menu">
    +    <!-- dropdown menu links -->
    +  </ul>
    +</div>
    +
    + +
    + + + + + + + + + + + + + + + + + + + +
    + +

    Provide pagination links for your site or app with the multi-page pagination component, or the simpler pager alternative.

    + +

    Standard pagination

    +

    Simple pagination inspired by Rdio, great for apps and search results. The large block is hard to miss, easily scalable, and provides large click areas.

    +
    + +
    +
    +<ul class="pagination">
    +  <li><a href="#">Prev</a></li>
    +  <li><a href="#">1</a></li>
    +  <li><a href="#">2</a></li>
    +  <li><a href="#">3</a></li>
    +  <li><a href="#">4</a></li>
    +  <li><a href="#">5</a></li>
    +  <li><a href="#">Next</a></li>
    +</ul>
    +
    + +

    Disabled and active states

    +

    Links are customizable for different circumstances. Use .disabled for unclickable links and .active to indicate the current page.

    +
    + +
    +
    +<ul class="pagination">
    +  <li class="disabled"><a href="#">&laquo;</a></li>
    +  <li class="active"><a href="#">1</a></li>
    +  ...
    +</ul>
    +
    +

    You can optionally swap out active or disabled anchors for spans to remove click functionality while retaining intended styles.

    +
    +<ul class="pagination">
    +  <li class="disabled"><span>&laquo;</span></li>
    +  <li class="active"><span>1</span></li>
    +  ...
    +</ul>
    +
    + +

    Sizes

    +

    Fancy larger or smaller pagination? Add .pagination-large, .pagination-small, or .pagination-mini for additional sizes.

    +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    +<ul class="pagination pagination-large">
    +  ...
    +</ul>
    +<ul class="pagination">
    +  ...
    +</ul>
    +<ul class="pagination pagination-small">
    +  ...
    +</ul>
    +<ul class="pagination pagination-mini">
    +  ...
    +</ul>
    +
    + +

    Pager

    +

    Quick previous and next links for simple pagination implementations with light markup and styles. It's great for simple sites like blogs or magazines.

    + +

    Default example

    +

    By default, the pager centers links.

    +
    + +
    +
    +<ul class="pager">
    +  <li><a href="#">Previous</a></li>
    +  <li><a href="#">Next</a></li>
    +</ul>
    +
    + +

    Aligned links

    +

    Alternatively, you can align each link to the sides:

    +
    + +
    +
    +<ul class="pager">
    +  <li class="previous">
    +    <a href="#">&larr; Older</a>
    +  </li>
    +  <li class="next">
    +    <a href="#">Newer &rarr;</a>
    +  </li>
    +</ul>
    +
    + +

    Optional disabled state

    +

    Pager links also use the general .disabled utility class from the pagination.

    +
    + +
    +
    +<ul class="pager">
    +  <li class="previous disabled">
    +    <a href="#">&larr; Older</a>
    +  </li>
    +  ...
    +</ul>
    +
    + +
    + + + + +
    + +

    Easily highlight new or unread items by adding a <span class="counter"> to links, Bootstrap navs, and more.

    + +
    + Inbox 42 +
    +
    +<a href="#">
    +  Inbox
    +  <span class="counter">42</span>
    +</a>
    +
    + +

    Self collapsing

    +

    When there are no new or unread items, counters will simply collapse (via CSS's :empty selector) provided no content exists within.

    + +

    Adapts to active nav states

    +

    Built-in styles are included for placing counters in active states in pill and list navigations.

    + +
    +<ul class="nav nav-list">
    +  <li class="active">
    +    <a href="#">Home</a>
    +  </li>
    +  <li><a href="#">...</a></li>
    +  <li><a href="#">...</a></li>
    +</ul>
    +
    + +
    + + + + +
    + + +

    Jumbotron

    +

    A lightweight, flexible component to showcase key content on your site. It works well on marketing and content-heavy sites.

    +
    +
    +

    Hello, world!

    +

    This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.

    +

    Learn more

    +
    +
    +
    +<div class="jumbotron">
    +  <h1>Heading</h1>
    +  <p>Tagline</p>
    +  <p>
    +    <a class="btn btn-primary btn-large">
    +      Learn more
    +    </a>
    +  </p>
    +</div>
    +
    + +

    Page header

    +

    A simple shell for an h1 to appropriately 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-header">
    +  <h1>Example page header <small>Subtext for header</small></h1>
    +</div>
    +
    + +
    + + + + +
    + +

    Extend Bootstrap's grid system with the thumbnail component to easily display grids of images, videos, text, and more.

    + +

    Default thumbnails

    +

    By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.

    +
    +
    +
    + + + +
    +
    + + + +
    +
    + + + +
    +
    + + + +
    +
    +
    +
    +<div class="row">
    +  <div class="span3">
    +    <a href="#" class="thumbnail">
    +      <img src="holder.js/260x180" alt="">
    +    </a>
    +  </div>
    +  ...
    +</div>
    +
    + +

    Custom content thumbnails

    +

    With a bit of extra markup, it's possible to add any kind of HTML content like headings, paragraphs, or buttons into thumbnails.

    +
    +
    +
    +
    + +
    +

    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

    +
    +
    +
    +
    +
    + +
    +

    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

    +
    +
    +
    +
    +
    + +
    +

    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

    +
    +
    +
    +
    +
    +
    +<div class="row">
    +  <div class="span4">
    +    <div class="thumbnail">
    +      <img data-src="holder.js/300x200" alt="">
    +      <h3>Thumbnail label</h3>
    +      <p>Thumbnail caption...</p>
    +    </div>
    +  </div>
    +  ...
    +</div>
    +
    + +
    + + + + + +
    + +

    Provide contextual feedback messages for typical user actions with the handful of available and flexible alert messages. For inline dismissal, use the alerts jQuery plugin.

    + +

    Default alert

    +

    Wrap any text and an optional dismiss button in .alert for a basic warning alert message. To ensure proper behavior across all devices, be sure to use <button> element with the data-dismiss="alert" data attribute.

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

    Block alerts

    +

    For longer messages, increase the padding on the top and bottom of the alert wrapper by adding .alert-block.

    +
    +
    + +

    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">
    +  <button type="button" class="close" data-dismiss="alert">&times;</button>
    +  <h4>Warning!</h4>
    +  Best check yo self, you're not...
    +</div>
    +
    + +

    Contextual alternatives

    +

    Add optional classes to change an alert's connotation.

    +
    +
    + + Oh snap! Change a few things up and try submitting again. +
    +
    + + Well done! You successfully read this important alert message. +
    +
    + + Heads up! This alert needs your attention, but it's not super important. +
    +
    +
    +<div class="alert alert-error">... </div>
    +<div class="alert alert-success">...</div>
    +<div class="alert alert-info">...</div>
    +
    +
    + + + + + +
    + +

    Provide up-to-date feedback on the progress of a workflow or action with simple yet flexible progress bars.

    + +

    Progress bars use CSS3 transitions and animations to achieve some of their effects. These features are not supported in IE8-9 or older versions of Firefox. Internet Explorer 10 and below, as well as Opera 12, do not support animations.

    + +

    Basic

    +

    Default progress bar with a vertical gradient.

    +
    +
    +
    +
    +
    +
    +<div class="progress">
    +  <div class="progress-bar" style="width: 60%;"></div>
    +</div>
    +
    + +

    Additional colors

    +

    Progress bars use some of the same button and alert classes for consistent styles.

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +<div class="progress">
    +  <div class="progress-bar progress-bar-info" style="width: 20%"></div>
    +</div>
    +<div class="progress">
    +  <div class="progress-bar progress-bar-success" style="width: 40%"></div>
    +</div>
    +<div class="progress">
    +  <div class="progress-bar progress-bar-warning" style="width: 60%"></div>
    +</div>
    +<div class="progress">
    +  <div class="progress-bar progress-bar-danger" style="width: 80%"></div>
    +</div>
    +
    + +

    Striped

    +

    Uses a gradient to create a striped effect. Not available in IE8.

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +<div class="progress progress-striped">
    +  <div class="progress-bar progress-bar-info" style="width: 20%"></div>
    +</div>
    +<div class="progress progress-striped">
    +  <div class="progress-bar progress-bar-success" style="width: 40%"></div>
    +</div>
    +<div class="progress progress-striped">
    +  <div class="progress-bar progress-bar-warning" style="width: 60%"></div>
    +</div>
    +<div class="progress progress-striped">
    +  <div class="progress-bar progress-bar-danger" style="width: 80%"></div>
    +</div>
    +
    + +

    Animated

    +

    Add .active to .progress-striped to animate the stripes right to left. Not available in all versions of IE.

    +
    +
    +
    +
    +
    +
    +<div class="progress progress-striped active">
    +  <div class="progress-bar" style="width: 40%;"></div>
    +</div>
    +
    + +

    Stacked

    +

    Place multiple bars into the same .progress to stack them.

    +
    +
    +
    +
    +
    +
    +
    +
    +<div class="progress">
    +  <div class="progress-bar progress-bar-success" style="width: 35%;"></div>
    +  <div class="progress-bar progress-bar-warning" style="width: 20%;"></div>
    +  <div class="progress-bar progress-bar-danger" style="width: 10%;"></div>
    +</div>
    +
    + +
    + + + + + +
    + +

    Abstract object styles for building various types of components (like blog comments, Tweets, etc) that feature a left- or right-aligned image alongside textual content.

    + +

    Default example

    +

    The default media allow to float a media object (images, video, audio) to the left or right of a content block.

    +
    +
    + + + +
    +

    Media heading

    + Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus. +
    +
    +
    + + + +
    +

    Media heading

    + Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus. +
    + + + +
    +

    Media heading

    + Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus. +
    +
    +
    +
    +
    +
    +<div class="media">
    +  <a class="pull-left" href="#">
    +    <img class="media-object" data-src="holder.js/64x64">
    +  </a>
    +  <div class="media-body">
    +    <h4 class="media-heading">Media heading</h4>
    +    ...
    +
    +    <!-- Nested media object -->
    +    <div class="media">
    +      ...
    +    </div>
    +  </div>
    +</div>
    +
    + +

    Media list

    +

    With a bit of extra markup, you can use media inside list (useful for comment threads or articles lists).

    +
    +
      +
    • + + + +
      +

      Media heading

      +

      Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.

      + +
      + + + +
      +

      Nested media heading

      + Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. + +
      + + + +
      +

      Nested media heading

      + Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. +
      +
      +
      +
      + +
      + + + +
      +

      Nested media heading

      + Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. +
      +
      +
      +
    • +
    • + + + +
      +

      Media heading

      + Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. +
      +
    • +
    +
    +
    +<ul class="media-list">
    +  <li class="media">
    +    <a class="pull-left" href="#">
    +      <img class="media-object" data-src="holder.js/64x64">
    +    </a>
    +    <div class="media-body">
    +      <h4 class="media-heading">Media heading</h4>
    +      ...
    +
    +      <!-- Nested media object -->
    +      <div class="media">
    +        ...
    +     </div>
    +    </div>
    +  </li>
    +</ul>
    +
    + +
    + + + + + + +
    + + +

    Wells

    +

    Use the well as a simple effect on an element to give it an inset effect.

    +
    +
    + Look, I'm in a well! +
    +
    +
    +<div class="well">
    +  ...
    +</div>
    +
    +

    Optional classes

    +

    Control padding and rounded corners with two optional modifier classes.

    +
    +
    + Look, I'm in a well! +
    +
    +
    +<div class="well well-large">
    +  ...
    +</div>
    +
    +
    +
    + Look, I'm in a well! +
    +
    +
    +<div class="well well-small">
    +  ...
    +</div>
    +
    + +

    Close icon

    +

    Use the generic close icon for dismissing content like modals and alerts.

    +
    +

    +
    +
    <button class="close">&times;</button>
    +

    iOS devices require an href="#" for click events if you would rather use an anchor.

    +
    <a class="close" href="#">&times;</a>
    + +

    Helper classes

    +

    Simple, focused classes for small display or behavior tweaks.

    + +

    .pull-left

    +

    Float an element left

    +
    +class="pull-left"
    +
    +
    +.pull-left {
    +  float: left;
    +}
    +
    + +

    .pull-right

    +

    Float an element right

    +
    +class="pull-right"
    +
    +
    +.pull-right {
    +  float: right;
    +}
    +
    + +

    .muted

    +

    Change an element's color to #999

    +
    +class="muted"
    +
    +
    +.muted {
    +  color: #999;
    +}
    +
    + +

    .clearfix

    +

    Clear the float on any element. Utilizes the micro clearfix as popularized by Nicolas Gallagher.

    +
    +class="clearfix"
    +
    +
    +.clearfix {
    +  &:before,
    +  &:after {
    +    content: " ";
    +    display: table;
    +  }
    +  &:after {
    +    clear: both;
    +  }
    +}
    +
    + +
    + + + +
    +
    + +
    -- cgit v1.2.3 From 37becbab8cf5c125df758a61ac4429eb8693d673 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 14 Feb 2013 21:42:33 -0800 Subject: convert components code examples to pygments --- docs/components.html | 1032 +++++++++++++++++++++++++------------------------- 1 file changed, 510 insertions(+), 522 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 62a47d7c6..0aea4113e 100644 --- a/docs/components.html +++ b/docs/components.html @@ -62,26 +62,26 @@ title: Components
    -
    -<div class="dropdown">
    -  <!-- Link or button to toggle dropdown -->
    -  <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu">
    -    <li><a tabindex="-1" href="#">Action</a></li>
    -    <li><a tabindex="-1" href="#">Another action</a></li>
    -    <li><a tabindex="-1" href="#">Something else here</a></li>
    -    <li class="divider"></li>
    -    <li><a tabindex="-1" href="#">Separated link</a></li>
    -  </ul>
    -</div>
    -
    +{% highlight html linenos %} + +{% endhighlight %}

    Aligning the menus

    Add .pull-right to a .dropdown-menu to right align the dropdown menu.

    -
    -<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dLabel">
    +{% highlight html linenos %}
    +
    + +{% endhighlight %}

    Disabled menu options

    Add .disabled to a <li> in the dropdown to disable the link.

    @@ -94,13 +94,13 @@ title: Components
    -
    -<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu">
    -  <li><a tabindex="-1" href="#">Regular link</a></li>
    -  <li class="disabled"><a tabindex="-1" href="#">Disabled link</a></li>
    -  <li><a tabindex="-1" href="#">Another link</a></li>
    -</ul>
    -
    +{% highlight html linenos %} + +{% endhighlight %} @@ -118,46 +118,46 @@ title: Components

    Wrap a series of buttons with .btn in .btn-group.

    - - - + + +
    -
    -<div class="btn-group">
    -  <button class="btn">Left</button>
    -  <button class="btn">Middle</button>
    -  <button class="btn">Right</button>
    -</div>
    -
    +{% highlight html linenos %} +
    + + + +
    +{% endhighlight %}

    Multiple button groups

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

    - - - - + + + +
    - - - + + +
    - +
    -
    -<div class="btn-toolbar">
    -  <div class="btn-group">
    -    ...
    -  </div>
    -</div>
    -
    +{% highlight html linenos %} +
    +
    ...
    +
    ...
    +
    ...
    +
    +{% endhighlight %}

    Vertical button groups

    Make a set of buttons appear vertically stacked rather than horizontally.

    @@ -169,11 +169,11 @@ title: Components -
    -<div class="btn-group btn-group-vertical">
    +{% highlight html linenos %}
    +
    ... -</div> -
    + +{% endhighlight %}

    Justified button groups

    Make a group of buttons stretch at the same size to span the entire width of its parent. This only works with <a> elements as the <button> doesn't pick up these styles.

    @@ -184,11 +184,11 @@ title: Components Middle -
    -<div class="btn-group btn-group-justified">
    +{% highlight html linenos %}
    +
    ... -</div> -
    + +{% endhighlight %} @@ -316,36 +316,45 @@ title: Components -
    -<-- Single button -->
    -<div class="btn-group">
    -  <button type="button" class="btn dropdown-toggle" data-toggle="dropdown">
    -    Action
    -    <span class="caret"></span>
    -  </button>
    -  <ul class="dropdown-menu">
    -    <!-- dropdown menu links -->
    -  </ul>
    -</div>
    -
    -<-- Split button -->
    -<div class="btn-group">
    -  <button class="btn">Action</button>
    -  <button class="btn dropdown-toggle" data-toggle="dropdown">
    -    <span class="caret"></span>
    -  </button>
    -  <ul class="dropdown-menu">
    -    <!-- dropdown menu links -->
    -  </ul>
    -</div>
    -
    +{% highlight html linenos %} + +
    + + +
    + + +
    + + + +
    +{% endhighlight %}

    Works with all button sizes

    Button dropdowns work at any size: .btn-large, .btn-small, or .btn-mini.

    - +
    - +
    - +
    +{% highlight html linenos %} + +
    + + +
    + + +
    + + +
    + + +
    + + +
    +{% endhighlight %}

    Dropup buttons

    Trigger dropdown menus above elements by adding .dropup to the parent.

    @@ -405,17 +449,17 @@ title: Components -
    -<div class="btn-group dropup">
    -  <button class="btn">Dropup</button>
    -  <button class="btn dropdown-toggle" data-toggle="dropdown">
    -    <span class="caret"></span>
    -  </button>
    -  <ul class="dropdown-menu">
    -    <!-- dropdown menu links -->
    -  </ul>
    -</div>
    -
    +{% highlight html linenos %} +
    + + + +
    +{% endhighlight %} @@ -439,15 +483,13 @@ title: Components
  • Messages
  • -
    -<ul class="nav nav-tabs">
    -  <li class="active">
    -    <a href="#">Home</a>
    -  </li>
    -  <li><a href="#">...</a></li>
    -  <li><a href="#">...</a></li>
    -</ul>
    -
    +{% highlight html linenos %} + +{% endhighlight %}

    List

    Swap the tabs class for .nav-list.

    @@ -458,15 +500,13 @@ title: Components
  • Messages
  • -
    -<ul class="nav nav-list">
    -  <li class="active">
    -    <a href="#">Home</a>
    -  </li>
    -  <li><a href="#">...</a></li>
    -  <li><a href="#">...</a></li>
    -</ul>
    -
    +{% highlight html linenos %} + +{% endhighlight %}

    Pills

    Take that same HTML, but use .nav-pills instead:

    @@ -477,15 +517,13 @@ title: Components
  • Messages
  • -
    -<ul class="nav nav-pills">
    -  <li class="active">
    -    <a href="#">Home</a>
    -  </li>
    -  <li><a href="#">...</a></li>
    -  <li><a href="#">...</a></li>
    -</ul>
    -
    +{% highlight html linenos %} + +{% endhighlight %}

    Pills are also vertically stackable. Just add .nav-stacked.

    -
    -<ul class="nav nav-pills nav-stacked">
    +{% highlight html linenos %}
    +
    + +{% endhighlight %}

    Options

    @@ -517,15 +555,14 @@ title: Components
  • Messages
  • -
    -<ul class="nav nav-tabs nav-justified">
    +{% highlight html linenos %}
    +
    +
    + +{% endhighlight %}

    Disabled state

    For any nav component (tabs, pills, or list), add .disabled for gray links and no hover effects. Links will remain clickable, however, unless you remove the href attribute. Alternatively, you could implement custom JavaScript to prevent those clicks.

    @@ -536,13 +573,14 @@ title: Components
  • Disabled link
  • -
    -<ul class="nav nav-pills">
    +{% highlight html linenos %}
    +
    + +{% endhighlight %} +

    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.

    @@ -560,7 +598,9 @@ title: Components
  • Home
  • Help
  • Home
  • Help
  • - - - + + -
    -<div class="navbar">
    -  <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>
    -
    -    <!-- Everything you want hidden at 940px or less, place within here -->
    -    <div class="nav-collapse collapse">
    -      <!-- .nav, .navbar-search, .navbar-form, etc -->
    -    </div>
    -
    -  </div>
    -</div>
    -
    +{% highlight html linenos %} + +{% endhighlight %} +
    Heads up! The responsive navbar requires the collapse plugin and responsive Bootstrap CSS file.
    -
    - -

    Inverted variation

    Modify the look of the navbar by adding .navbar-inverse.

    @@ -957,11 +967,11 @@ title: Components
    -
    -<div class="navbar navbar-inverse">
    +{% highlight html linenos %}
    +
    + +{% endhighlight %} @@ -989,13 +999,14 @@ title: Components
  • Data
  • -
    -<ul class="breadcrumb">
    -  <li><a href="#">Home</a></li>
    -  <li><a href="#">Library</a></li>
    -  <li class="active">Data</li>
    -</ul>
    -
    +{% highlight html linenos %} + +{% endhighlight %} + @@ -1022,17 +1033,17 @@ title: Components
  • »
  • -
    -<ul class="pagination">
    -  <li><a href="#">Prev</a></li>
    -  <li><a href="#">1</a></li>
    -  <li><a href="#">2</a></li>
    -  <li><a href="#">3</a></li>
    -  <li><a href="#">4</a></li>
    -  <li><a href="#">5</a></li>
    -  <li><a href="#">Next</a></li>
    -</ul>
    -
    +{% highlight html linenos %} + +{% endhighlight %}

    Disabled and active states

    Links are customizable for different circumstances. Use .disabled for unclickable links and .active to indicate the current page.

    @@ -1047,21 +1058,22 @@ title: Components
  • »
  • -
    -<ul class="pagination">
    -  <li class="disabled"><a href="#">&laquo;</a></li>
    -  <li class="active"><a href="#">1</a></li>
    +{% highlight html linenos %}
    +
    -

    You can optionally swap out active or disabled anchors for spans to remove click functionality while retaining intended styles.

    -
    -<ul class="pagination">
    -  <li class="disabled"><span>&laquo;</span></li>
    -  <li class="active"><span>1</span></li>
    +
    +{% endhighlight %}
    +          

    You can optionally swap out active or disabled anchors for <span> to remove click functionality while retaining intended styles.

    +{% highlight html linenos %} +
    + +{% endhighlight %} +

    Sizes

    Fancy larger or smaller pagination? Add .pagination-large, .pagination-small, or .pagination-mini for additional sizes.

    @@ -1111,20 +1123,13 @@ title: Components -
    -<ul class="pagination pagination-large">
    -  ...
    -</ul>
    -<ul class="pagination">
    -  ...
    -</ul>
    -<ul class="pagination pagination-small">
    -  ...
    -</ul>
    -<ul class="pagination pagination-mini">
    -  ...
    -</ul>
    -
    +{% highlight html linenos %} + + + + +{% endhighlight %} +

    Pager

    Quick previous and next links for simple pagination implementations with light markup and styles. It's great for simple sites like blogs or magazines.

    @@ -1137,12 +1142,12 @@ title: Components
  • Next
  • -
    -<ul class="pager">
    -  <li><a href="#">Previous</a></li>
    -  <li><a href="#">Next</a></li>
    -</ul>
    -
    +{% highlight html linenos %} + +{% endhighlight %}

    Aligned links

    Alternatively, you can align each link to the sides:

    @@ -1152,16 +1157,13 @@ title: Components -
    -<ul class="pager">
    -  <li class="previous">
    -    <a href="#">&larr; Older</a>
    -  </li>
    -  <li class="next">
    -    <a href="#">Newer &rarr;</a>
    -  </li>
    -</ul>
    -
    +{% highlight html linenos %} + +{% endhighlight %} +

    Optional disabled state

    Pager links also use the general .disabled utility class from the pagination.

    @@ -1171,14 +1173,13 @@ title: Components -
    -<ul class="pager">
    -  <li class="previous disabled">
    -    <a href="#">&larr; Older</a>
    -  </li>
    -  ...
    -</ul>
    -
    +{% highlight html linenos %} + +{% endhighlight %} + @@ -1195,12 +1196,9 @@ title: Components
    Inbox 42
    -
    -<a href="#">
    -  Inbox
    -  <span class="counter">42</span>
    -</a>
    -
    +{% highlight html linenos %} +Inbox 42 +{% endhighlight %}

    Self collapsing

    When there are no new or unread items, counters will simply collapse (via CSS's :empty selector) provided no content exists within.

    @@ -1230,15 +1228,17 @@ title: Components -
    -<ul class="nav nav-list">
    -  <li class="active">
    -    <a href="#">Home</a>
    -  </li>
    -  <li><a href="#">...</a></li>
    -  <li><a href="#">...</a></li>
    -</ul>
    -
    +{% highlight html linenos %} + +{% endhighlight %} @@ -1260,17 +1260,13 @@ title: Components

    Learn more

    -
    -<div class="jumbotron">
    -  <h1>Heading</h1>
    -  <p>Tagline</p>
    -  <p>
    -    <a class="btn btn-primary btn-large">
    -      Learn more
    -    </a>
    -  </p>
    -</div>
    -
    +{% highlight html linenos %} +
    +

    Hello, world!

    +

    ...

    +

    Learn more

    +
    +{% endhighlight %}

    Page header

    A simple shell for an h1 to appropriately 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).

    @@ -1279,11 +1275,11 @@ title: Components

    Example page header Subtext for header

    -
    -<div class="page-header">
    -  <h1>Example page header <small>Subtext for header</small></h1>
    -</div>
    -
    +{% highlight html linenos %} + +{% endhighlight %} @@ -1323,16 +1319,16 @@ title: Components -
    -<div class="row">
    -  <div class="span3">
    -    <a href="#" class="thumbnail">
    -      <img src="holder.js/260x180" alt="">
    -    </a>
    -  </div>
    +{% highlight html linenos %}
    +
    +
    + + + +
    ... -</div> -
    + +{% endhighlight %}

    Custom content thumbnails

    With a bit of extra markup, it's possible to add any kind of HTML content like headings, paragraphs, or buttons into thumbnails.

    @@ -1370,18 +1366,22 @@ title: Components -
    -<div class="row">
    -  <div class="span4">
    -    <div class="thumbnail">
    -      <img data-src="holder.js/300x200" alt="">
    -      <h3>Thumbnail label</h3>
    -      <p>Thumbnail caption...</p>
    -    </div>
    -  </div>
    +{% highlight html linenos %}
    +
    +
    +
    + +
    +

    Thumbnail label

    +

    ...

    +

    Action Action

    +
    +
    +
    ... -</div> -
    + +{% endhighlight %} + @@ -1404,12 +1404,12 @@ title: Components Warning! Best check yo self, you're not looking too good. -
    -<div class="alert">
    -  <button type="button" class="close" data-dismiss="alert">&times;</button>
    -  <strong>Warning!</strong> Best check yo self, you're not looking too good.
    -</div>
    -
    +{% highlight html linenos %} +
    + + Warning! Best check yo self, you're not looking too good. +
    +{% endhighlight %}

    Block alerts

    For longer messages, increase the padding on the top and bottom of the alert wrapper by adding .alert-block.

    @@ -1420,13 +1420,13 @@ title: Components

    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">
    -  <button type="button" class="close" data-dismiss="alert">&times;</button>
    -  <h4>Warning!</h4>
    -  Best check yo self, you're not...
    -</div>
    -
    +{% highlight html linenos %} +
    + +

    Warning!

    +

    ...

    +
    +{% endhighlight %}

    Contextual alternatives

    Add optional classes to change an alert's connotation.

    @@ -1444,11 +1444,11 @@ title: Components Heads up! This alert needs your attention, but it's not super important. -
    -<div class="alert alert-error">... </div>
    -<div class="alert alert-success">...</div>
    -<div class="alert alert-info">...</div>
    -
    +{% highlight html linenos %} +
    ...
    +
    ...
    +
    ...
    +{% endhighlight %} @@ -1471,11 +1471,11 @@ title: Components
    -
    -<div class="progress">
    -  <div class="progress-bar" style="width: 60%;"></div>
    -</div>
    -
    +{% highlight html linenos %} +
    +
    +
    +{% endhighlight %}

    Additional colors

    Progress bars use some of the same button and alert classes for consistent styles.

    @@ -1493,20 +1493,20 @@ title: Components
    -
    -<div class="progress">
    -  <div class="progress-bar progress-bar-info" style="width: 20%"></div>
    -</div>
    -<div class="progress">
    -  <div class="progress-bar progress-bar-success" style="width: 40%"></div>
    -</div>
    -<div class="progress">
    -  <div class="progress-bar progress-bar-warning" style="width: 60%"></div>
    -</div>
    -<div class="progress">
    -  <div class="progress-bar progress-bar-danger" style="width: 80%"></div>
    -</div>
    -
    +{% highlight html linenos %} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +{% endhighlight %}

    Striped

    Uses a gradient to create a striped effect. Not available in IE8.

    @@ -1524,20 +1524,20 @@ title: Components
    -
    -<div class="progress progress-striped">
    -  <div class="progress-bar progress-bar-info" style="width: 20%"></div>
    -</div>
    -<div class="progress progress-striped">
    -  <div class="progress-bar progress-bar-success" style="width: 40%"></div>
    -</div>
    -<div class="progress progress-striped">
    -  <div class="progress-bar progress-bar-warning" style="width: 60%"></div>
    -</div>
    -<div class="progress progress-striped">
    -  <div class="progress-bar progress-bar-danger" style="width: 80%"></div>
    -</div>
    -
    +{% highlight html linenos %} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +{% endhighlight %}

    Animated

    Add .active to .progress-striped to animate the stripes right to left. Not available in all versions of IE.

    @@ -1546,11 +1546,11 @@ title: Components
    -
    -<div class="progress progress-striped active">
    -  <div class="progress-bar" style="width: 40%;"></div>
    -</div>
    -
    +{% highlight html linenos %} +
    +
    +
    +{% endhighlight %}

    Stacked

    Place multiple bars into the same .progress to stack them.

    @@ -1561,13 +1561,13 @@ title: Components
    -
    -<div class="progress">
    -  <div class="progress-bar progress-bar-success" style="width: 35%;"></div>
    -  <div class="progress-bar progress-bar-warning" style="width: 20%;"></div>
    -  <div class="progress-bar progress-bar-danger" style="width: 10%;"></div>
    -</div>
    -
    +{% highlight html linenos %} +
    +
    +
    +
    +
    +{% endhighlight %} @@ -1613,22 +1613,17 @@ title: Components -
    -<div class="media">
    -  <a class="pull-left" href="#">
    -    <img class="media-object" data-src="holder.js/64x64">
    -  </a>
    -  <div class="media-body">
    -    <h4 class="media-heading">Media heading</h4>
    +{% highlight html linenos %}
    +
    + + + +
    +

    Media heading

    ... - - <!-- Nested media object --> - <div class="media"> - ... - </div> - </div> -</div> -
    + + +{% endhighlight %}

    Media list

    With a bit of extra markup, you can use media inside list (useful for comment threads or articles lists).

    @@ -1684,24 +1679,19 @@ title: Components -
    -<ul class="media-list">
    -  <li class="media">
    -    <a class="pull-left" href="#">
    -      <img class="media-object" data-src="holder.js/64x64">
    -    </a>
    -    <div class="media-body">
    -      <h4 class="media-heading">Media heading</h4>
    +{% highlight html linenos %}
    +
    + + + +{% endhighlight %} @@ -1723,11 +1713,9 @@ title: Components Look, I'm in a well! -
    -<div class="well">
    -  ...
    -</div>
    -
    +{% highlight html linenos %} +
    ...
    +{% endhighlight %}

    Optional classes

    Control padding and rounded corners with two optional modifier classes.

    @@ -1735,73 +1723,72 @@ title: Components Look, I'm in a well!
    -
    -<div class="well well-large">
    -  ...
    -</div>
    -
    +{% highlight html linenos %} +
    ...
    +{% endhighlight %} +
    Look, I'm in a well!
    -
    -<div class="well well-small">
    -  ...
    -</div>
    -
    +{% highlight html linenos %} +
    ...
    +{% endhighlight %} +

    Close icon

    Use the generic close icon for dismissing content like modals and alerts.

    -
    <button class="close">&times;</button>
    -

    iOS devices require an href="#" for click events if you would rather use an anchor.

    -
    <a class="close" href="#">&times;</a>
    +{% highlight html linenos %} + +{% endhighlight %}

    Helper classes

    Simple, focused classes for small display or behavior tweaks.

    .pull-left

    Float an element left

    -
    -class="pull-left"
    -
    -
    +{% highlight html linenos %}
    +
    ...
    +{% endhighlight %} +{% highlight css linenos %} .pull-left { float: left; } -
    +{% endhighlight %}

    .pull-right

    Float an element right

    -
    -class="pull-right"
    -
    -
    +{% highlight html linenos %}
    +
    ...
    +{% endhighlight %} +{% highlight css linenos %} .pull-right { float: right; } -
    +{% endhighlight %}

    .muted

    Change an element's color to #999

    -
    -class="muted"
    -
    -
    +{% highlight html linenos %}
    +

    ...

    +{% endhighlight %} +{% highlight css linenos %} .muted { color: #999; } -
    +{% endhighlight %} +

    .clearfix

    Clear the float on any element. Utilizes the micro clearfix as popularized by Nicolas Gallagher.

    -
    -class="clearfix"
    -
    -
    +{% highlight html linenos %}
    +
    ...
    +{% endhighlight %} +{% highlight css linenos %} .clearfix { &:before, &:after { @@ -1812,7 +1799,8 @@ class="clearfix" clear: both; } } -
    +{% endhighlight %} + -- cgit v1.2.3 From ce21926704778a2fb8ff76f5241b90a97abeea4c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 16 Feb 2013 01:26:43 -0800 Subject: All Glyphicons now require a base class, e.g. .glyphicon.glyphicon-star --- docs/components.html | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 0aea4113e..bc5d7a2b3 100644 --- a/docs/components.html +++ b/docs/components.html @@ -21,20 +21,20 @@ title: Components
    @@ -163,10 +163,10 @@ title: Components

    Make a set of buttons appear vertically stacked rather than horizontally.

    - - - - + + + +
    {% highlight html linenos %} -- cgit v1.2.3 From 6ccf588a8e08a9f99e6a56f9201a4348eb946cde Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 17 Feb 2013 13:35:14 -0800 Subject: Restore submenu support --- docs/components.html | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 91 insertions(+), 2 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index bc5d7a2b3..b80eb6e71 100644 --- a/docs/components.html +++ b/docs/components.html @@ -53,7 +53,7 @@ title: Components

    Wrap the dropdown's trigger and the dropdown menu within .dropdown, or another element that declares position: relative;. Then add the menu's HTML.