Merge branch 'master' into sharing-jenny (break)

1 files changed, 11 insertions, 6 deletions

diff --git a/src/client/views/collections/CollectionStackedTimeline.scss b/src/client/views/collections/CollectionStackedTimeline.scss
index bb98e1c99..5a107d2ca 100644
--- a/src/client/views/collections/CollectionStackedTimeline.scss
+++ b/src/client/views/collections/CollectionStackedTimeline.scss
@@ -1,7 +1,8 @@
-@import "../global/globalCssVariables.scss";
+@import '../global/globalCssVariables.scss';
 
-.timeline-container {
+.collectionStackedTimeline-timelineContainer {
     height: 100%;
+    position: absolute;
     overflow-x: auto;
     overflow-y: hidden;
     border: none;
@@ -9,13 +10,14 @@
     border-width: 0 2px 0 2px;
 
     &:hover {
+        cursor: default;
         .collectionStackedTimeline-hover {
             display: block;
         }
     }
 }
 
-.timeline-container:hover + .timeline-hoverUI {
+.collectionStackedTimeline-timelineContainer:hover + .timeline-hoverUI {
     display: flex;
     justify-content: center;
 }
@@ -72,7 +74,8 @@
         border-width: 1px;
     }
 
-    .collectionStackedTimeline-current, .collectionStackedTimeline-hover {
+    .collectionStackedTimeline-current,
+    .collectionStackedTimeline-hover {
         width: 1px;
         height: 100%;
         position: absolute;
@@ -107,14 +110,15 @@
             height: 100%;
             width: 10px;
             pointer-events: all;
-            cursor: ew-resize;
             z-index: 100;
         }
         .collectionStackedTimeline-resizer {
             right: 0;
+            cursor: e-resize;
         }
         .collectionStackedTimeline-left-resizer {
             left: 0;
+            cursor: w-resize;
         }
     }
 
@@ -141,5 +145,6 @@
         transform: translate(0, -100%);
 
         font-weight: bold;
+        pointer-events: none;
     }
-}
\ No newline at end of file
+}