Merge branch 'bose/2190' into staging

equinor · Aug 12, 2024 · a30d43d · a30d43d
2 parents 285fcbb + 437cf0a
commit a30d43d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/web/core/Carousel/CarouselImageItem.tsx b/web/core/Carousel/CarouselImageItem.tsx
@@ -52,7 +52,7 @@ export const CarouselImageItem = forwardRef<HTMLLIElement, CarouselImageItemProp
             } absolute bottom-0 left-4 right-4 lg:left-8 lg:right-8 mb-4 lg:mb-8`}
           >
             <div
-              className={`bg-spruce-wood-70/75 px-8 pt-6 w-fit flex flex-col max-w-text ${
+              className={`bg-spruce-wood-70/75 text-slate-80 px-8 pt-6 w-fit flex flex-col max-w-text ${
                 attribution ? 'pb-4' : 'pb-6'
               }`}
             >

diff --git a/web/core/MediaButton/MediaButton.tsx b/web/core/MediaButton/MediaButton.tsx
@@ -45,7 +45,7 @@ export const MediaButton = forwardRef<HTMLButtonElement, ButtonProps>(
         default:
           return `
           size-[44px]
-          ${useTimer ? `` : `border border-autumn-storm-40 dark:border-white-100`}
+          ${useTimer ? `` : `border border-grey-60 dark:border-white-100`}
           text-slate-80
           focus:outline-none
           hover:bg-autumn-storm-60
@@ -94,7 +94,7 @@ export const MediaButton = forwardRef<HTMLButtonElement, ButtonProps>(
             paused={paused ?? mode === 'pause'}
             variant="determinate"
             className="absolute inset-0 size-[44px]"
-            trackClassName="group-hover/mediabutton:stroke-autumn-storm-60"
+            trackClassName="group-hover/mediabutton:stroke-autumn-storm-60 dark:group-hover/mediabutton:stroke-grey-30"
           />
         )}
         <div

diff --git a/web/core/Progress/CircularProgress.tsx b/web/core/Progress/CircularProgress.tsx
@@ -132,7 +132,7 @@ const CircularProgress = forwardRef<SVGSVGElement, CircularProgressProps>(functi
           fill="none"
           strokeWidth={thickness}
           stroke="currentColor"
-          className={envisTwMerge('stroke-autumn-storm-40', trackClassName)}
+          className={envisTwMerge('stroke-grey-30', trackClassName)}
         />
         {/* Progress */}
         <circle
@@ -144,7 +144,7 @@ const CircularProgress = forwardRef<SVGSVGElement, CircularProgressProps>(functi
           strokeLinecap="round"
           strokeWidth={thickness}
           strokeDasharray={variant === 'determinate' ? circumference : 48}
-          className={envisTwMerge('stroke-autumn-storm-60', progressClassName)}
+          className={envisTwMerge('stroke-grey-60', progressClassName)}
           opacity={paused ? 0 : 1}
         />
       </svg>

diff --git a/web/styles/tailwind.css b/web/styles/tailwind.css
@@ -167,7 +167,7 @@
   }
   @supports selector(::-webkit-scrollbar) {
     .transparent-scrollbar::-webkit-scrollbar {
-      @apply bg-white-100 dark:bg-transparent h-2 my-2;
+      @apply bg-transparent h-2 my-2;
     }
     .transparent-scrollbar::-webkit-scrollbar-track {
       @apply my-[2px];