diff options
| author | bobzel <zzzman@gmail.com> | 2022-08-11 19:01:40 -0400 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2022-08-11 19:01:40 -0400 |
| commit | b4201e7178a7cb41fb213f643df8a210a14935c7 (patch) | |
| tree | 9ccac5898c11045151d48ab852faea6e0f19f59c | |
| parent | 081632757af3c2ec2e4482c1e5fe710c8ee6cad8 (diff) | |
| parent | 3c08d65a63e04d421954193742a49d539b842c20 (diff) | |
Merge branch 'master' of https://github.com/brown-dash/Dash-Web
| -rw-r--r-- | src/client/views/collections/CollectionStackedTimeline.scss | 1 | ||||
| -rw-r--r-- | src/client/views/collections/CollectionStackedTimeline.tsx | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/client/views/collections/CollectionStackedTimeline.scss b/src/client/views/collections/CollectionStackedTimeline.scss index 6611477e5..c296e1172 100644 --- a/src/client/views/collections/CollectionStackedTimeline.scss +++ b/src/client/views/collections/CollectionStackedTimeline.scss @@ -2,6 +2,7 @@ .collectionStackedTimeline-timelineContainer { height: 100%; + position: absolute; overflow-x: auto; overflow-y: hidden; border: none; diff --git a/src/client/views/collections/CollectionStackedTimeline.tsx b/src/client/views/collections/CollectionStackedTimeline.tsx index 48e3abbc7..2543624d3 100644 --- a/src/client/views/collections/CollectionStackedTimeline.tsx +++ b/src/client/views/collections/CollectionStackedTimeline.tsx @@ -668,7 +668,7 @@ export class CollectionStackedTimeline extends CollectionSubView<CollectionStack )} </div> </div> - <div className="timeline-hoverUI" style={{ left: `calc(${((this._hoverTime - this.clipStart) / this.clipDuration) * 100}%` }}> + <div className="timeline-hoverUI" style={{ left: ((this._hoverTime - this.clipStart) / this.clipDuration) * this.timelineContentWidth - this._scroll }}> <div className="hoverTime">{formatTime(this._hoverTime - this.clipStart)}</div> {this._thumbnail && <img className="videoBox-thumbnail" src={this._thumbnail} />} </div> |