From 521ff5c8a7c87b30de3491bfcefe4dd5f49382c4 Mon Sep 17 00:00:00 2001 From: Francis Brunelle Date: Wed, 31 Jul 2013 22:37:36 -0400 Subject: add nav to media object and thumbnails --- components.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'components.html') diff --git a/components.html b/components.html index 227526a28..862bf93f0 100644 --- a/components.html +++ b/components.html @@ -1694,7 +1694,7 @@ body { padding-bottom: 70px; }

Extend Bootstrap's grid system with the thumbnail component to easily display 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.

@@ -1731,7 +1731,7 @@ body { padding-bottom: 70px; }
{% endhighlight %} -

Custom content thumbnails

+

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.

@@ -2016,7 +2016,7 @@ body { padding-bottom: 70px; }

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 media

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

@@ -2059,7 +2059,7 @@ body { padding-bottom: 70px; }
{% endhighlight %} -

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 d0b94ead9a660adeca599b2cc49ce5134d432f2f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Aug 2013 09:32:58 -0700 Subject: Fix #9008: consolidate `.alert-block` styles into `.alert` --- components.html | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'components.html') diff --git a/components.html b/components.html index 227526a28..13a8da2b3 100644 --- a/components.html +++ b/components.html @@ -1813,23 +1813,6 @@ body { padding-bottom: 70px; } 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.

-
-
- -

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.

-
-
-{% highlight html %} -
- -

Warning!

-

...

-
{% endhighlight %}

Contextual alternatives

-- cgit v1.2.3 From 6b850132d056a136dc4734c4d68c9e1c23b7843e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Aug 2013 17:57:19 -0700 Subject: Remove requirement of `.list-group-flush` when list groups are in panels Fixes #8900 --- components.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'components.html') diff --git a/components.html b/components.html index 13a8da2b3..d5ee08cc3 100644 --- a/components.html +++ b/components.html @@ -2350,7 +2350,7 @@ body { padding-bottom: 70px; }

Some default panel content here. Nulla vitae elit libero, a pharetra augue. Aenean lacinia bibendum nulla sed consectetur. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Nullam id dolor id nibh ultricies vehicula ut id elit.

