diff --git a/lib/timeline/component/ItemSet.js b/lib/timeline/component/ItemSet.js index 9bb8c0de..c609e806 100644 --- a/lib/timeline/component/ItemSet.js +++ b/lib/timeline/component/ItemSet.js @@ -364,7 +364,7 @@ ItemSet.prototype.show = function() { // show axis with dots if (!this.dom.axis.parentNode) { - this.body.dom.backgroundVertical.appendChild(this.dom.axis); + this.body.dom.top.appendChild(this.dom.axis); } // show labelset containing labels @@ -524,7 +524,7 @@ ItemSet.prototype.redraw = function() { this.dom.axis.style.top = asSize((orientation == 'top') ? (this.body.domProps.top.height + this.body.domProps.border.top) : (this.body.domProps.top.height + this.body.domProps.centerContainer.height)); - this.dom.axis.style.left = this.body.domProps.border.left + 'px'; + this.dom.axis.style.left = '0'; // check if this component is resized resized = this._isResized() || resized; diff --git a/lib/timeline/component/css/item.css b/lib/timeline/component/css/item.css index fd248b81..329fc9d4 100644 --- a/lib/timeline/component/css/item.css +++ b/lib/timeline/component/css/item.css @@ -12,7 +12,9 @@ .vis.timeline .item.selected { border-color: #FFC200; background-color: #FFF785; - z-index: 999; + + /* z-index must be higher than the z-index of custom time bar and current time bar */ + z-index: 2; } .vis.timeline .editable .item.selected { @@ -88,7 +90,6 @@ left: -4px; cursor: w-resize; - z-index: 10000; } .vis.timeline .item.range .drag-right { @@ -99,5 +100,4 @@ right: -4px; cursor: e-resize; - z-index: 10001; /* a little higher z-index than .drag-left */ } diff --git a/lib/timeline/component/css/itemset.css b/lib/timeline/component/css/itemset.css index b8f76203..498da3b4 100644 --- a/lib/timeline/component/css/itemset.css +++ b/lib/timeline/component/css/itemset.css @@ -18,8 +18,7 @@ position: absolute; width: 100%; height: 0; - left: 1px; - z-index: 1; + left: 0; } .vis.timeline .foreground .group {