diff options
| author | Gleb Mazovetskiy <[email protected]> | 2015-08-31 13:03:09 +0100 |
|---|---|---|
| committer | Gleb Mazovetskiy <[email protected]> | 2015-08-31 13:03:09 +0100 |
| commit | 33a510c63c9a898d68da807205afbbb8e1dfce16 (patch) | |
| tree | c953ef46e464dd1556c3b11fab8b10b300bc8b29 /docs/components | |
| parent | 8941bdfbda237bed621935cac439520eddc79150 (diff) | |
| parent | c7d8e7a0777da91df2359655a7132e2b55482c0a (diff) | |
| download | bootstrap-33a510c63c9a898d68da807205afbbb8e1dfce16.tar.xz bootstrap-33a510c63c9a898d68da807205afbbb8e1dfce16.zip | |
Merge pull request #17402 from twbs/pr-14552-v4
Accept elements as the tooltip / popover content
Diffstat (limited to 'docs/components')
| -rw-r--r-- | docs/components/popovers.md | 4 | ||||
| -rw-r--r-- | docs/components/tooltips.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/components/popovers.md b/docs/components/popovers.md index 98672d23e..f48d860ea 100644 --- a/docs/components/popovers.md +++ b/docs/components/popovers.md @@ -193,7 +193,7 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap </tr> <tr> <td>content</td> - <td>string | function</td> + <td>string | element | function</td> <td>''</td> <td> <p>Default content value if <code>data-content</code> attribute isn't present.</p> @@ -245,7 +245,7 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap </tr> <tr> <td>title</td> - <td>string | function</td> + <td>string | element | function</td> <td>''</td> <td> <p>Default title value if <code>title</code> attribute isn't present.</p> diff --git a/docs/components/tooltips.md b/docs/components/tooltips.md index 65bd2703b..f2936469b 100644 --- a/docs/components/tooltips.md +++ b/docs/components/tooltips.md @@ -203,7 +203,7 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap </tr> <tr> <td>title</td> - <td>string | function</td> + <td>string | element | function</td> <td>''</td> <td> <p>Default title value if <code>title</code> attribute isn't present.</p> |