From a72ef967ba7e4870fb1d737dedf8bf8a10ae6587 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 11:08:33 -0800 Subject: re-add protocol to the shim --- docs/components.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index cb41c736e..a028c65ed 100644 --- a/docs/components.html +++ b/docs/components.html @@ -7,17 +7,17 @@ + + + - - - -- cgit v1.2.3 From c02df9390330b3fa6b9c7cd0b4390093c163fae9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 11:08:58 -0800 Subject: move shim after css --- docs/components.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index a028c65ed..2af9df756 100644 --- a/docs/components.html +++ b/docs/components.html @@ -7,17 +7,17 @@ - - - + + + -- cgit v1.2.3 From 0ff88f2db3b9fa4604886494a711d74652a2fb4f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 14:09:13 -0800 Subject: enable the use of .nav-header in dropdowns per #1827 --- docs/components.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 2af9df756..37f1a6511 100644 --- a/docs/components.html +++ b/docs/components.html @@ -771,7 +771,9 @@
  • Another action
  • Something else here
  • +
  • Separated link
  • +
  • One more separated link
  • -- cgit v1.2.3 From 1b32e982ade1fc5275a851b711b45f6a0ed21b0c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 14:47:09 -0800 Subject: add hero-unit docs per #1880 --- docs/components.html | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 37f1a6511..10725024b 100644 --- a/docs/components.html +++ b/docs/components.html @@ -98,6 +98,7 @@
  • Labels
  • +
  • Hero
  • Thumbnails
  • Alerts
  • Progress bars
  • @@ -1137,6 +1138,42 @@ + +
    + +
    +
    +

    About

    +

    Bootstrap provides a lightweight, flexible component called a hero unit to showcase content on your site. It works well on marketing and content-heavy sites.

    +

    Markup

    +

    Wrap your content in a div like so:

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

    Hello, world!

    +

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

    +

    Learn more

    +
    +
    +
    +
    + + +
    -- cgit v1.2.3 From ac9ac4ddae7fc9f9c030d8ade789ec65d9a2ec05 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 15:49:04 -0800 Subject: add note to button dropdowns about js plugin dependency per #1746 --- docs/components.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 10725024b..8cd2e58d8 100644 --- a/docs/components.html +++ b/docs/components.html @@ -248,7 +248,9 @@
  • Separated link
  • - + +
    +

    Heads up! Button dropdowns require the Bootstrap dropdown plugin to function.

    Example markup

    -- cgit v1.2.3 From 81d101a6a7195f8575296b19fbf4d36dd145a602 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 19:50:36 -0800 Subject: update docs on fixed nav per #1726 --- docs/components.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 8cd2e58d8..ac87f74b5 100644 --- a/docs/components.html +++ b/docs/components.html @@ -815,12 +815,14 @@ </div> </div> -

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

    +

    Fixed navbar

    +

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

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

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

    Brand name

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

    -- 
    cgit v1.2.3
    
    
    From 4d1f1f0fc7117b9edae1c1b1c0c2c899ffcd72e3 Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Sun, 12 Feb 2012 20:07:25 -0800
    Subject: add typography pattern .page-header to components per #1701
    
    ---
     docs/components.html | 25 +++++++++++++++++++------
     1 file changed, 19 insertions(+), 6 deletions(-)
    
    (limited to 'docs/components.html')
    
    diff --git a/docs/components.html b/docs/components.html
    index ac87f74b5..d0b5de632 100644
    --- a/docs/components.html
    +++ b/docs/components.html
    @@ -98,7 +98,7 @@
             
           
           
  • Labels
  • -
  • Hero
  • +
  • Typography
  • Thumbnails
  • Alerts
  • Progress bars
  • @@ -1142,15 +1142,15 @@ - -
    +
    +

    Hero unit

    -

    About

    Bootstrap provides a lightweight, flexible component called a hero unit to showcase content on your site. It works well on marketing and content-heavy sites.

    Markup

    Wrap your content in a div like so:

    @@ -1173,7 +1173,20 @@

    Learn more

    -
    + +

    Page header

    +
    +
    +

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

    +
    +
    +
    +<div class="page-haeder">
    +  <h1>Example page header</h1>
    +</div>
    +
    +
    +
    -- cgit v1.2.3