diff --git a/web_timeline/static/lib/vis/vis.css b/web_timeline/static/lib/vis/vis.css index 5f0f38ea4588..5affd282dbfd 100644 --- a/web_timeline/static/lib/vis/vis.css +++ b/web_timeline/static/lib/vis/vis.css @@ -807,4 +807,5 @@ div.network-tooltip { border: 1px solid; box-shadow: 3px 3px 10px rgba(128, 128, 128, 0.5); -} \ No newline at end of file +} + diff --git a/web_timeline/static/lib/vis/vis.js b/web_timeline/static/lib/vis/vis.js index 95c66084a25d..729de227a58d 100644 --- a/web_timeline/static/lib/vis/vis.js +++ b/web_timeline/static/lib/vis/vis.js @@ -8730,8 +8730,9 @@ return /******/ (function(modules) { // webpackBootstrap * @return {boolean} true if a and b collide, else false */ exports.collision = function(a, b, margin) { - return ((a.left - margin.horizontal + EPSILON) < (b.left + b.width) && - (a.left + a.width + margin.horizontal - EPSILON) > b.left && + + return ((a.data.start) < (b.data.end) && + (a.data.end) > b.data.start && (a.top - margin.vertical + EPSILON) < (b.top + b.height) && (a.top + a.height + margin.vertical - EPSILON) > b.top); }; @@ -35662,4 +35663,6 @@ return /******/ (function(modules) { // webpackBootstrap /***/ } /******/ ]) }); -; \ No newline at end of file + +; + diff --git a/web_timeline/static/src/css/web_timeline.css b/web_timeline/static/src/css/web_timeline.css index 79cbed61d189..4bb40e9ace27 100644 --- a/web_timeline/static/src/css/web_timeline.css +++ b/web_timeline/static/src/css/web_timeline.css @@ -30,7 +30,18 @@ } */ .vis.timeline .item.range .content { + display:block; + overflow: hidden; +} +.vis.timeline .item.range:hover .content { + display:inline-block; + float: left; + clear: both; + max-width: none; + background-color:rgba(255, 255, 255, 0.8); overflow: visible; + z-index:100; + } .oe_chatter_toggle {