diff options
| author | Mark Otto <[email protected]> | 2014-12-11 12:07:09 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-12-11 12:07:09 -0800 |
| commit | 2edc779391cf5da664e6a7edb3c4b1f736a8b3f3 (patch) | |
| tree | d4218beb3e45c77d4b505a50da72179baaa90773 /docs/components | |
| parent | 2a78159a2058b9dcfae208df85de672ce45436d5 (diff) | |
| parent | f7e103a6ac4163b301f772b186c04692f8810884 (diff) | |
| download | bootstrap-2edc779391cf5da664e6a7edb3c4b1f736a8b3f3.tar.xz bootstrap-2edc779391cf5da664e6a7edb3c4b1f736a8b3f3.zip | |
Merge branch 'v4' into scss-lint
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
scss/_card.scss
Diffstat (limited to 'docs/components')
| -rw-r--r-- | docs/components/label.md | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/docs/components/label.md b/docs/components/label.md index ae36a8fd4..e3c03bb93 100644 --- a/docs/components/label.md +++ b/docs/components/label.md @@ -30,8 +30,3 @@ Add any of the below mentioned modifier classes to change the appearance of a la <span class="label label-warning">Warning</span> <span class="label label-danger">Danger</span> {% endexample %} - -<div class="bs-callout bs-callout-info"> - <h4>Have tons of labels?</h4> - <p>Rendering problems can arise when you have dozens of inline labels within a narrow container, each containing its own <code>inline-block</code> element (like an icon). The way around this is setting <code>display: inline-block;</code>. For context and an example, <a href="https://github.com/twbs/bootstrap/issues/13219">see #13219</a>.</p> -</div> |