-
    +
    • Cras justo odio
    • Dapibus ac facilisis in
    • Morbi leo risus
      • @@ -2366,7 +2366,7 @@ body { padding-bottom: 70px; }

      ...

      -
        +
        • Cras justo odio
        • Dapibus ac facilisis in
        • Morbi leo risus
          • -- cgit v1.2.3 From 23ef8c0c209844dd8b92d2a5ac82daffa7bd2914 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 3 Aug 2013 21:39:57 -0700 Subject: Greater standardization of sizing terminology In class names: * large => lg * small => sm * mini => xs ("Extra small") In screen size categories: * Tiny => Extra small --- components.html | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'components.html') diff --git a/components.html b/components.html index 86b4e71da..4bbafb63f 100644 --- a/components.html +++ b/components.html @@ -385,7 +385,7 @@ base_url: "../"
          -
            @@ -397,7 +397,7 @@ base_url: "../"
          -
            @@ -413,7 +413,7 @@ base_url: "../" {% highlight html %}
            -
              @@ -423,7 +423,7 @@ base_url: "../"
              -
                @@ -535,8 +535,8 @@ base_url: "../"

                Add the relative form sizing classes to the .input-group-addon.

                - @ - + @ +

                @@ -545,14 +545,14 @@ base_url: "../"

                - @ - + @ +
                {% highlight html %}
                - @ - + @ +
                @@ -561,8 +561,8 @@ base_url: "../"
                - @ - + @ +
                {% endhighlight %} @@ -1446,10 +1446,10 @@ body { padding-bottom: 70px; }

                Sizes

                -

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

                +

                Fancy larger or smaller pagination? Add .pagination-lg or .pagination-sm for additional sizes.

                -
                  +
                  • «
                  • 1
                  • 2
                    • @@ -1471,7 +1471,7 @@ body { padding-bottom: 70px; }
                -
                  +
                  • «
                  • 1
                  • 2
                    • @@ -1483,9 +1483,9 @@ body { padding-bottom: 70px; }
                {% highlight html %} -
                  ...
                +
                  ...
                  ...
                -
                  ...
                +
                  ...
                {% endhighlight %} @@ -1659,14 +1659,14 @@ body { padding-bottom: 70px; }

                Hello, world!

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

                -

                Learn more

                +

                Learn more

              {% highlight html %}

              Hello, world!

              ...

              -

              Learn more

              +

              Learn more

              {% endhighlight %} @@ -2402,20 +2402,20 @@ body { padding-bottom: 70px; }

              Optional classes

              Control padding and rounded corners with two optional modifier classes.

              -
              +
              Look, I'm in a well!
              {% highlight html %} -
              ...
              +
              ...
              {% endhighlight %}
              -
              +
              Look, I'm in a well!
              {% highlight html %} -
              ...
              +
              ...
              {% endhighlight %}
              -- cgit v1.2.3 From 7a04e95b719c118ef531511300617f3edd361b08 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 3 Aug 2013 21:58:31 -0700 Subject: rm stray space in components.html --- components.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components.html') diff --git a/components.html b/components.html index 4bbafb63f..d33eb54f6 100644 --- a/components.html +++ b/components.html @@ -1446,7 +1446,7 @@ body { padding-bottom: 70px; }

              Sizes

              -

              Fancy larger or smaller pagination? Add .pagination-lg or .pagination-sm for additional sizes.

              +

              Fancy larger or smaller pagination? Add .pagination-lg or .pagination-sm for additional sizes.

                -- cgit v1.2.3 From b9c572184f18a5c228dedd41e3b93b94c8d71b7b Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 3 Aug 2013 21:59:01 -0700 Subject: add .btn-xs to .btn-group example --- components.html | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'components.html') diff --git a/components.html b/components.html index d33eb54f6..4ba7cce45 100644 --- a/components.html +++ b/components.html @@ -408,6 +408,18 @@ base_url: "../"
              • Separated link
              +
              + + +
              {% highlight html %} @@ -430,6 +442,15 @@ base_url: "../" ...
            + + +
            + +
              + ... +
            {% endhighlight %} -- cgit v1.2.3 From a84e07b27220eddb075d4df65fe24d26c722df7a Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 3 Aug 2013 23:23:40 -0700 Subject: components.html: rm disconnected sentence fragment --- components.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components.html') diff --git a/components.html b/components.html index 4ba7cce45..3e1875852 100644 --- a/components.html +++ b/components.html @@ -50,7 +50,7 @@ base_url: "../" {% endhighlight %} -

            Add a header to break up label sections of actions in any dropdown menu.

            +

            Add a header to label sections of actions in any dropdown menu.

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

          Vertical button groups

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

          -- cgit v1.2.3 From b6390d298aa71e6dccb10e539097fbc7aaa45b8a Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 4 Aug 2013 00:06:56 -0700 Subject: trivial docs grammar improvements --- components.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components.html') diff --git a/components.html b/components.html index 7b0f0d0ed..289034060 100644 --- a/components.html +++ b/components.html @@ -246,7 +246,7 @@ base_url: "../"

          Single button dropdowns

          -

          Turn a button into dropdown toggle with some basic markup changes.

          +

          Turn a button into a dropdown toggle with some basic markup changes.

          -- cgit v1.2.3 From c15f5a89a07316404b289fc0c65db1a4e52c95d1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Aug 2013 14:19:32 -0700 Subject: Enable scrollable responsive nav bar Fixes #9007 in a hopefully decent way --- components.html | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) (limited to 'components.html') diff --git a/components.html b/components.html index 289034060..bf8c45afe 100644 --- a/components.html +++ b/components.html @@ -1326,7 +1326,49 @@ body { padding-bottom: 70px; }
          -

          Inverted variation

          + +

          For instances where you have too many items in your navbar to fight within the viewport of a small device, add .nav-collapse-scrollable to your navbar's .nav-collapse to set a max-height and smooth scrolling.

          +
          +
          +
          + + Title +
          + +
          + +
          +
          +
          +
          +
          +{% highlight html %} +
          +
          + ... + +
          + ... +
          + +
          +
          +{% endhighlight %} + + +

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

          -- cgit v1.2.3 From c4281f39190b99ed543b046430e32ff488092ecd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Aug 2013 15:30:28 -0700 Subject: Update labels to include a base class * Builds on the new button styles by requiring a `.btn-default` for the regular, gray labels * Updates components examples to show new stuff --- components.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'components.html') diff --git a/components.html b/components.html index bf8c45afe..8ce62ae3e 100644 --- a/components.html +++ b/components.html @@ -1629,28 +1629,28 @@ body { padding-bottom: 70px; }

          Example

          -

          Example heading New

          -

          Example heading New

          -

          Example heading New

          -

          Example heading New

          -
          Example heading New
          -
          Example heading New
          +

          Example heading New

          +

          Example heading New

          +

          Example heading New

          +

          Example heading New

          +
          Example heading New
          +
          Example heading New
          {% highlight html %} -

          Example heading New

          +

          Example heading New

          {% endhighlight %}

          Available variations

          Add any of the below mentioned modifier classes to change the appearance of a label.

          - Default + Default Success Warning Danger Info
          {% highlight html %} -Default +Default Success Warning Danger -- cgit v1.2.3 From b29b8acd28984b1fae4817781c0553feea0958e7 Mon Sep 17 00:00:00 2001 From: Rakhat Jabagin Date: Tue, 6 Aug 2013 09:19:07 +0600 Subject: remove repeated 'pagination' class in code example --- components.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components.html') diff --git a/components.html b/components.html index 8ce62ae3e..da3a69413 100644 --- a/components.html +++ b/components.html @@ -1562,7 +1562,7 @@ body { padding-bottom: 70px; }
          {% highlight html %}
            ...
          -
            ...
          +
            ...
            ...
          {% endhighlight %} -- cgit v1.2.3 From b976956432ccf2e0d6f809da1ca6a9d8e99eb39b Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 6 Aug 2013 12:09:44 -0700 Subject: Fix #9132, but in the correct branch People, don't PR against `gh-pages` please! --- components.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components.html') diff --git a/components.html b/components.html index da3a69413..b39385241 100644 --- a/components.html +++ b/components.html @@ -1312,7 +1312,7 @@ body { padding-bottom: 70px; } Title - +
          ...
          -- cgit v1.2.3