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