diff options
| author | Mark Otto <[email protected]> | 2014-09-17 15:21:31 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-09-17 15:21:31 -0700 |
| commit | 9f2aeafe851bdca522b886c29afcece1ee0060e1 (patch) | |
| tree | be13d5ce0d68631543f28af8d9b444a7bd44917e /docs/components/badges.md | |
| parent | 7d9f55c3d5dcc5b12882af96245dab27be5fa346 (diff) | |
| parent | c5c67d0f54674dede58fc924d4d7c0f1d65705d9 (diff) | |
| download | bootstrap-9f2aeafe851bdca522b886c29afcece1ee0060e1.tar.xz bootstrap-9f2aeafe851bdca522b886c29afcece1ee0060e1.zip | |
Merge branch 'master' into derp
Conflicts:
Gruntfile.js
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/fonts/glyphicons-halflings-regular.svg
docs/_includes/components/badges.html
docs/_includes/components/input-groups.html
docs/_includes/components/pagination.html
docs/_includes/css/forms.html
docs/_includes/footer.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/grunt.html
docs/_includes/home-nav.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/modal.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/_includes/nav/getting-started.html
docs/_includes/nav/javascript.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/browser-bugs.html
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/dist/fonts/glyphicons-halflings-regular.svg
fonts/glyphicons-halflings-regular.svg
less/_button-group.less
less/_jumbotron.less
less/_variables.less
less/mixins/vendor-prefixes.less
less/panels.less
less/thumbnails.less
package.json
Diffstat (limited to 'docs/components/badges.md')
| -rw-r--r-- | docs/components/badges.md | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/docs/components/badges.md b/docs/components/badges.md index 44368b783..0828f151d 100644 --- a/docs/components/badges.md +++ b/docs/components/badges.md @@ -29,23 +29,6 @@ Built-in styles are included for placing badges in active states in pill navigat <a class="nav-link" href="#">Messages <span class="badge">3</span></a> </li> </ul> -<ul class="nav nav-pills nav-stacked" role="tablist" style="max-width: 260px;"> - <li class="nav-item active" role="presentation"> - <a class="nav-link" href="#"> - <span class="badge pull-right">42</span> - Home - </a> - </li> - <li class="nav-item" role="presentation"> - <a class="nav-link" href="#">Profile</a> - </li> - <li class="nav-item" role="presentation"> - <a class="nav-link" href="#"> - <span class="badge pull-right">3</span> - Messages - </a> - </li> -</ul> {% endexample %} ### Buttons |