@npo/player 1.9.4 → 1.10.1

package/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npo/player",
-  "version": "1.9.3",
+  "version": "1.10.0",
   "description": "NPO Player",
   "author": "Publieke Omroep <player@npo.nl>",
   "contributors": [
@@ -12,18 +12,17 @@
     "node": "^18.16.0"
   },
   "license": "ISC",
-  "main": "npoplayer",
-  "types": "npoplayer.d.ts",
+  "main": "./lib/npoplayer",
+  "types": "./lib/npoplayer.d.ts",
   "scripts": {
     "build": "webpack --hot",
-    "build:scss": "npm run build:web-styles && npm run build:web-styles && npm run build:mobile-styles-min && npm run build:mobile-styles && cp src/scss/*.css dist",
-    "build:web-styles": "sass --no-source-map src/scss/npoplayer.scss src/scss/npoplayer.css",
-    "build:web-styles-min": "sass --no-source-map --style=compressed src/scss/npoplayer.scss src/scss/npoplayer.min.css",
-    "build:mobile-styles": "node-sass --no-source-map src/scss/npoplayer-mobile.scss src/scss/npoplayer-mobile.css",
-    "build:mobile-styles-min": "sass --no-source-map --style=compressed src/scss/npoplayer-mobile.scss src/scss/npoplayer-mobile.min.css",
+    "build:scss": "npm run build:web-styles && npm run build:mobile-styles && cp src/scss/*.css dist && cp src/scss/*.css.map dist",
+    "build:web-styles": "sass src/scss/npoplayer.scss --style=compressed src/scss/npoplayer.css | postcss --use autoprefixer -r src/scss/npoplayer.css",
+    "build:mobile-styles": "sass src/scss/npoplayer-mobile.scss --style=compressed src/scss/npoplayer-mobile.css | postcss --use autoprefixer -r src/scss/npoplayer-mobile.css",
+    "build:cdn": "bash build-cdn.sh",
     "lint": "eslint src --fix",
-    "bundle": "npm run lint && ts-node build.ts && webpack && npm run build:scss",
-    "build:ts": "ts-node build.ts",
+    "bundle": "npm run lint && bash build-lib.sh && npm run build:scss",
+    "build:ts": "bash build-lib.sh",
     "test": "jest",
     "test:ci": "node_modules/.bin/jest",
     "version:dev": "npm version prerelease --preid=dev --no-git-tag-version"
@@ -47,6 +46,7 @@
     "@types/jest": "^29.4.0",
     "@typescript-eslint/eslint-plugin": "^5.58.0",
     "@typescript-eslint/parser": "^5.58.0",
+    "autoprefixer": "^10.4.15",
     "babel-jest": "^28.1.3",
     "babel-loader": "^8.3.0",
     "css-loader": "^6.7.3",
@@ -64,6 +64,9 @@
     "mini-css-extract-plugin": "^2.7.2",
     "node-fetch": "^3.3.0",
     "node-sass": "^7.0.3",
+    "postcss-cli": "^10.1.0",
+    "postcss-loader": "^7.3.3",
+    "postcss-scss": "^4.0.7",
     "sass": "^1.58.0",
     "sass-loader": "^12.6.0",
     "style-loader": "^3.3.1",
@@ -80,6 +83,12 @@
     "bitmovin-player": "^8.125.0",
     "bitmovin-player-ui": "^3.48.0"
   },
