aboutsummaryrefslogtreecommitdiff
path: root/docs/_includes
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-05-13 21:35:39 -0700
committerMark Otto <[email protected]>2015-05-13 21:35:39 -0700
commitc5babda02f7fc2143394bb3b11c5c4d2f9881341 (patch)
treea6d9cb5ae8cfdef754f89489e5bcf26ca61bf610 /docs/_includes
parent82279a8eb28fcddf24ecdf524686583e408b5191 (diff)
parentfa2cdd44bc0f0d739bcf91683f0288b0adc2bed1 (diff)
downloadbootstrap-c5babda02f7fc2143394bb3b11c5c4d2f9881341.tar.xz
bootstrap-c5babda02f7fc2143394bb3b11c5c4d2f9881341.zip
Merge pull request #16215 from zacechola/list_group_buttons
Adds button styles to `.list-group-item`
Diffstat (limited to 'docs/_includes')
-rw-r--r--docs/_includes/components/list-group.html21
-rw-r--r--docs/_includes/nav/components.html1
2 files changed, 22 insertions, 0 deletions
diff --git a/docs/_includes/components/list-group.html b/docs/_includes/components/list-group.html
index e95c9d485..607b1e661 100644
--- a/docs/_includes/components/list-group.html
+++ b/docs/_includes/components/list-group.html
@@ -76,6 +76,27 @@
</div>
{% endhighlight %}
+ <h2 id="list-group-buttons">Button items</h2>
+ <p>List group items may be buttons instead of list items (that also means a parent <code>&lt;div&gt;</code> instead of an <code>&lt;ul&gt;</code>). No need for individual parents around each element. <strong class="text-danger">Don't use the standard <code>.btn</code> classes here.</strong></p>
+ <div class="bs-example" data-example-id="list-group-btns">
+ <div class="list-group">
+ <button class="list-group-item">Cras justo odio</button>
+ <button class="list-group-item">Dapibus ac facilisis in</button>
+ <button class="list-group-item">Morbi leo risus</button>
+ <button class="list-group-item">Porta ac consectetur ac</button>
+ <button class="list-group-item">Vestibulum at eros</button>
+ </div>
+ </div>
+{% highlight html %}
+<div class="list-group">
+ <button class="list-group-item">Cras justo odio</button>
+ <button class="list-group-item">Dapibus ac facilisis in</button>
+ <button class="list-group-item">Morbi leo risus</button>
+ <button class="list-group-item">Porta ac consectetur ac</button>
+ <button class="list-group-item">Vestibulum at eros</button>
+</div>
+{% endhighlight %}
+
<h2 id="list-group-disabled">Disabled items</h2>
<p>Add <code>.disabled</code> to a <code>.list-group-item</code> to gray it out to appear disabled.</p>
<div class="bs-example" data-example-id="list-group-disabled">
diff --git a/docs/_includes/nav/components.html b/docs/_includes/nav/components.html
index 639066d65..1ec91b563 100644
--- a/docs/_includes/nav/components.html
+++ b/docs/_includes/nav/components.html
@@ -124,6 +124,7 @@
<li><a href="#list-group-basic">Basic example</a></li>
<li><a href="#list-group-badges">Badges</a></li>
<li><a href="#list-group-linked">Linked items</a></li>
+ <li><a href="#list-group-buttons">Button items</a></li>
<li><a href="#list-group-disabled">Disabled items</a></li>
<li><a href="#list-group-contextual-classes">Contextual classes</a></li>
<li><a href="#list-group-custom-content">Custom content</a></li>