From 4cbb663d9d9f1399b37e97a54c0b9f67270c4943 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 17 Feb 2013 18:10:29 -0800 Subject: Update some links and rename #gridsystem to #grid-system --- 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 b80eb6e71..c30699dc5 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1380,7 +1380,7 @@ title: Components

Thumbnails

-

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

+

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.

-- cgit v1.2.3 From f6ec2c5dac371b0b1d56abd65be548ee5ed075c8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 17 Feb 2013 21:06:20 -0800 Subject: Drop the recently added .counter class for .badge --- docs/components.html | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index c30699dc5..53b4a7e08 100644 --- a/docs/components.html +++ b/docs/components.html @@ -28,7 +28,7 @@ title: Components
  • Navbar
  • Breadcrumbs
  • Pagination
    • -
  • Counters
    • +
  • Badges
  • Typography
  • Thumbnails
  • Alerts
    • @@ -1274,44 +1274,44 @@ title: Components - -
    +
    -

    Counters

    +

    Badges

    -

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

    +

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

    - Inbox 42 + Inbox 42
    {% highlight html linenos %} -Inbox 42 +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.

    +

    When there are no new or unread items, badges 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.

    +

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


    • - 42 + 42 Home
    • Profile
    • - 3 + 3 Messages
      • @@ -1321,7 +1321,7 @@ title: Components
      • - 42 + 42 Home
        • -- cgit v1.2.3 From acdffe696cf29f51c659a18eeca304512ff47048 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 17 Feb 2013 22:20:49 -0800 Subject: Bring back the label, make it scale somewhat with the font-size of the parent using percentages and ems --- docs/components.html | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 53b4a7e08..f1b45159b 100644 --- a/docs/components.html +++ b/docs/components.html @@ -28,6 +28,7 @@ title: Components
      • Navbar
      • Breadcrumbs
      • Pagination
        • +
      • Labels
      • Badges
      • Typography
      • Thumbnails
        • @@ -1274,6 +1275,84 @@ title: Components + +
        +
        +

        Labels

        +
        +

        + +

        Example

        +
        +

        Example heading New

        +

        Example heading New

        +

        Example heading New

        +

        Example heading New

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

        Example heading New

        +{% endhighlight %} + +

        Available variations

        +

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

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        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> +
        + +
        + + +
        -- cgit v1.2.3 From 023568fe3dba59b7f5c12ac610e02fd8bd6c772f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 18 Feb 2013 01:28:35 -0800 Subject: Navbar realignment: * Change .brand to .navbar-brand * Change .btn-navbar to .navbar-toggle * Redesign navbar toggle to be a bit lighter and wider * Center align the navbar brand with a max-width of 200px (to minimize hit area) while still centering --- docs/components.html | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index f1b45159b..63c37131e 100644 --- a/docs/components.html +++ b/docs/components.html @@ -766,7 +766,7 @@ title: Components

        To start, navbars are static (not fixed to the top) and include support for a project name and basic navigation. Place one anywhere within a .container, which sets the width of your site and content.

        - Title + Title
        • Home
        • Link
          • @@ -776,7 +776,7 @@ title: Components
        {% highlight html linenos %}
        - Title + Title
        • Home
        • Link
          • @@ -791,11 +791,11 @@ title: Components

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

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

          Nav links

          @@ -874,7 +874,7 @@ title: Components
          - Title + Title
          • Home
          • Link
            • @@ -894,7 +894,7 @@ title: Components
            - Title + Title
            • Home
            • Link
              • @@ -914,7 +914,7 @@ title: Components
              - Title + Title
              • Home
              • Link
                • @@ -931,16 +931,16 @@ title: Components

                Responsive navbar

                -

                To implement a collapsing responsive navbar, wrap your navbar content in a containing div, .nav-collapse.collapse, and add the navbar toggle button, .btn-navbar.

                +

                To implement a collapsing responsive navbar, wrap your navbar content in a containing div, .nav-collapse.collapse, and add the navbar toggle button, .navbar-toggle.

                - + - Title + Title
                • Home
                  • @@ -984,15 +984,15 @@ title: Components
                  - - + + - Title + Title
                  @@ -1012,12 +1012,12 @@ title: Components
                  - + - Title + Title
                  • Home
                    • -- cgit v1.2.3 From 4c00f290f226876aa67d0440e64196e21729a0a5 Mon Sep 17 00:00:00 2001 From: Tom Pietschker Date: Mon, 18 Feb 2013 20:57:54 -0500 Subject: fix incorrect section id for labels --- 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 63c37131e..b05d9c6e9 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1277,7 +1277,7 @@ title: Components -
                    +

                    Labels

                    -- cgit v1.2.3 From 3b7e5214e3c998e4c2652798dbd8aba4cfee737f Mon Sep 17 00:00:00 2001 From: Tom Pietschker Date: Tue, 19 Feb 2013 14:32:28 -0500 Subject: remove navbar-inner --- docs/components.html | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index b05d9c6e9..7e713938c 100644 --- a/docs/components.html +++ b/docs/components.html @@ -819,16 +819,14 @@ title: Components

                    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.

                    -
                    - -
                    +
                    {% highlight html linenos %} -- cgit v1.2.3 From 62b54605a7b22011835fdb43474e9d8fa27ac384 Mon Sep 17 00:00:00 2001 From: Tom Pietschker Date: Tue, 19 Feb 2013 14:35:48 -0500 Subject: replace navbar-search with navbar-form --- docs/components.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 7e713938c..73100279a 100644 --- a/docs/components.html +++ b/docs/components.html @@ -957,7 +957,7 @@ title: Components
                -
                +
                  @@ -1034,7 +1034,7 @@ title: Components
              -
              +
                -- cgit v1.2.3 From ec9b01e69165c078a6a261c8d570eac70b20bf51 Mon Sep 17 00:00:00 2001 From: Tom Pietschker Date: Tue, 19 Feb 2013 14:40:05 -0500 Subject: remove the search-query class and increase the width --- docs/components.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 73100279a..6c8950e0a 100644 --- a/docs/components.html +++ b/docs/components.html @@ -958,7 +958,7 @@ title: Components
              - +
              • Link
                • @@ -1035,7 +1035,7 @@ title: Components
              - +
              • Link
                • -- cgit v1.2.3 From ba7b1e8234982b3926e830798b5d3d34e1d1b369 Mon Sep 17 00:00:00 2001 From: Tom Pietschker Date: Tue, 19 Feb 2013 14:50:44 -0500 Subject: tweak the position of the fixed to top/bottom navbars to remove double border --- docs/components.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 6c8950e0a..bcca74135 100644 --- a/docs/components.html +++ b/docs/components.html @@ -870,7 +870,7 @@ title: Components

                Fixed to top

                Add .navbar-fixed-top and remember to account for the hidden area underneath it by adding at least 40px padding to the <body>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.

                -
                +
                Title
                  @@ -890,7 +890,7 @@ title: Components

                  Fixed to bottom

                  Add .navbar-fixed-bottom instead.

                  -
                  +
                  Title
                    -- cgit v1.2.3 From 17808731738cb9de385950db54bb156786b6c705 Mon Sep 17 00:00:00 2001 From: Tom Pietschker Date: Tue, 19 Feb 2013 14:54:56 -0500 Subject: forgot navbar-fixed-bottom in the commit --- 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 bcca74135..b60dd1621 100644 --- a/docs/components.html +++ b/docs/components.html @@ -890,7 +890,7 @@ title: Components

                    Fixed to bottom

                    Add .navbar-fixed-bottom instead.

                    -
                    +
                    Title
                      -- cgit v1.2.3 From 5a30e52aac451369bf9a6abfc34c3c5d10b304d3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Feb 2013 23:20:25 -0800 Subject: Fixes #6995: Add disabled navbar nav link support --- docs/components.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index b60dd1621..5727a1759 100644 --- a/docs/components.html +++ b/docs/components.html @@ -805,7 +805,7 @@ title: Components
                    @@ -813,7 +813,7 @@ title: Components {% endhighlight %}

                    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.

                    -- cgit v1.2.3