From 226f712d93b1bbcb53dac29698354634c8b62c18 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 8 Aug 2024 09:33:51 +0200
Subject: [PATCH] Improve chapter marker in control bar

---
 .../progress-bar-marker-component.ts          |  2 +-
 client/src/sass/player/control-bar.scss       | 49 +++++++++++++------
 2 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/client/src/assets/player/shared/control-bar/progress-bar-marker-component.ts b/client/src/assets/player/shared/control-bar/progress-bar-marker-component.ts
index 5dcd17440..c4d8b984a 100644
--- a/client/src/assets/player/shared/control-bar/progress-bar-marker-component.ts
+++ b/client/src/assets/player/shared/control-bar/progress-bar-marker-component.ts
@@ -20,7 +20,7 @@ export class ProgressBarMarkerComponent extends Component {
 
   createEl () {
     return videojs.dom.createEl('span', {
-      className: 'vjs-marker',
+      className: 'vjs-chapter-marker',
       style: `left: ${this.buildLeftStyle()}`
     }) as HTMLButtonElement
   }
diff --git a/client/src/sass/player/control-bar.scss b/client/src/sass/player/control-bar.scss
index cbf75e1c0..9f81d52c6 100644
--- a/client/src/sass/player/control-bar.scss
+++ b/client/src/sass/player/control-bar.scss
@@ -3,6 +3,10 @@
 @use '_mixins' as *;
 @use './_player-variables' as *;
 
+$slider-height: 3px;
+$slider-hover-height: 5px;
+$chapter-marker-size: 10px;
+
 .vjs-peertube-skin.has-chapter {
   .vjs-time-tooltip {
     white-space: pre;
@@ -13,6 +17,29 @@
   }
 }
 
+.vjs-chapter-marker {
+  position: absolute;
+
+  top: - math.floor(math.div($chapter-marker-size - $slider-height, 2));
+
+  height: $chapter-marker-size;
+  width: $chapter-marker-size;
+  border-radius: $chapter-marker-size;
+  margin-left: - math.div($chapter-marker-size, 2);
+
+  background-color: $bg-color;
+  cursor: pointer;
+  transition: transform 50ms ease-in-out, border-color 50ms ease-in-out;
+  border: 2px solid transparent;
+  z-index: 2; // On top of mouse marker
+
+  &:hover {
+    transform: scale(1.5);
+
+    border-color: $main-color;
+  }
+}
+
 .video-js.vjs-peertube-skin .vjs-control-bar {
   z-index: 100;
 
@@ -72,7 +99,7 @@
       margin: 0;
       border-radius: 0;
       background-color: rgba(255, 255, 255, .2);
-      height: 3px;
+      height: $slider-height;
       transition: none;
 
       .vjs-play-progress {
@@ -82,9 +109,8 @@
         &::before {
           opacity: 0;
           transition: opacity 0.1s ease;
-          font-size: 14px;
-
-          top: -0.3em;
+          font-size: 15px;
+          z-index: 3; // On top of chapter marker
         }
 
         // Only used on mobile
@@ -104,11 +130,15 @@
 
   .vjs-progress-control:hover .vjs-slider,
   .vjs-progress-control .vjs-slider.vjs-sliding {
-    height: 5px;
+    height: $slider-hover-height;
 
     .vjs-play-progress::before {
       opacity: 1;
     }
+
+    .vjs-chapter-marker {
+      top: - math.floor(math.div($chapter-marker-size - $slider-hover-height, 2));
+    }
   }
 
   .vjs-play-control {
@@ -464,15 +494,6 @@
   }
 }
 
-.vjs-marker {
-  position: absolute;
-  width: 3px;
-  opacity: .5;
-  background-color: #000;
-  height: 100%;
-  top: 0;
-}
-
 .vjs-peertube-skin.vjs-has-captions .vjs-caption-toggle-control {
   display: block !important;
 }