+  "browserslist": [
+    "defaults",
+    "not ie < 11",
+    "last 2 versions",
+    "> 1%"
+  ],
   "keywords": [
     "video",
     "player",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npo/player",
-  "version": "1.9.4",
+  "version": "1.10.1",
   "description": "NPO Player",
   "author": "Publieke Omroep <player@npo.nl>",
   "contributors": [
@@ -12,18 +12,17 @@
     "node": "^18.16.0"
   },
   "license": "ISC",
-  "main": "npoplayer",
-  "types": "npoplayer.d.ts",
+  "main": "./lib/npoplayer",
+  "types": "./lib/npoplayer.d.ts",
   "scripts": {
     "build": "webpack --hot",
-    "build:scss": "npm run build:web-styles && npm run build:web-styles && npm run build:mobile-styles-min && npm run build:mobile-styles && cp src/scss/*.css dist",
-    "build:web-styles": "sass --no-source-map src/scss/npoplayer.scss src/scss/npoplayer.css",
-    "build:web-styles-min": "sass --no-source-map --style=compressed src/scss/npoplayer.scss src/scss/npoplayer.min.css",
-    "build:mobile-styles": "node-sass --no-source-map src/scss/npoplayer-mobile.scss src/scss/npoplayer-mobile.css",
-    "build:mobile-styles-min": "sass --no-source-map --style=compressed src/scss/npoplayer-mobile.scss src/scss/npoplayer-mobile.min.css",
+    "build:scss": "npm run build:web-styles && npm run build:mobile-styles && cp src/scss/*.css dist && cp src/scss/*.css.map dist",
+    "build:web-styles": "sass src/scss/npoplayer.scss --style=compressed src/scss/npoplayer.css | postcss --use autoprefixer -r src/scss/npoplayer.css",
+    "build:mobile-styles": "sass src/scss/npoplayer-mobile.scss --style=compressed src/scss/npoplayer-mobile.css | postcss --use autoprefixer -r src/scss/npoplayer-mobile.css",
+    "build:cdn": "bash build-cdn.sh",
     "lint": "eslint src --fix",
-    "bundle": "npm run lint && ts-node build.ts && webpack && npm run build:scss",
-    "build:ts": "ts-node build.ts",
+    "bundle": "npm run lint && bash build-lib.sh && npm run build:scss",
+    "build:ts": "bash build-lib.sh",
     "test": "jest",
     "test:ci": "node_modules/.bin/jest",
     "version:dev": "npm version prerelease --preid=dev --no-git-tag-version"
@@ -47,6 +46,7 @@
     "@types/jest": "^29.4.0",
     "@typescript-eslint/eslint-plugin": "^5.58.0",
     "@typescript-eslint/parser": "^5.58.0",
+    "autoprefixer": "^10.4.15",
     "babel-jest": "^28.1.3",
     "babel-loader": "^8.3.0",
     "css-loader": "^6.7.3",
@@ -64,6 +64,9 @@
     "mini-css-extract-plugin": "^2.7.2",
     "node-fetch": "^3.3.0",
     "node-sass": "^7.0.3",
+    "postcss-cli": "^10.1.0",
+    "postcss-loader": "^7.3.3",
+    "postcss-scss": "^4.0.7",
     "sass": "^1.58.0",
     "sass-loader": "^12.6.0",
     "style-loader": "^3.3.1",
@@ -80,6 +83,12 @@
     "bitmovin-player": "^8.125.0",
     "bitmovin-player-ui": "^3.48.0"
   },
+  "browserslist": [
+    "defaults",
+    "not ie < 11",
+    "last 2 versions",
+    "> 1%"
+  ],
   "keywords": [
     "video",
     "player",

package/src/scss/components/_advert.scss

@@ -1,20 +1,19 @@
-&.bmpui-ster-ad{
-    .bmpui-seekbar-playbackposition-marker{
+&.bmpui-ster-ad {
+    .bmpui-seekbar-playbackposition-marker,
+    .bmpui-ui-hugeplaybacktogglebutton,
+    .videoAdUiClickElement{
         display: none !important;
     }
-    .bmpui-ui-controlbar{
-        &.bmpui-controlbar-middle{
-            display: none !important;
-        }
+
+    .bmpui-ui-controlbar {
+        &.bmpui-controlbar-middle,
         .bmpui-ui-rewindbutton, 
         .bmpui-ui-forwardbutton,
-        .bmpui-ui-settingstogglebutton{
+        .bmpui-ui-settingstogglebutton {
             display: none !important;
-        }      
-        .bmpui-controlbar-bottom{
-            display: block !important;
-        }
+        }   
     }
+
     .bmpui-ui-seekbar {
         .bmpui-seekbar {
             .bmpui-seekbar-bufferlevel {
@@ -30,22 +29,18 @@
             .bmpui-seekbar-playbackposition {
                 background: var(--npo-player-white);
                 backdrop-filter: blur(50px);
-                border-radius: 5px;
             }
         }
     }
-    .bmpui-ui-hugeplaybacktogglebutton{
-        display: none !important;
-    }
-    .videoAdUiClickElement{
-        display: none;
-    }
-    .bmpui-adLabel{
+
+    .bmpui-adLabel {
         position: relative;
         padding-right: 15px;
         font-family: var(--fontBold);
-        &::before{
-            content: "";
+        font-weight: 700;
+
+        &::before {
+            content: '';
             pointer-events: none;
             position: absolute;
             height: 44px;
@@ -55,16 +50,18 @@
             background-image: url("data:image/svg+xml,%3Csvg width='59' height='44' viewBox='0 0 39 30' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M0 15.0338L19.4156 0.414307L38.8238 15.0338L19.4156 29.5855L0 15.0338ZM19.4223 27.5128L36.0603 15.0303L19.4223 2.48968L2.76764 15.0301L19.4223 27.5128Z' fill='white'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M13.2215 13.9887C12.4213 13.3085 11.7303 12.721 11.7303 11.9329C11.7303 11.2697 12.064 10.8895 12.6461 10.8895C12.8494 10.8895 13.5139 10.9733 13.6141 12.0211L15.2164 11.8445C15.0406 10.3315 14.1464 9.42878 12.8164 9.42878C11.1077 9.42878 10.1279 10.3468 10.1279 11.9472C10.1279 13.5345 11.202 14.4297 12.1495 15.2195C12.9488 15.8859 13.704 16.5152 13.704 17.4532C13.704 18.0625 13.3087 18.4261 12.6463 18.4261C12.0333 18.4261 11.6413 17.8635 11.5647 16.8842C11.4962 16.894 10.0231 17.1058 9.96039 17.1152C10.0361 18.5001 10.8656 19.8866 12.5614 19.8866C14.2547 19.8866 15.3066 18.8944 15.3066 17.297C15.3062 15.7618 14.1987 14.8196 13.2215 13.9887ZM15.7374 13.4513V12.1456H16.6171V10.0881H18.2065V12.1456H19.2708V13.4513H18.2067V17.8506C18.2067 18.2478 18.377 18.4748 18.746 18.4748H19.271V19.837C19.0583 19.8936 18.8736 19.922 18.4762 19.922C17.2843 19.922 16.6173 19.3688 16.6173 18.2048V13.4513H15.7374ZM26.2467 19.7803V12.1458H27.7649V13.0398H27.7933C28.1768 12.3871 28.8435 12.0041 29.5958 12.0041H29.922V13.6642C29.6383 13.5932 29.3688 13.5081 28.9002 13.5081C28.3611 13.5081 27.8358 13.8485 27.8358 14.5297V19.7803H26.2467ZM23.4859 17.5288C23.4599 18.3273 23.1512 18.6659 22.6083 18.6659C22.0409 18.6659 21.7284 18.2968 21.7284 17.4167V16.3098H25.0775V14.8908C25.0775 13.2164 24.4249 12.0528 22.6085 12.0528C20.7921 12.0528 20.1395 13.2164 20.1395 14.8908V17.133C20.1395 18.8073 20.7921 19.9714 22.6085 19.9714C24.2771 19.9714 24.9661 18.9917 25.0655 17.5288H23.4859ZM21.7284 14.6073C21.7284 13.7275 22.0409 13.3583 22.6083 13.3583C23.1761 13.3583 23.4882 13.7275 23.4882 14.6073V15.0049H21.7284V14.6073Z' fill='white'/%3E%3C/svg%3E%0A");
         }
     }
-    .bmpui-controlbar-textbuttons{
-        padding: 0px 40px 17% 0px !important;
-        .bmpui-ui-textbutton.ui-sterbutton{
-            padding: 14px 10px !important;
-            border: none !important;
-            border-radius: 6px !important;
-            height: fit-content !important;
-            width: fit-content !important;
-            .bmpui-label{
-                font-family: var(--fontNormal) !important;
+
+    .bmpui-controlbar-textbuttons {    
+        .bmpui-ui-textbutton.ui-sterbutton {
+            padding: 14px 10px;
+            border: none;
+            border-radius: 6px;
+            height: fit-content;
+            width: fit-content;
+
+            .bmpui-label {
+                font-family: var(--fontNormal);
+                font-weight: normal;
                 font-size: 12px;
                 line-height: 0;
                 text-align: left;

package/src/scss/components/_buffering.scss

@@ -1,6 +1,37 @@
 .bmpui-ui-buffering-overlay {
     background-color: var(--npo-player-bufferingcolor);
-}
-.bmpui-ui-buffering-overlay-indicator {
-    background-image: url($buffering_indicator) !important;
-}
+    display: block;
+
+    .bmpui-container-wrapper {
+        display: flex;
+        width: 100%;
+        height: 100%;
+        align-items: center;
+        justify-content: center;
+
+        .bmpui-ui-buffering-overlay-indicator:first-child,
+        .bmpui-ui-buffering-overlay-indicator:last-child {
+            display: none;
+            animation: none;
+            background: none;
+        }
+    }
+
+    .bmpui-ui-buffering-overlay-indicator {
+        width: 56px;
+        height: 56px;
+        border-radius: 50%;
+        background-image: conic-gradient(var(--npo-player-primarycolor), transparent);
+        mask: radial-gradient(transparent 20px, var(--npo-player-primarycolor) 20px);
+        animation: rotation 2s infinite ease-in;
+
+        @keyframes rotation {
+          from {
+            transform: rotate(0deg);
+          }
+          to {
+            transform: rotate(360deg);
+          }
+        }
+    }
+}

package/src/scss/components/_controlbars.scss

@@ -10,21 +10,17 @@
 .bmpui-controlbar-middle {
     height: 100%;
     display: flex;
+    left: 0;
+    top: 0;
+    width: 100%;
 
     .bmpui-container-wrapper {
         display: flex;
         flex-direction: row;
-        justify-content: space-evenly; //instead of space-between
+        justify-content: space-evenly;
         align-items: center;
         padding: 0px;
-        // gap: 67px;
-        width: 100%; //Fix for gap pushing buttons out of screen
+        width: 100%;
         margin: 0 auto;
     }
-
-    button {
-        // height: 44px;
-        // width: 44px;
-        font-size: 2em;
-    }
 }

package/src/scss/components/_error.scss

@@ -1,9 +1,10 @@
 .bmpui-ui-errormessage-overlay {
-    .bmpui-ui-tvnoisecanvas{
+    .bmpui-ui-tvnoisecanvas {
         display: none;
     }
-    &::before{
-        content: "";
+
+    &::before {
+        content: '';
         background-color: var(--npo-player-secondarycolor);
         opacity: 0.7;
         width: 100%;
@@ -15,8 +16,9 @@
         position: absolute;
     }
 }
+
 .bmpui-ui-errormessage-label {
-    font-family: 'NPOSansBold';
+    font-family: var(--font-bold);
     font-weight: 700;
     font-size: 22px;
     line-height: 130%;

package/src/scss/components/_hugeplaybacktogglebutton.scss

@@ -0,0 +1,71 @@
+&.bmpui-player-state-paused,
+&.bmpui-player-state-prepared,
+&.bmpui-player-state-finished {
+    .bmpui-ui-hugeplaybacktogglebutton {
+        .bmpui-image {
+            animation: none;
+        }
+    }
+}
+
+
+/* Icon Play */
+.bmpui-ui-hugeplaybacktogglebutton {
+    .bmpui-image {
+        cursor: pointer;
+        position: relative;
+        // animation: none;
+        background: none;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        &:after,
+        &:before {
+            content: '';
+            position: absolute;
+            height: 88px;
+            width: 88px;
+        }
+
+        &:after {
+            mask-image: var(--npo-player-icon-play);
+            mask-repeat: no-repeat;
+            mask-position: center;
+            transition: mask-size linear 0.3s;
+            mask-size: 40%;
+            background-color: var(--npo-player-iconcolor);
+        }
+
+        &:before {
+            border-radius: 500px;
+            background: rgba(0, 0, 0, 0.5);
+        }
+
+        &:hover {
+            &:after {
+                mask-size: 55%;
+            }
+
+            &:before {
+                background: linear-gradient(90deg, var(--npo-player-primarycolor), var(--npo-player-primarycolor-light));
+                background-size: 200% 200%;
+                animation: gradientAnimation 2s linear infinite;
+            }
+        }
+    }
+}
+
+@keyframes gradientAnimation {
+    0% {
+        background-position: 0% 50%;
+    }
+
+    50% {
+        background-position: 100% 50%;
+    }
+
+    100% {
+        background-position: 0% 50%;
+    }
+}

package/src/scss/components/_icons.scss

@@ -1,241 +1,140 @@
 .bmpui-ui-rewindbutton,
 .bmpui-ui-forwardbutton,
-.bmpui-ui-subtitlesettingstogglebutton,
 .bmpui-ui-settingstogglebutton,
 .bmpui-ui-fullscreentogglebutton,
 .bmpui-ui-playbacktogglebutton,
 .bmpui-ui-volumetogglebutton,
 .bmpui-ui-casttogglebutton,
 .bmpui-ui-airplaytogglebutton,
-.bmpui-ui-piptogglebutton,
-.bmpui-ui-audiotracksettingstogglebutton {
-    padding: 8px;
+.bmpui-ui-piptogglebutton {
+    width: 40px;
+    height: 40px;
+    padding: 0;
     margin: 0;
+    background-size: contain;
+    background-color: var(--npo-player-iconcolor);
+    background-image: none;
+    mask-size: contain;
+    mask-position: 50% 50%;
+    mask-repeat: no-repeat;
+}
+
+.bmpui-ui-settingstogglebutton,
+.bmpui-ui-casttogglebutton,
+.bmpui-ui-airplaytogglebutton,
+.bmpui-ui-piptogglebutton {
+    &.bmpui-on {
+        background-color: var(--npo-player-iconcolor-active);
+    }
 }
 
 .bmpui-controlbar-bottom {
     .bmpui-container-wrapper {
-        gap: 8px;
+        gap: 20px;
     }
 }
 
-/*Forward / backward */
+/* Icon rewind 10 sec */
 .bmpui-ui-rewindbutton {
-    background-image: url($icon_backwards);
-    background-size: contain;
+    mask-image: var(--npo-player-icon-backward);
 }
 
+/* Icon forward 10 sec */
 .bmpui-ui-forwardbutton {
-    background-image: url($icon_forward);
-    background-size: contain;
+    mask-image: var(--npo-player-icon-forward);
 }
 
 .bmpui-ui-rewindbutton:hover,
 .bmpui-ui-forwardbutton:hover {
-    -webkit-filter: drop-shadow(0 0 1px #fff);
-    filter: drop-shadow(0 0 1px #fff);
+    filter: drop-shadow(0 0 1px var(--npo-player-iconcolor));
 }
 
-/* Icon Play */
-&.bmpui-player-state-paused, &.bmpui-player-state-prepared, &.bmpui-player-state-finished {
-    .bmpui-ui-hugeplaybacktogglebutton {
-        .bmpui-image {
-            cursor: pointer;
-            animation: none !important;
-            position: relative;
-            background: none;
-            background-image: none !important;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            &:after, &:before{
-                content: "";
-                position: absolute;
-                height: 76px;
-                width: 76px;
-            }
-            &:hover{
-                &:after{
-                    background-size: 55% !important;
-                }
-            }
-            &:after{
-                background-image: url($icon_bigplay) !important;
-                background-repeat: no-repeat;
-                background-position: center;
-                transition: background-size linear 0.3s !important;
-                background-size: 40%;
-            }
-            &:before{
-                border-radius: 500px;
-                background: rgba(0, 0, 0, 0.5);
-            }
-        }
-        &:hover{
-            .bmpui-image{
-                &:before{
-                    background: linear-gradient(90deg, var(--npo-player-primarycolor) 0%, var(--npo-player-primarycolor-light) 100%);
-                    animation: gradientAnimation 2s linear infinite;
-                }
-            }
-        }
-    }
-
-    @container (min-width: 600px){
-        .bmpui-ui-hugeplaybacktogglebutton .bmpui-image {
-            &:after, &:before{
-                height: 88px;
-                width: 88px;
-            }
-        }
-    }
-
-    @container (min-width: 1200px){
-        .bmpui-ui-hugeplaybacktogglebutton .bmpui-image {
-            &:after, &:before{
-                height: 100px;
-                width: 100px;
-            }
-        }
-    }
-}
-
-@keyframes gradientAnimation {
-    0% {
-        background-position: 0% 50%;
-    }
-    50% {
-        background-position: 100% 50%;
-    }
-    100% {
-        background-position: 0% 50%;
-    }
-}
-
-// Loading icon, does not currently work
-&.bmpui-ui-uicontainer .bmpui-ui-hugeplaybacktogglebutton.bmpui-on .bmpui-image{
-    background: none !important;
-    background-position: center !important;
-    background-repeat: no-repeat !important;
-    background-size: 15% !important;
-    background-image:  url($icon_bigplay) !important;
-}
-&.bmpui-ui-uicontainer:not(.bmpui-player-state-prepared):not(.bmpui-player-state-playing):not(.bmpui-player-state-paused):not(.bmpui-player-state-finished) .bmpui-image {
-    background-image: none !important;
-    &:after{
-        animation: rotation 1s infinite linear;
-        background-image: url($icon_loading) !important;
-        background-repeat: no-repeat;
-        background-position: center;
-        background-size: 4em;
-    }
-}
-
-/* Icon Audio Quality */
-.bmpui-ui-subtitlesettingstogglebutton {
-    &.bmpui-off {
-        background-image: url($icon_subtitles);
-    }
-    &.bmpui-on {
-        background-image: url($icon_subtitles_active);
-    }
-}
-
-/* Icon Subtitles */
-.bmpui-ui-subtitlesettingstogglebutton {
-    &.bmpui-off {
-        background-image: url($icon_subtitles);
-    }
-    &.bmpui-on {
-        background-image: url($icon_subtitles_active);
-    }
-}
-
-/* Icon Small Play + Pause */
+/* Icon Small Play/Pause Toggle */
 .bmpui-ui-playbacktogglebutton {
     &.bmpui-off {
-        background-image: url($icon_playbackplay);
+        mask-image: var(--npo-player-icon-play);
     }
-    &.bmpui-on {
-        background-image: url($icon_playbackpause);
-    }
-}
 
-@keyframes rotation {
-    from {
-        transform: rotate(0deg);
-    }
-    to {
-        transform: rotate(359deg);
+    &.bmpui-on {
+        mask-image: var(--npo-player-icon-pause);
     }
 }
 
+/* Icon Full Screen */
 .bmpui-ui-fullscreentogglebutton {
     &.bmpui-off {
-        background-image: url($icon_fullscreen);
+        mask-image: var(--npo-player-icon-fullscreen);
     }
+    
     &.bmpui-on {
-        background-image: url($icon_fullscreen_active);
+        mask-image: var(--npo-player-icon-fullscreen-active);
     }
 }
 
 /* Icon Settings */
 .bmpui-ui-settingstogglebutton {
     &.bmpui-off {
-        background-image: url($icon_settings);
+        mask-image: var(--npo-player-icon-settings);
     }
+
     &.bmpui-on {
-        background-image: url($icon_settings_active);
+        mask-image: var(--npo-player-icon-settings-active);
     }
 }
 
 /* Icon Cast */
 .bmpui-ui-casttogglebutton {
     &.bmpui-off {
-        background-image: url($icon_cast);
+        mask-image: var(--npo-player-icon-cast);
     }
+
     &.bmpui-on {
-        background-image: url($icon_cast_active);
+        mask-image: var(--npo-player-icon-cast-active);
     }
 }
 
 /* Icon Airplay */
 .bmpui-ui-airplaytogglebutton {
     &.bmpui-off {
-        background-image: url($icon_airplay);
+        mask-image: var(--npo-player-icon-airplay);
     }
+
     &.bmpui-on {
-        background-image: url($icon_airplay_active);
+        mask-image: var(--npo-player-icon-airplay-active);
     }
 }
 
 /* Icon PIP */
 .bmpui-ui-piptogglebutton {
     &.bmpui-off {
-        background-image: url($icon_pip);
+        mask-image: var(--npo-player-icon-pip);
     }
+
     &.bmpui-on {
-        background-image: url($icon_pip_active);
+        mask-image: var(--npo-player-icon-pip-active);
     }
 }
 
 /* Icon Volume */
 .bmpui-ui-volumetogglebutton.bmpui-muted {
-    background-image: url($icon_volume_muted);
+    mask-image: var(--npo-player-icon-volume-muted);
 }
+
 .bmpui-ui-volumetogglebutton.bmpui-unmuted[data-bmpui-volume-level-tens='1'],
 .bmpui-ui-volumetogglebutton.bmpui-unmuted[data-bmpui-volume-level-tens='2'],
 .bmpui-ui-volumetogglebutton.bmpui-unmuted[data-bmpui-volume-level-tens='3'],
 .bmpui-ui-volumetogglebutton.bmpui-unmuted[data-bmpui-volume-level-tens='4'] {
-    background-image: url($icon_volume_1);
+    mask-image: var(--npo-player-icon-volume-1);
 }
+
 .bmpui-ui-volumetogglebutton.bmpui-unmuted[data-bmpui-volume-level-tens='5'],
 .bmpui-ui-volumetogglebutton.bmpui-unmuted[data-bmpui-volume-level-tens='6'],
 .bmpui-ui-volumetogglebutton.bmpui-unmuted[data-bmpui-volume-level-tens='7'] {
-    background-image: url($icon_volume_2);
+    mask-image: var(--npo-player-icon-volume-2);
 }
+
 .bmpui-ui-volumetogglebutton.bmpui-unmuted[data-bmpui-volume-level-tens='8'],
 .bmpui-ui-volumetogglebutton.bmpui-unmuted[data-bmpui-volume-level-tens='9'],
 .bmpui-ui-volumetogglebutton.bmpui-unmuted[data-bmpui-volume-level-tens='10'] {
-    background-image: url($icon_volume_3);
-}
+    mask-image: var(--npo-player-icon-volume-3);
+}