From 2011a0d50f717c95b706e10ac5e9e0f964c972a9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 19 Dec 2012 21:29:57 -0800 Subject: Drop labels from the docs --- docs/components.html | 72 +++++----------------------------------------------- 1 file changed, 6 insertions(+), 66 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 990f31ae6..873bff63d 100644 --- a/docs/components.html +++ b/docs/components.html @@ -90,7 +90,7 @@
  • Navbar
  • Breadcrumbs
  • Pagination
    • -
  • Labels and badges
    • +
  • Badges
  • Typography
  • Thumbnails
  • Alerts
    • @@ -327,7 +327,7 @@

    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

    -

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

    +

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

    @@ -1511,73 +1511,13 @@ - -
    +
    -

    Labels and badges

    +

    Badges

    -

    Labels

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    LabelsMarkup
    - Default - - <span class="label">Default</span> -
    - Success - - <span class="label label-success">Success</span> -
    - Warning - - <span class="label label-warning">Warning</span> -
    - Danger - - <span class="label label-danger">Danger</span> -
    - Info - - <span class="label label-info">Info</span> -
    - Inverse - - <span class="label label-inverse">Inverse</span> -
    -

    Badges

    @@ -1657,7 +1597,7 @@

    Easily collapsible

    -

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

    +

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

    -- cgit v1.2.3 From b6945a21682042948543fd6809976d06ad234384 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 19 Dec 2012 21:37:16 -0800 Subject: Rename .hero-unit to .jumbotron becaue fuck dashes in filenames and sports metaphors are cooler than ad ones --- docs/components.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 873bff63d..3c070e2e4 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1610,17 +1610,17 @@

    Typographic components

    -

    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.

    -
    - -
    -

    Default

    -
    - -
    -
    - -
    -

    Dropup

    -
    - -
    -
    - -
    -

    Left submenu

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