diff options
| author | Mark Otto <[email protected]> | 2016-10-09 15:29:26 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-10-09 15:29:26 -0700 |
| commit | d212ff80aea9bc1e60c5622b1110284275c77015 (patch) | |
| tree | b5f718abafb1b02d0665a43c473ba666e35f4e08 /docs/components | |
| parent | 8d162553fa7fe499a72569d42debed18dfc5791b (diff) | |
| parent | 6e7bf66de9dd22772a60e774bd5cf62ee36d161a (diff) | |
| download | bootstrap-d212ff80aea9bc1e60c5622b1110284275c77015.tar.xz bootstrap-d212ff80aea9bc1e60c5622b1110284275c77015.zip | |
Merge branch 'v4-dev' of https://github.com/dumb/bootstrap into dumb-v4-dev
Diffstat (limited to 'docs/components')
| -rw-r--r-- | docs/components/tooltips.md | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/docs/components/tooltips.md b/docs/components/tooltips.md index 393406af1..0c8ec2155 100644 --- a/docs/components/tooltips.md +++ b/docs/components/tooltips.md @@ -86,6 +86,7 @@ Hover over the buttons below to see their tooltips. <button type="button" class="btn btn-secondary" data-toggle="tooltip" data-placement="right" title="Tooltip on right">Tooltip on right</button> <button type="button" class="btn btn-secondary" data-toggle="tooltip" data-placement="bottom" title="Tooltip on bottom">Tooltip on bottom</button> <button type="button" class="btn btn-secondary" data-toggle="tooltip" data-placement="left" title="Tooltip on left">Tooltip on left</button> + <button type="button" class="btn btn-secondary" data-toggle="tooltip" data-html="true" title="<em>Tooltip</em> <u>with</u> <b>HTML</b>">Tooltip with HTML</button> </div> </div> @@ -102,6 +103,9 @@ Hover over the buttons below to see their tooltips. <button type="button" class="btn btn-secondary" data-toggle="tooltip" data-placement="left" title="Tooltip on left"> Tooltip on left </button> +<button type="button" class="btn btn-secondary" data-toggle="tooltip" data-html="true" title="<em>Tooltip</em> <u>with</u> <b>HTML</b>"> + Tooltip with HTML +</button> {% endhighlight %} ## Usage @@ -180,7 +184,11 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap <td>html</td> <td>boolean</td> <td>false</td> - <td>Insert HTML into the tooltip. If false, jQuery's <code>text</code> method will be used to insert content into the DOM. Use text if you're worried about XSS attacks.</td> + <td> + <p>Allow HTML in the tooltip.</p> + <p>If true, HTML tags in the tooltip's <code>title</code> will be rendered in the tooltip. If false, jQuery's <code>text</code> method will be used to insert content into the DOM.</p> + <p>Use text if you're worried about XSS attacks.</p> + </td> </tr> <tr> <td>placement</td> |