From 5b298a2aaf5286564b1dc614bb439eb19edf2c25 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 26 Mar 2013 23:54:17 -0700 Subject: docs fixes with new .bs-docs-container; fixing some lingering grid classes --- docs/assets/css/docs.css | 14 +++++++++++++- docs/components.html | 2 +- docs/css.html | 2 +- docs/customize.html | 2 +- docs/getting-started.html | 32 ++++++++++++++++---------------- docs/index.html | 2 +- docs/javascript.html | 2 +- 7 files changed, 34 insertions(+), 22 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index f3d7c156e..76a45b45e 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -14,6 +14,11 @@ body { /* We add the padding to the body for >768px only */ } +.bs-docs-container { + padding-left: 15px; + padding-right: 15px; +} + /* */ .bs-docs-footer { padding-left: 15px; @@ -486,7 +491,8 @@ section > ul li { .bs-docs-footer { text-align: center; - padding: 30px 0; + padding-top: 30px; + padding-bottom: 30px; margin-top: 100px; border-top: 1px solid #e5e5e5; } @@ -610,6 +616,12 @@ input.focused { padding-top: 50px; /* Default height of navbar */ } + /* Undo custom padding */ + .bs-docs-container { + padding-left: 0; + padding-right: 0; + } + /* Tweak display of docs jumbotrons */ .masthead { padding-top: 100px; diff --git a/docs/components.html b/docs/components.html index 5e17a6a3e..06cbe3720 100644 --- a/docs/components.html +++ b/docs/components.html @@ -14,7 +14,7 @@ title: Components -
+
diff --git a/docs/css.html b/docs/css.html index 874e00ed0..226b55d6d 100644 --- a/docs/css.html +++ b/docs/css.html @@ -13,7 +13,7 @@ title: CSS -
+
diff --git a/docs/customize.html b/docs/customize.html index 544f41310..f4e01b340 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -14,7 +14,7 @@ title: Customize and download -
+
diff --git a/docs/getting-started.html b/docs/getting-started.html index 79b31d25d..5717bfbaa 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -14,7 +14,7 @@ description: Overview of the project, its contents, and how to get started with -
+
@@ -42,17 +42,17 @@ description: Overview of the project, its contents, and how to get started with

Before downloading, be sure to have a code editor (we recommend Sublime Text 2) and some working knowledge of HTML and CSS. We won't walk through the source files here, but they are available for download. We'll focus on getting started with the compiled Bootstrap files.

-
+

Compiled

Fastest way to get started: get the compiled and minified versions of our CSS, JS, and images. No docs or original source files.

Download Bootstrap

-
+

Source

Get the original files for all CSS and JavaScript, along with a local copy of the docs by downloading the latest version directly from GitHub.

Download Bootstrap source

-
+

Bower

Install and manage the original files for all CSS and JavaScript, along with a local copy of the docs, using Bower.

{% highlight bash %}bower install bootstrap{% endhighlight %} @@ -179,56 +179,56 @@ description: Overview of the project, its contents, and how to get started with

Move beyond the base template with a few example layouts. We encourage folks to iterate on these examples and not simply use them as an end result.

-
+

Starter template

A barebones HTML document with all the Bootstrap CSS and JavaScript included.

-
+

Basic marketing site

Featuring a hero unit for a primary message and three supporting elements.

-
+

Narrow marketing

Slim, lightweight marketing template for small projects or teams.

-
+

Justified nav

Marketing page with equal-width navigation links in a modified navbar.

-
+

Sign in

Barebones sign in form with custom, larger form controls and a flexible layout.

-
+

Sticky footer

Pin a fixed-height footer to the bottom of the user's viewport.

-
+

Sticky footer w/ navbar

Add a fixed navbar to the default sticky footer template.

-
+
@@ -237,28 +237,28 @@ description: Overview of the project, its contents, and how to get started with
-
+

Navbar

Basic template for showcasing how the navbar works.

-
+

Static top navbar

Basic template for showcasing the static navbar variation.

-
+

Fixed top navbar

Basic template for showcasing the fixed navbar variation.

-
+
diff --git a/docs/index.html b/docs/index.html index 17afe11c4..d2aece152 100644 --- a/docs/index.html +++ b/docs/index.html @@ -22,7 +22,7 @@ title: Bootstrap
-
+
diff --git a/docs/javascript.html b/docs/javascript.html index 8e65c61d5..e64908672 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -12,7 +12,7 @@ title: JavaScript plugins
-
+
-- cgit v1.2.3 From f0f33eb9a3a25ae2f0032f630ff84c58cb0ca431 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 27 Mar 2013 15:42:11 -0700 Subject: Refactor .list-inline and .list-unstyled * Instead of shared and separate CSS, isolate by class for easier mixin-ability * .list-unstyled is now used as a mixin in .list-inline --- docs/assets/css/bootstrap.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5632d3aad..50d207001 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -546,7 +546,11 @@ li { line-height: 20px; } -.list-unstyled, +.list-unstyled { + margin-left: 0; + list-style: none; +} + .list-inline { margin-left: 0; list-style: none; -- cgit v1.2.3 From 6696ff5d927fd2d584ddc226521b89fc8b9882eb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 27 Mar 2013 15:54:17 -0700 Subject: clarify docs on unstyled lists --- docs/css.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/css.html b/docs/css.html index 226b55d6d..f3ab7a00a 100644 --- a/docs/css.html +++ b/docs/css.html @@ -576,7 +576,7 @@ title: CSS {% endhighlight %}

Unstyled

-

Remove the default list-style and left padding on list items (immediate children only).

+

Remove the default list-style and left margin on list items (immediate children only). This only applies to immediate children list items, meaning you will need to add the class for any nested lists as well.

  • Lorem ipsum dolor sit amet
  • -- cgit v1.2.3 From fe414d8566f647e65dc20bc7505630ce798e5445 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 27 Mar 2013 23:33:45 -0700 Subject: turn docs navbar into left navbar --- docs/_includes/navbar.html | 20 ++++++++++---------- docs/assets/css/bootstrap.css | 20 ++++++++++++++++++++ docs/assets/css/docs.css | 35 ++++++++++++++++++++++++++++++----- docs/assets/js/application.js | 5 +++++ 4 files changed, 65 insertions(+), 15 deletions(-) (limited to 'docs') diff --git a/docs/_includes/navbar.html b/docs/_includes/navbar.html index dcbb23556..5e6c5ae63 100644 --- a/docs/_includes/navbar.html +++ b/docs/_includes/navbar.html @@ -1,32 +1,32 @@ -
{% endhighlight %} -

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.

@@ -2708,13 +2708,13 @@ For example, <section> should be wrapped as inline. -
+

Group a series of buttons together on a single line with the button group. Add on optional JavaScript radio and checkbox style behavior with our buttons plugin.

-

Single button group

+

Basic button group

Wrap a series of buttons with .btn in .btn-group.

@@ -2731,7 +2731,7 @@ For example, <section> should be wrapped as inline.
{% endhighlight %} -

Multiple button groups

+

Multiple button groups

Combine sets of <div class="btn-group"> into a <div class="btn-toolbar"> for more complex components.

@@ -2759,7 +2759,7 @@ For example, <section> should be wrapped as inline.
{% endhighlight %} -

Vertical button groups

+

Vertical button groups

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

@@ -2775,7 +2775,7 @@ For example, <section> should be wrapped as inline.
{% endhighlight %} -

Justified button groups

+

Justified button groups

Make a group of buttons stretch at the same size to span the entire width of its parent. This only works with <a> elements as the <button> doesn't pick up these styles.

@@ -2796,14 +2796,14 @@ For example, <section> should be wrapped as inline. -
+

Use any button to trigger a dropdown menu by placing it within a .btn-group and providing the proper menu markup. Requires the Bootstrap dropdown plugin.

-

Single or split button

-

Turn a button into dropdown toggle, or add a second button to toggle the dropdown while retaining the primary button action.

+

Single button dropdowns

+

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

@@ -2857,7 +2857,26 @@ For example, <section> should be wrapped as inline.
+
+{% highlight html linenos %} + + +{% endhighlight %} +

Split button dropdowns

+

Similarly, create split button dropdowns with the same markup changes, only with a separate button.

+
@@ -2917,20 +2936,6 @@ For example, <section> should be wrapped as inline.
{% highlight html linenos %} - - -
@@ -2947,7 +2952,7 @@ For example, <section> should be wrapped as inline.
{% endhighlight %} -

Works with all button sizes

+

Works with all button sizes

Button dropdowns work at any size: .btn-large, .btn-small, or .btn-mini.

@@ -3021,7 +3026,7 @@ For example, <section> should be wrapped as inline.
{% endhighlight %} -

Dropup buttons

+

Dropup buttons

Trigger dropdown menus above elements by adding .dropup to the parent.

-- cgit v1.2.3 From 9336a827c6396c2142be8de38615cd4d14c6685e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 13:11:15 -0700 Subject: fix submenu docs height given border-box --- docs/assets/css/docs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index c61a4a4f8..6b576de2a 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -400,7 +400,7 @@ section > ul li { margin-bottom: 5px; } .bs-docs-example-submenu { - min-height: 180px; + min-height: 230px; } .bs-docs-example-submenu > .pull-left + .pull-left { margin-left: 20px; -- cgit v1.2.3 From e9dd1826be4e41c2464c95d9fbf62c8fd311b689 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 13:12:03 -0700 Subject: fix brok btn-dropdowns links --- docs/docs.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/docs.html b/docs/docs.html index 9fd120562..7e3395481 100644 --- a/docs/docs.html +++ b/docs/docs.html @@ -2802,7 +2802,7 @@ For example, <section> should be wrapped as inline.

Use any button to trigger a dropdown menu by placing it within a .btn-group and providing the proper menu markup. Requires the Bootstrap dropdown plugin.

-

Single button dropdowns

+

Single button dropdowns

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

@@ -2874,7 +2874,7 @@ For example, <section> should be wrapped as inline.
{% endhighlight %} -

Split button dropdowns

+

Split button dropdowns

Similarly, create split button dropdowns with the same markup changes, only with a separate button.

-- cgit v1.2.3 From 171c7feae23227ac6c51b365614b63b266574232 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 13:14:04 -0700 Subject: navs nav links --- docs/_includes/docs-nav.html | 14 +++++++++----- docs/docs.html | 16 ++++++++-------- 2 files changed, 17 insertions(+), 13 deletions(-) (limited to 'docs') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index 99ef5116c..ae5e58e1d 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -103,11 +103,15 @@
  • - Navs -
  • Media object
  • +
  • Panels
  • Wells
  • diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 4f034974a..b86a16a78 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -383,12 +383,12 @@ a.text-warning:focus { color: #a47e3c; } -.text-error { +.text-danger { color: #b94a48; } -a.text-error:hover, -a.text-error:focus { +a.text-danger:hover, +a.text-danger:focus { color: #953b39; } @@ -1119,9 +1119,9 @@ table th[class*="col-span-"] { border-color: #d6e9c6; } -.table > tbody > tr > td.error, -.table > tbody > tr > th.error, -.table > tbody > tr.error > td { +.table > tbody > tr > td.danger, +.table > tbody > tr > th.danger, +.table > tbody > tr.danger > td { background-color: #f2dede; border-color: #eed3d7; } @@ -1140,9 +1140,9 @@ table th[class*="col-span-"] { border-color: #c9e2b3; } -.table-hover > tbody > tr > td.error:hover, -.table-hover > tbody > tr > th.error:hover, -.table-hover > tbody > tr.error:hover > td { +.table-hover > tbody > tr > td.danger:hover, +.table-hover > tbody > tr > th.danger:hover, +.table-hover > tbody > tr.danger:hover > td { background-color: #ebcccc; border-color: #e6c1c7; } @@ -2944,6 +2944,68 @@ fieldset[disabled] .btn-link:focus { z-index: 1051; } +.panel { + padding: 15px; + margin-bottom: 20px; + background-color: #ffffff; + border: 1px solid #dddddd; + border-radius: 4px; + -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); +} + +.panel-heading { + padding: 10px 15px; + margin: -15px -15px 15px; + font-size: 16px; + font-size: 1.6rem; + font-weight: 500; + background-color: #f5f5f5; + border-bottom: 1px solid #dddddd; + border-top-right-radius: 3px; + border-top-left-radius: 3px; +} + +.panel-success { + border-color: #d6e9c6; +} + +.panel-success .panel-heading { + color: #468847; + background-color: #dff0d8; + border-color: #d6e9c6; +} + +.panel-warning { + border-color: #fbeed5; +} + +.panel-warning .panel-heading { + color: #c09853; + background-color: #fcf8e3; + border-color: #fbeed5; +} + +.panel-danger { + border-color: #eed3d7; +} + +.panel-danger .panel-heading { + color: #b94a48; + background-color: #f2dede; + border-color: #eed3d7; +} + +.panel-info { + border-color: #bce8f1; +} + +.panel-info .panel-heading { + color: #3a87ad; + background-color: #d9edf7; + border-color: #bce8f1; +} + .well { min-height: 20px; padding: 19px; diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 6b576de2a..181a3a734 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -309,7 +309,9 @@ section > ul li { .bs-docs-example > textarea:last-child, .bs-docs-example > .table:last-child, .bs-docs-example > .jumbotron:last-child, -.bs-docs-example > .alert:last-child { +.bs-docs-example > .alert:last-child, +.bs-docs-example > .panel:last-child, +.bs-docs-example > .well:last-child { margin-bottom: 0; } diff --git a/docs/docs.html b/docs/docs.html index 4b2629658..00af4ed0c 100644 --- a/docs/docs.html +++ b/docs/docs.html @@ -4369,6 +4369,75 @@ For example, <section> should be wrapped as inline. + +
    + +

    While not always necessary, sometimes you need to put your DOM in a box. For those situations, try the panel component.

    + +

    Basic panel

    +

    By default, all the .panel does is apply some basic border and padding to contain some content.

    +
    +
    + Basic panel example +
    +
    +{% highlight html linenos %} +
    + Basic panel example +
    +{% endhighlight %} + +

    Panel with heading

    +

    Easily add a heading to your panel with .panel-heading. Use it on a <div> or any heading element (e.g., <h3>).

    +
    +
    +
    Panel heading
    + Panel content +
    +
    +{% highlight html linenos %} +
    +
    Panel heading
    + Panel content +
    +{% endhighlight %} + +

    Contextual alternatives

    +

    Like other components, easily make a panel more meaningful to a particular context by adding any of the contextual state classes.

    +
    +
    +
    Panel heading
    + Panel content +
    +
    +
    Panel heading
    + Panel content +
    +
    +
    Panel heading
    + Panel content +
    +
    +
    Panel heading
    + Panel content +
    +
    +{% highlight html linenos %} +
    ...
    +
    ...
    +
    ...
    +
    ...
    +{% endhighlight %} + +
    + + + + +
    -- cgit v1.2.3 From 731903a17597f9095f9c26d969da8e04f50568ed Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 14:16:30 -0700 Subject: panels subnav and links --- docs/_includes/docs-nav.html | 9 ++++++++- docs/docs.html | 6 +++--- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index 649cad06a..4a91214a3 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -163,7 +163,14 @@
  • Media object
  • -
  • Panels
  • +
  • + Panels + +
  • Wells
  • diff --git a/docs/docs.html b/docs/docs.html index 00af4ed0c..7603d2ccc 100644 --- a/docs/docs.html +++ b/docs/docs.html @@ -4377,7 +4377,7 @@ For example, <section> should be wrapped as inline.

    While not always necessary, sometimes you need to put your DOM in a box. For those situations, try the panel component.

    -

    Basic panel

    +

    Basic panel

    By default, all the .panel does is apply some basic border and padding to contain some content.

    @@ -4390,7 +4390,7 @@ For example, <section> should be wrapped as inline.
    {% endhighlight %} -

    Panel with heading

    +

    Panel with heading

    Easily add a heading to your panel with .panel-heading. Use it on a <div> or any heading element (e.g., <h3>).

    @@ -4405,7 +4405,7 @@ For example, <section> should be wrapped as inline.
    {% endhighlight %} -

    Contextual alternatives

    +

    Contextual alternatives

    Like other components, easily make a panel more meaningful to a particular context by adding any of the contextual state classes.

    -- cgit v1.2.3 From 2a9604fdd297fee6661561d1ccf7922b4d599641 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 16:07:50 -0700 Subject: add list group component --- docs/_includes/docs-nav.html | 13 +++ docs/assets/css/bootstrap.css | 91 ++++++++++++++++++++ docs/assets/css/docs.css | 5 ++ docs/docs.html | 191 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 300 insertions(+) (limited to 'docs') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index 4a91214a3..652b845cd 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -163,12 +163,25 @@
  • Media object
  • +
  • + List group + +
  • Panels
  • Wells
  • diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b86a16a78..fcbc5d580 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2944,6 +2944,80 @@ fieldset[disabled] .btn-link:focus { z-index: 1051; } +.list-group { + margin: 0 0 20px; + background-color: #ffffff; +} + +.list-group-item { + position: relative; + display: block; + padding: 10px 30px 10px 15px; + margin-bottom: -1px; + border: 1px solid #dddddd; +} + +.list-group-item:first-child { + border-top-right-radius: 4px; + border-top-left-radius: 4px; +} + +.list-group-item:last-child { + margin-bottom: 0; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; +} + +.list-group-item-heading { + margin-top: 0; + margin-bottom: 5px; +} + +.list-group-item-text { + margin-bottom: 0; + line-height: 1.3; +} + +a.list-group-item .list-group-item-heading { + color: #333; +} + +a.list-group-item .list-group-item-text { + color: #555; +} + +a.list-group-item:hover, +a.list-group-item:focus { + text-decoration: none; + background-color: #f5f5f5; +} + +a.list-group-item.active { + z-index: 2; + color: #ffffff; + background-color: #428bca; + border-color: #428bca; +} + +a.list-group-item.active .list-group-item-heading, +a.list-group-item.active .list-group-item-text { + color: inherit; +} + +.list-group-item > .badge, +.list-group-item > .glyphicon-chevron-right { + float: right; + margin-right: -15px; +} + +.list-group-item > .glyphicon-chevron-right { + margin-right: -15px; +} + +.list-group-item > .glyphicon + .badge { + margin-right: 5px; +} + .panel { padding: 15px; margin-bottom: 20px; @@ -3006,6 +3080,23 @@ fieldset[disabled] .btn-link:focus { border-color: #bce8f1; } +.list-group-flush { + margin: 15px -15px -15px; +} + +.list-group-flush .list-group-item { + border-width: 1px 0; +} + +.list-group-flush .list-group-item:first-child { + border-top-right-radius: 0; + border-top-left-radius: 0; +} + +.list-group-flush .list-group-item:last-child { + border-bottom: 0; +} + .well { min-height: 20px; padding: 19px; diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 181a3a734..e1fd6a2b4 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -311,6 +311,7 @@ section > ul li { .bs-docs-example > .jumbotron:last-child, .bs-docs-example > .alert:last-child, .bs-docs-example > .panel:last-child, +.bs-docs-example > .list-group:last-child, .bs-docs-example > .well:last-child { margin-bottom: 0; } @@ -339,6 +340,10 @@ section > ul li { margin: 0; } +/* List groups */ +.bs-docs-example > .list-group { + max-width: 400px; +} /* Navbar examples */ .bs-navbar-top-example, diff --git a/docs/docs.html b/docs/docs.html index 7603d2ccc..844a467d2 100644 --- a/docs/docs.html +++ b/docs/docs.html @@ -4369,6 +4369,172 @@ For example, <section> should be wrapped as inline. + +
    + +

    List groups are a flexible and powerful component for displaying not only simple lists of elements, but complex ones with custom content.

    + +

    Basic list group

    +

    The most basic list group is simply an unordered list with list items, and the proper classes. Build upon it with the options that follow, or your own CSS as needed.

    +
    +
      +
    • Cras justo odio
    • +
    • Dapibus ac facilisis in
    • +
    • Morbi leo risus
    • +
    • Porta ac consectetur ac
    • +
    • Vestibulum at eros
    • +
    +
    +{% highlight html linenos %} +
      +
    • Cras justo odio
    • +
    • Dapibus ac facilisis in
    • +
    • Morbi leo risus
    • +
    • Porta ac consectetur ac
    • +
    • Vestibulum at eros
    • +
    +{% endhighlight %} + +

    With chevrons

    +

    Adding Glyphicon chevrons are automatically moved to the right.

    +
    +
      +
    • + + Cras justo odio +
    • +
    • + + Dapibus ac facilisis in +
    • +
    • + + Morbi leo risus +
    • +
    +
    +{% highlight html linenos %} +
      +
    • + + Cras justo odio +
    • +
    +{% endhighlight %} + +

    With badges

    +

    Add the badges component to any list group item and it will automatically be positioned on the right.

    +
    +
      +
    • + 14 + Cras justo odio +
    • +
    • + 2 + Dapibus ac facilisis in +
    • +
    • + 1 + Morbi leo risus +
    • +
    +
    +{% highlight html linenos %} +
      +
    • + 14 + Cras justo odio +
    • +
    +{% endhighlight %} + +

    With badges and chevrons

    +

    Why not both?

    +
    +
      +
    • + + 14 + Cras justo odio +
    • +
    • + + 2 + Dapibus ac facilisis in +
    • +
    • + + 1 + Morbi leo risus +
    • +
    +
    +{% highlight html linenos %} +
      +
    • + + 14 + Cras justo odio +
    • +
    +{% endhighlight %} + +

    Linked list group

    +

    Linkify list group items by using anchor tags instead of list items (that also means a parent <div> instead of an <ul>. No need for individual parents around each element.

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

    Custom content

    +

    Add nearly any HTML within, even for linked list groups like the one below.

    + +{% highlight html linenos %} + +{% endhighlight %} +
    + + + +
    @@ -4430,6 +4596,31 @@ For example, <section> should be wrapped as inline.
    ...
    ...
    ...
    +{% endhighlight %} + +

    With list groups

    +

    Easily include full-width list groups within any panel.

    +
    +
    + +
    Panel heading
    +

    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
    • +
    • Porta ac consectetur ac
    • +
    • Vestibulum at eros
    • +
    +
    +
    +{% highlight html linenos %} +
    +
    Panel heading
    + Panel content +
    {% endhighlight %}
    -- cgit v1.2.3 From 1683669eaa75555e1454105460ed6b7bcaca9f11 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 16:56:49 -0700 Subject: Remove .nav-list given new .list-group --- docs/_includes/docs-nav.html | 1 - docs/assets/css/bootstrap.css | 26 +------------------------- docs/docs.html | 29 ++++++----------------------- 3 files changed, 7 insertions(+), 49 deletions(-) (limited to 'docs') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index 652b845cd..1eccba357 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -107,7 +107,6 @@
    -- cgit v1.2.3 From 6edd5f291aba8f66816fe2ca1dfb61daeaab0efe Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 17:00:11 -0700 Subject: not quite #fff on .list-group-item-text --- docs/assets/css/bootstrap.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 8e5a3dbc5..dadd15845 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2999,11 +2999,14 @@ a.list-group-item.active { border-color: #428bca; } -a.list-group-item.active .list-group-item-heading, -a.list-group-item.active .list-group-item-text { +a.list-group-item.active .list-group-item-heading { color: inherit; } +a.list-group-item.active .list-group-item-text { + color: #e1edf7; +} + .list-group-item > .badge, .list-group-item > .glyphicon-chevron-right { float: right; -- cgit v1.2.3 From e560c41ed107cbaf00baf5082ffb18ac015afa4d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 17:00:43 -0700 Subject: simpler nav links --- docs/_includes/docs-nav.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index 1eccba357..e87bea2b7 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -166,9 +166,9 @@ List group
    {% highlight html linenos %} -
    +
    +
    +
    @@ -368,7 +347,7 @@ body {
    - +

    First featurette headling. It'll blow your mind.

    Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.

    @@ -376,7 +355,7 @@ body {
    - +

    Oh yeah, it's that good. See for yourself.

    Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.

    @@ -384,7 +363,7 @@ body {
    - +

    And lastly, this one. Checkmate.

    Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.

    -- cgit v1.2.3 From c69310153e5eec18f67df1df60c38ed807a75637 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 31 Mar 2013 19:26:40 -0700 Subject: Fixes #7438: remove max-height from justified nav tabs with some CSS wankery --- docs/assets/css/bootstrap.css | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f35962995..c59d1aae7 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3250,7 +3250,7 @@ button.close { } .nav-justified { - max-height: 40px; + width: 100%; } .nav-justified > li { @@ -3260,6 +3260,22 @@ button.close { text-align: center; } +.nav-justified.nav-tabs { + border-bottom: 0; +} + +.nav-justified.nav-tabs > li > a { + border-bottom: 1px solid #ddd; +} + +.nav-justified.nav-tabs > .active > a { + border-bottom-color: #ffffff; +} + +.nav-justified > li > a { + margin-right: 0; +} + .nav > .disabled > a { color: #999999; } -- cgit v1.2.3 From 0fbfa167e1e6ab8321f32fd050b655e8ccc8e467 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 31 Mar 2013 19:55:05 -0700 Subject: fix text class in docs --- docs/docs.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/docs.html b/docs/docs.html index ecdeb64b7..88f272c15 100644 --- a/docs/docs.html +++ b/docs/docs.html @@ -567,13 +567,13 @@ title: Bootstrap Documentation

    Fusce dapibus, tellus ac cursus commodo, tortor mauris nibh.

    Etiam porta sem malesuada magna mollis euismod.

    -

    Donec ullamcorper nulla non metus auctor fringilla.

    +

    Donec ullamcorper nulla non metus auctor fringilla.

    Duis mollis, est non commodo luctus, nisi erat porttitor ligula.

    {% highlight html linenos %}

    ...

    ...

    -

    ...

    +

    ...

    ...

    {% endhighlight %} -- cgit v1.2.3 From 2f8deea95ac246455a11511963ded2b63e963922 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 31 Mar 2013 22:22:52 -0700 Subject: add .panel-primary --- docs/assets/css/bootstrap.css | 10 ++++++++++ docs/docs.html | 5 +++++ 2 files changed, 15 insertions(+) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c59d1aae7..76b5ec31d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3033,6 +3033,16 @@ a.list-group-item.active .list-group-item-text { border-top-left-radius: 3px; } +.panel-primary { + border-color: #428bca; +} + +.panel-primary .panel-heading { + color: #ffffff; + background-color: #428bca; + border-color: #428bca; +} + .panel-success { border-color: #d6e9c6; } diff --git a/docs/docs.html b/docs/docs.html index 88f272c15..94826ffde 100644 --- a/docs/docs.html +++ b/docs/docs.html @@ -4578,6 +4578,10 @@ For example, <section> should be wrapped as inline.

    Contextual alternatives

    Like other components, easily make a panel more meaningful to a particular context by adding any of the contextual state classes.

    +
    +
    Panel heading
    + Panel content +
    Panel heading
    Panel content @@ -4596,6 +4600,7 @@ For example, <section> should be wrapped as inline.
    {% highlight html linenos %} +
    ...
    ...
    ...
    ...
    -- cgit v1.2.3 From d8b3e48e1450bc0c49548c6cbd1139f7910b1c00 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 31 Mar 2013 22:58:01 -0700 Subject: add proper markup to list group in panels section --- docs/docs.html | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/docs.html b/docs/docs.html index 94826ffde..ad944f630 100644 --- a/docs/docs.html +++ b/docs/docs.html @@ -4627,8 +4627,18 @@ For example, <section> should be wrapped as inline.
    {% highlight html linenos %}
    +
    Panel heading
    - Panel content +

    ...

    + + +
      +
    • Cras justo odio
    • +
    • Dapibus ac facilisis in
    • +
    • Morbi leo risus
    • +
    • Porta ac consectetur ac
    • +
    • Vestibulum at eros
    • +
    {% endhighlight %} -- cgit v1.2.3 From 9df6dc81b57cb710c1e623c4e06c39954fc82280 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Apr 2013 00:02:51 -0700 Subject: bring in customizing bootstrap section from old gist --- docs/_includes/docs-nav.html | 1 + docs/docs.html | 75 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) (limited to 'docs') diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html index e87bea2b7..f4caabc5c 100644 --- a/docs/_includes/docs-nav.html +++ b/docs/_includes/docs-nav.html @@ -6,6 +6,7 @@
  • Getting started
  • What's included
  • Templates and examples
  • +
  • Customizing Bootstrap
  • CSS
  • diff --git a/docs/docs.html b/docs/docs.html index ad944f630..4460506d3 100644 --- a/docs/docs.html +++ b/docs/docs.html @@ -191,6 +191,81 @@ title: Bootstrap Documentation +
    + +

    Customizing Bootstrap is best accomplished when you treat it as another dependency in your development stack. Doing so ensures future upgrades are as easy as possible while also exposing you to the intricacies of the framework.

    +

    Side note: While not recommended for folks new to Bootstrap, you may use one of two alternate methods for customization. The first is modifying the source .less files (making upgrades super difficult), and the second is mapping source Less code to your own classes via mixins. For the time being, neither options are documented here.

    + +

    Bootstrap as a dependency

    +

    The best way to become familiar with Bootstrap's CSS, ensure straightforward updates, and provide flexible options to minimize code bloat, we recommend you get started by including a vanilla version of Bootstrap.

    + +

    Get your templates ready

    +

    Download the latest master release and snag the compiled (bootstrap.css) or minified (bootstrap.min.css) versions. As documented above, include one of them in your <head> along with a separate blank CSS file for your own modifications. Alternatively you may use one of the example templates for a quicker start.

    + +

    Compiled or minified?

    +

    Unless you plan on reading a good chunk of the compiled CSS, go with the minified. It's the same code, just compacted. Less bandwidth is good, especially in production environments.

    + +

    From there, include whatever Bootstrap components and content you need to get you going. It's best to have a rough idea in mind of modifications to make and content to include, so be sure to spend a brief amount of time on that before moving on.

    + +

    Customizing components

    +

    Here comes the good part: customizing Bootstrap's components to suite your own needs. There are varying degrees to this, but the two most common are light customizations and complete visual overhauls. Luckily, there are plenty of examples of both of those.

    +

    We define light customizations as mostly surface layer changes, things like a color and font changes to existing Bootstrap components. A great example of this is the the Twitter Translation Center (coded by @mdo). Let's look at how to implement the custom button we wrote for this site, .btn-ttc.

    +

    Instead of using the provided Bootstrap buttons, which only require just one class to start, .btn, we'll add our own modifier class, .btn-ttc. This will give us a slightly custom look with minimal effort.

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

    In the custom stylesheet, add the following CSS:

    + +{% highlight css linenos %} +/* Custom button +-------------------------------------------------- */ + +/* Override base .btn styles */ +/* Apply text and background changes to three key states: default, hover, and active (click). */ +.btn-ttc, +.btn-ttc:hover, +.btn-ttc:active { + color: white; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #007da7; +} + +/* Apply the custom-colored gradients */ +/* Note: you'll need to include all the appropriate gradients for various browsers and standards. */ +.btn-ttc { + background-repeat: repeat-x; + background-image: linear-gradient(top, #009ED2 0%, #007DA7 100%); + ... +} + +/* Set the hover state */ +/* An easy hover state is just to move the gradient up a small amount. Add other embellishments as you see fit. */ +.btn-ttc:hover { + background-position: 0 -15px; +} +{% endhighlight %} + +

    Customizing Bootstrap components takes time, but should be straightforward. Look to the source code often and duplicate the selectors you need for your modifications. Placing them after the Bootstrap source makes for easy overriding without complication. To recap, here's the basic workflow:

    +
      +
    • For each element you want to customize, find its code in the compiled Bootstrap CSS. Copy and paste the selector for a component as-is. For instance, to customize the navbar background, just snag .navbar.
    • +
    • Add all your custom CSS in a separate stylesheet using the selectors you just copied from the Bootstrap source. No need for prefacing with additional classes or using !important here.
    • +
    • Rinse and repeat until you're happy with your customizations.
    • +
    +

    Going beyond light customizations and into visual overhauls is just as easy as the above custom button. For a site like Karma, which use Bootstrap as a reset of sorts with heavy modifications, more extensive work is involved, but well worth it in the end.

    + +

    Removing potential bloat

    +

    Not all sites and applications need to make use of everything Bootstrap has to offer, especially in production environments where bandwidth becomes more of a financial issue. We encourage folks to remove whatever is unused with our Customizer.

    +

    **img**

    +

    Using the Customizer, simply uncheck any component, feature, or asset you don't need. Hit download and swap out the default Bootstrap files with these newly customized ones. You'll get vanilla Bootstrap, but without the features *you* deem unnecessary. All custom builds include compiled and minified versions, so use whichever works for you.

    + +
    + + + +

    CSS

    -- cgit v1.2.3 From 7bee10a5ef240cd6dc738998b8ff64dd75df3804 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Apr 2013 00:11:47 -0700 Subject: oops, restore customizer --- docs/customize.html | 358 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 358 insertions(+) create mode 100644 docs/customize.html (limited to 'docs') diff --git a/docs/customize.html b/docs/customize.html new file mode 100644 index 000000000..61a789b1a --- /dev/null +++ b/docs/customize.html @@ -0,0 +1,358 @@ +--- +layout: default +title: Customize and download +--- + + + +
    + + +
    +
    + +
    +
    +

    Scaffolding

    + + + + + +

    Base CSS

    + + + + + + + +
    +
    +

    Components

    + + + + + + + + + + + +

    JS Components

    + + + + + + +
    +
    +

    Miscellaneous

    + + + + +

    Responsive

    + + + + + +
    +
    +
    + +
    + +
    +
    + + + + + + + +
    +
    + + + + + + +
    +
    +

    Heads up!

    +

    All checked plugins will be compiled into a single file, bootstrap.js. All plugins require the latest version of jQuery to be included.

    +
    +
    +
    + + +
    + +
    +
    +

    Scaffolding

    + + + + + +

    Links

    + + + + + +

    Grid system

    + + + + + + + + + + + + + + + +
    +
    + +

    Typography

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    Tables

    + + + + + + + + + +

    Forms

    + + + + + + + + + + + + + + + + + +
    +
    + +

    Form states & alerts

    + + + + + + + + + + + + + + + + + +

    Navbar

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    Dropdowns

    + + + + + + + + + + +
    +
    +
    + +
    + +
    + Customize and Download +

    What's included?

    +

    Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.

    +
    +
    +
    + + +
    -- cgit v1.2.3 From 19d5e616685cc0ad72c216e04a69758bf0ed67bf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Apr 2013 00:34:58 -0700 Subject: clearer separation with section headers; simpler customizing copy --- docs/assets/css/docs.css | 14 ++++++++++++-- docs/docs.html | 29 +++++++++++++++-------------- 2 files changed, 27 insertions(+), 16 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b5f565cd3..fc653277e 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -48,6 +48,16 @@ body { bottom: 15px; } +/* Side notes for calling out things */ +.bs-docs-sidenote { + margin: 20px 0; + padding: 15px 30px 15px 15px; + background-color: #fcf2f2; + border-left: 5px solid #df7c7b; +} +.bs-docs-sidenote p:last-child { + margin-bottom: 0; +} /* Sections @@ -75,13 +85,13 @@ section > ul li { .bs-docs-section-header { padding-top: 60px; - color: #8a8a8a; + color: #b94a48; + border-bottom: 5px solid #b94a48; } .bs-docs-section-header h1 { font-size: 80px; font-size: 8rem; line-height: 1; - color: #b94a48; } /* Base class */ diff --git a/docs/docs.html b/docs/docs.html index 4460506d3..1af0f367b 100644 --- a/docs/docs.html +++ b/docs/docs.html @@ -195,22 +195,19 @@ title: Bootstrap Documentation -

    Customizing Bootstrap is best accomplished when you treat it as another dependency in your development stack. Doing so ensures future upgrades are as easy as possible while also exposing you to the intricacies of the framework.

    -

    Side note: While not recommended for folks new to Bootstrap, you may use one of two alternate methods for customization. The first is modifying the source .less files (making upgrades super difficult), and the second is mapping source Less code to your own classes via mixins. For the time being, neither options are documented here.

    +

    Customizing Bootstrap is best accomplished when you treat it as another dependency in your development stack. Doing so ensures future upgrades are as easy as possible while also familiarizing yourself to the intricacies of the framework.

    -

    Bootstrap as a dependency

    -

    The best way to become familiar with Bootstrap's CSS, ensure straightforward updates, and provide flexible options to minimize code bloat, we recommend you get started by including a vanilla version of Bootstrap.

    +

    Once you've downloaded and included Bootstrap's CSS into your templates, you can move on to customizing the included components. To do so, create a new stylesheet (LESS, if you like, or just plain CSS) to house your customizations.

    -

    Get your templates ready

    -

    Download the latest master release and snag the compiled (bootstrap.css) or minified (bootstrap.min.css) versions. As documented above, include one of them in your <head> along with a separate blank CSS file for your own modifications. Alternatively you may use one of the example templates for a quicker start.

    - -

    Compiled or minified?

    -

    Unless you plan on reading a good chunk of the compiled CSS, go with the minified. It's the same code, just compacted. Less bandwidth is good, especially in production environments.

    +
    +

    Compiled or minified?

    +

    Unless you plan on reading a good chunk of the compiled CSS, go with the minified. It's the same code, just compacted. Less bandwidth is good, especially in production environments.

    +
    -

    From there, include whatever Bootstrap components and content you need to get you going. It's best to have a rough idea in mind of modifications to make and content to include, so be sure to spend a brief amount of time on that before moving on.

    +

    From there, include whatever Bootstrap components and HTML content you need to get your template setup. It's best to have a rough idea in mind of modifications to make and content to include, so be sure to spend a brief amount of time on that before moving on.

    Customizing components

    -

    Here comes the good part: customizing Bootstrap's components to suite your own needs. There are varying degrees to this, but the two most common are light customizations and complete visual overhauls. Luckily, there are plenty of examples of both of those.

    +

    There are varying degrees to customizing components, but most fall into two camps: light customizations and complete visual overhauls. Luckily, there are plenty of examples of both.

    We define light customizations as mostly surface layer changes, things like a color and font changes to existing Bootstrap components. A great example of this is the the Twitter Translation Center (coded by @mdo). Let's look at how to implement the custom button we wrote for this site, .btn-ttc.

    Instead of using the provided Bootstrap buttons, which only require just one class to start, .btn, we'll add our own modifier class, .btn-ttc. This will give us a slightly custom look with minimal effort.

    {% highlight html linenos %} @@ -248,16 +245,20 @@ title: Bootstrap Documentation } {% endhighlight %} -

    Customizing Bootstrap components takes time, but should be straightforward. Look to the source code often and duplicate the selectors you need for your modifications. Placing them after the Bootstrap source makes for easy overriding without complication. To recap, here's the basic workflow:

    +

    Customizing Bootstrap components takes time, but should be straightforward. Look to the source code often and duplicate the selectors you need for your modifications. Placing them after the Bootstrap source makes for easy overriding without complication. To recap, here's the basic workflow:

    • For each element you want to customize, find its code in the compiled Bootstrap CSS. Copy and paste the selector for a component as-is. For instance, to customize the navbar background, just snag .navbar.
    • Add all your custom CSS in a separate stylesheet using the selectors you just copied from the Bootstrap source. No need for prefacing with additional classes or using !important here.
    • Rinse and repeat until you're happy with your customizations.
    -

    Going beyond light customizations and into visual overhauls is just as easy as the above custom button. For a site like Karma, which use Bootstrap as a reset of sorts with heavy modifications, more extensive work is involved, but well worth it in the end.

    +

    Going beyond light customizations and into visual overhauls is just as straightforward as the above custom button. For a site like Karma, which uses Bootstrap as a CSS reset with heavy modifications, more extensive work is involved, but well worth it in the end.

    + +
    +

    Side note: While not recommended for folks new to Bootstrap, you may use one of two alternate methods for customization. The first is modifying the source .less files (making upgrades super difficult), and the second is mapping source Less code to your own classes via mixins. For the time being, neither options are documented here.

    +

    Removing potential bloat

    -

    Not all sites and applications need to make use of everything Bootstrap has to offer, especially in production environments where bandwidth becomes more of a financial issue. We encourage folks to remove whatever is unused with our Customizer.

    +

    Not all sites and applications need to make use of everything Bootstrap has to offer, especially in production environments where bandwidth literally becomes a financial issue. We encourage folks to remove whatever is unused with our Customizer.

    **img**

    Using the Customizer, simply uncheck any component, feature, or asset you don't need. Hit download and swap out the default Bootstrap files with these newly customized ones. You'll get vanilla Bootstrap, but without the features *you* deem unnecessary. All custom builds include compiled and minified versions, so use whichever works for you.

    -- cgit v1.2.3 From e183dd46a20daa725fe5ad7acb5313d7b20db6f1 Mon Sep 17 00:00:00 2001 From: Robert Burns Date: Mon, 1 Apr 2013 09:27:49 -0400 Subject: Update carousel-caption btn styles --- docs/examples/carousel.html | 2 -- 1 file changed, 2 deletions(-) (limited to 'docs') diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index 0c50c7a14..e97d895c2 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -91,8 +91,6 @@ body { .carousel-caption .lead { margin: 0; line-height: 1.25; - color: #fff; - text-shadow: 0 1px 1px rgba(0,0,0,.4); } .carousel-caption .btn { margin-top: 10px; -- cgit v1.2.3 From 1816483baa9de59dc1ea0cec67fcbd00b28c6b79 Mon Sep 17 00:00:00 2001 From: Robert Burns Date: Mon, 1 Apr 2013 09:29:43 -0400 Subject: Add carousel indicators to example --- docs/examples/carousel.html | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'docs') diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index e97d895c2..925314922 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -273,6 +273,12 @@ body { -- cgit v1.2.3 From e6d6fcffb0491534201e23867fffdc53b4568fab Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Apr 2013 12:09:49 -0700 Subject: button for navbar toggle --- docs/docs.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/docs.html b/docs/docs.html index d27c6e223..a8f55d948 100644 --- a/docs/docs.html +++ b/docs/docs.html @@ -3506,11 +3506,11 @@ For example, <section> should be wrapped as inline.

    Pin a fixed-height footer to the bottom of the viewport in desktop browsers with this custom HTML and CSS.

    -

    Use the sticky footer with a fixed navbar if need be, too.

    +

    Use the sticky footer with a fixed navbar if need be, too.

    -- cgit v1.2.3 From e0bce6af123fc3d935a34aae87d0787e7e54e07f Mon Sep 17 00:00:00 2001 From: Fabien Date: Tue, 2 Apr 2013 13:30:13 +0200 Subject: Replace png img by holder.js in carousel example --- docs/examples/carousel.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'docs') diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index be75a5cc3..538a440da 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -245,7 +245,7 @@ body {