aboutsummaryrefslogtreecommitdiff
path: root/docs/templates
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-10-02 15:41:31 -0700
committerMark Otto <[email protected]>2012-10-02 15:41:31 -0700
commit7732d8b9b06d359be7096880135f9ff546a898a2 (patch)
tree9e599e550cef58ec65d2717dd74fb116ade2c683 /docs/templates
parent3bb9e0d7538f1899ed8681b6ca2ced65822a155a (diff)
parent630a88d3ce0dde6365e224d84353d3cf24defc18 (diff)
downloadbootstrap-7732d8b9b06d359be7096880135f9ff546a898a2.tar.xz
bootstrap-7732d8b9b06d359be7096880135f9ff546a898a2.zip
Merge branch '2.1.2-wip' into exploratory
Diffstat (limited to 'docs/templates')
-rw-r--r--docs/templates/pages/components.mustache2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 05a16a51c..cc4a0431d 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -648,7 +648,7 @@
</pre>
<h3>{{_i}}Disabled state{{/i}}</h3>
- <p>{{_i}}For any nav component (tabs, pills, or list), add <code>.disabled</code> for <strong>gray links and no hover effects</strong>. Links will remain clickable, however, unless custom JavaScript is implemented to prevent those clicks.{{/i}}</p>
+ <p>{{_i}}For any nav component (tabs, pills, or list), add <code>.disabled</code> for <strong>gray links and no hover effects</strong>. Links will remain clickable, however, unless you remove the <code>href</code> attribute. Alternatively, you could implement custom JavaScript to prevent those clicks.{{/i}}</p>
<div class="bs-docs-example">
<ul class="nav nav-pills">
<li><a href="#">{{_i}}Clickable link{{/i}}</a></li>