diff options
| author | Chris Rebert <[email protected]> | 2015-05-02 19:06:59 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2015-05-02 19:06:59 -0700 |
| commit | 7b9f204cb4b8fa5cb06b2a9233324997c093f629 (patch) | |
| tree | 661d85634fb021e81776e3fa5370d57d6c398b99 /docs | |
| parent | 0689117f1378c743e315474100713905de4e54ef (diff) | |
| parent | 75d6c14dc982300728a4c7016a9d7d856869bc3c (diff) | |
| download | bootstrap-7b9f204cb4b8fa5cb06b2a9233324997c093f629.tar.xz bootstrap-7b9f204cb4b8fa5cb06b2a9233324997c093f629.zip | |
Merge pull request #16411 from twbs/doc-16122
Doc that 'manual' is mutex of other tooltip/popover triggers
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/_includes/js/popovers.html | 2 | ||||
| -rw-r--r-- | docs/_includes/js/tooltips.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html index a782a1204..9e2532733 100644 --- a/docs/_includes/js/popovers.html +++ b/docs/_includes/js/popovers.html @@ -229,7 +229,7 @@ sagittis lacus vel augue laoreet rutrum faucibus."> <td>trigger</td> <td>string</td> <td>'click'</td> - <td>How popover is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space.</td> + <td>How popover is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space. <code>manual</code> cannot be combined with any other trigger.</td> </tr> <tr> <td>viewport</td> diff --git a/docs/_includes/js/tooltips.html b/docs/_includes/js/tooltips.html index 5b399a5f3..991c0c9c9 100644 --- a/docs/_includes/js/tooltips.html +++ b/docs/_includes/js/tooltips.html @@ -195,7 +195,7 @@ $('#example').tooltip(options) <td>trigger</td> <td>string</td> <td>'hover focus'</td> - <td>How tooltip is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space.</td> + <td>How tooltip is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space. <code>manual</code> cannot be combined with any other trigger.</td> </tr> <tr> <td>viewport</td> |