diff options
| author | Mark Otto <[email protected]> | 2014-01-16 20:01:28 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-16 20:01:28 -0800 |
| commit | 03f4534307988e0c46bd9ee5896977d0adcb7d41 (patch) | |
| tree | eea4b3644fdd12849cee60f77fd7144830d54547 /docs | |
| parent | 8eef0a47eec5db062609eeef72f46857bba099e0 (diff) | |
| parent | edb221a20ceabebd427e27d0432e94a227717217 (diff) | |
| download | bootstrap-03f4534307988e0c46bd9ee5896977d0adcb7d41.tar.xz bootstrap-03f4534307988e0c46bd9ee5896977d0adcb7d41.zip | |
Merge branch 'bo-tooltip-viewport' of https://github.com/benogle/bootstrap into benogle-bo-tooltip-viewport
Conflicts:
docs/javascript.html
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/javascript.html | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 2d8c0e7c6..9f8f8675c 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1015,6 +1015,22 @@ $('#example').tooltip(options) <p>Appends the tooltip to a specific element. Example: <code>container: 'body'</code></p> </td> </tr> + <tr> + <td>viewport</td> + <td>string</td> + <td>'body'</td> + <td> + <p>Keeps the tooltip within the bounds of this element. Example: <code>viewport: '#viewport'</code></p> + </td> + </tr> + <tr> + <td>viewportPadding</td> + <td>number</td> + <td>0</td> + <td> + <p>Pixel distance to keep the tooltip from the edges of the viewport element. Example: <code>viewportPadding: 10</code></p> + </td> + </tr> </tbody> </table> </div><!-- /.table-responsive --> |