From 3cb38197f2ce2453f88a01a69a5f26e84d1e6d16 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Aug 2013 14:27:21 -0700 Subject: [PATCH 1/2] more specific panel titles and docs notes --- components.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components.html b/components.html index 815bd5d89b..e7b6bf70d4 100644 --- a/components.html +++ b/components.html @@ -2403,7 +2403,7 @@ body { padding-bottom: 70px; }

Easily add a heading container to your panel with .panel-heading. You may also include any <h1>-<h6> with a .panel-title class to add a pre-styled heading.

-
Panel heading
+
Panel heading without title
Panel content
@@ -2419,7 +2419,7 @@ body { padding-bottom: 70px; }
{% highlight html %}
-
Panel heading
+
Panel heading without title
Panel content
@@ -2436,7 +2436,7 @@ body { padding-bottom: 70px; } {% endhighlight %} -

Wrap buttons or secondary text in .panel-footer.

+

Wrap buttons or secondary text in .panel-footer. Note that panel footers do not inherit colors and borders when using contextual variations as they are not meant to be in the foreground.

From 3bcadfc2c560c5ecdb7fc943c34a721a49cb7309 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Aug 2013 14:42:55 -0700 Subject: [PATCH 2/2] brand, not title, in navbar examples --- components.html | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/components.html b/components.html index e7b6bf70d4..92f0dc4139 100644 --- a/components.html +++ b/components.html @@ -1138,14 +1138,13 @@ base_url: "../" - Title + Brand
@@ -1369,7 +1367,7 @@ body { padding-top: 70px; } - Title + Brand
@@ -1410,7 +1408,7 @@ body { padding-bottom: 70px; } - Title + Brand
@@ -1442,7 +1440,7 @@ body { padding-bottom: 70px; } - Title + Brand
@@ -1865,7 +1863,7 @@ body { padding-bottom: 70px; }

Thumbnail label

Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

-

Action Action

+

Button Button

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

Thumbnail label

Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

-

Action Action

+

Button Button

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

Thumbnail label

Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

-

Action Action

+

Button Button

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

Thumbnail label

...

-

Action Action

+

Button Button