diff options
| author | Mark Otto <[email protected]> | 2016-10-09 19:56:30 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-10-09 19:56:30 -0700 |
| commit | e7f79b32f22d7f39138a7003272b54ceb3b12426 (patch) | |
| tree | 71ff35b97bfa0231729fe1a963e83b60b8c5d972 /js/src | |
| parent | ef5bbffd558c63a49c3d64a471138b0e4f5bb660 (diff) | |
| parent | 8ef66df6d793afbda487c1a4505d0a6576252ec4 (diff) | |
| download | bootstrap-e7f79b32f22d7f39138a7003272b54ceb3b12426.tar.xz bootstrap-e7f79b32f22d7f39138a7003272b54ceb3b12426.zip | |
Merge branch 'tooltip-arrow' of https://github.com/brnrdog/bootstrap into brnrdog-tooltip-arrow
Diffstat (limited to 'js/src')
| -rw-r--r-- | js/src/popover.js | 4 | ||||
| -rw-r--r-- | js/src/tooltip.js | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/js/src/popover.js b/js/src/popover.js index 7ea560812..26ad988d4 100644 --- a/js/src/popover.js +++ b/js/src/popover.js @@ -28,7 +28,6 @@ const Popover = (($) => { trigger : 'click', content : '', template : '<div class="popover" role="tooltip">' - + '<div class="popover-arrow"></div>' + '<h3 class="popover-title"></h3>' + '<div class="popover-content"></div></div>' }) @@ -44,8 +43,7 @@ const Popover = (($) => { const Selector = { TITLE : '.popover-title', - CONTENT : '.popover-content', - ARROW : '.popover-arrow' + CONTENT : '.popover-content' } const Event = { diff --git a/js/src/tooltip.js b/js/src/tooltip.js index d012b2907..211110882 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -38,7 +38,6 @@ const Tooltip = (($) => { const Default = { animation : true, template : '<div class="tooltip" role="tooltip">' - + '<div class="tooltip-arrow"></div>' + '<div class="tooltip-inner"></div></div>', trigger : 'hover focus', title : '', |