diff options
| author | Mark Otto <[email protected]> | 2014-01-22 15:37:11 -0600 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-22 15:37:11 -0600 |
| commit | e29a3b65cd61e5341447332a3b154a60c075dff9 (patch) | |
| tree | cbedf152a21a461b583a21483e9c0d1065991a7e /docs/components.html | |
| parent | d1f69d4a7e23abbe8cdbc6ff7e642c0f8d51e624 (diff) | |
| parent | 494014babe34f06dbf6fab9614c52c6cf83a59be (diff) | |
| download | bootstrap-e29a3b65cd61e5341447332a3b154a60c075dff9.tar.xz bootstrap-e29a3b65cd61e5341447332a3b154a60c075dff9.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'docs/components.html')
| -rw-r--r-- | docs/components.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/components.html b/docs/components.html index 2f562908c..510abcc66 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1149,7 +1149,7 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns, <h2 id="nav-disabled-links">Disabled links</h2> - <p>For any nav component (tabs, pills, or list), add <code>.disabled</code> for <strong>gray links and no hover effects</strong>.</p> + <p>For any nav component (tabs or pills), add <code>.disabled</code> for <strong>gray links and no hover effects</strong>.</p> <div class="bs-callout bs-callout-warning"> <h4>Link functionality not impacted</h4> @@ -1934,7 +1934,7 @@ body { padding-bottom: 70px; } </div> <h4>Adapts to active nav states</h4> - <p>Built-in styles are included for placing badges in active states in pill and list navigations.</p> + <p>Built-in styles are included for placing badges in active states in pill navigations.</p> <div class="bs-example"> <ul class="nav nav-pills"> <li class="active"><a href="#">Home <span class="badge">42</span></a></li> |