diff options
| author | Mark Otto <[email protected]> | 2014-07-09 10:48:58 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-09 10:48:58 -0700 |
| commit | 41f3af407bab6c77f61b1d1fc8d3526f5276076f (patch) | |
| tree | cb9a982f2fc56ec1ce71849d37dc06b47d313cf3 /docs/_includes/components/badges.html | |
| parent | 0e47ce959ce6257c8fdde13b1362dbbe19fb56e3 (diff) | |
| parent | 87c9ce5333139eede2f02d6812c083a86db61cdf (diff) | |
| download | bootstrap-41f3af407bab6c77f61b1d1fc8d3526f5276076f.tar.xz bootstrap-41f3af407bab6c77f61b1d1fc8d3526f5276076f.zip | |
Merge branch 'derp' into derp_navs
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'docs/_includes/components/badges.html')
| -rw-r--r-- | docs/_includes/components/badges.html | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/docs/_includes/components/badges.html b/docs/_includes/components/badges.html index 95aea2e40..fe5cb9de2 100644 --- a/docs/_includes/components/badges.html +++ b/docs/_includes/components/badges.html @@ -43,9 +43,20 @@ </li> </ul> <br> - <button class="btn btn-primary" type="button"> - Messages <span class="badge">4</span> - </button> + <p> + <button class="btn btn-primary btn-lg" type="button"> + Large button <span class="badge">4</span> + </button> + <button class="btn btn-primary" type="button"> + Button <span class="badge">4</span> + </button> + <button class="btn btn-primary btn-sm" type="button"> + Small button <span class="badge">4</span> + </button> + <button class="btn btn-primary btn-xs" type="button"> + Extra small <span class="badge">4</span> + </button> + </p> </div> {% highlight html %} <ul class="nav nav-pills nav-stacked" role="tablist"> |