aboutsummaryrefslogtreecommitdiff
path: root/docs/_includes/components/panels.html
diff options
context:
space:
mode:
authorfat <[email protected]>2014-06-23 23:08:23 -0700
committerfat <[email protected]>2014-06-23 23:08:23 -0700
commit0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3 (patch)
tree7b88c388d526ada7b564f1faf44cda92276f2722 /docs/_includes/components/panels.html
parentf071549c8408241b88a95192e477816d2402eb6e (diff)
parentb31c35b63629ec750f338a646f6b730bd675b734 (diff)
downloadbootstrap-0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3.tar.xz
bootstrap-0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3.zip
Merge branch 'master' into fix-13386
Conflicts: js/carousel.js
Diffstat (limited to 'docs/_includes/components/panels.html')
-rw-r--r--docs/_includes/components/panels.html1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/_includes/components/panels.html b/docs/_includes/components/panels.html
index b00cd0f72..acf32c51c 100644
--- a/docs/_includes/components/panels.html
+++ b/docs/_includes/components/panels.html
@@ -22,6 +22,7 @@
<h3 id="panels-heading">Panel with heading</h3>
<p>Easily add a heading container to your panel with <code>.panel-heading</code>. You may also include any <code>&lt;h1&gt;</code>-<code>&lt;h6&gt;</code> with a <code>.panel-title</code> class to add a pre-styled heading.</p>
+ <p>For proper link coloring, be sure to place links in headings within <code>.panel-title</code>.</p>
<div class="bs-example">
<div class="panel panel-default">
<div class="panel-heading">Panel heading without title</div>