From 2e0f8c6120d324f729f5ead4fd5f90f523f8657f Mon Sep 17 00:00:00 2001 From: infinite-persistence Date: Thu, 1 Jul 2021 15:22:49 +0800 Subject: [PATCH] Fix videojs overlay css Related: aaffd3b089abca71506fcb68649166ef0f66b4ad "CodeSplit: Load 3rd-party css before ours." --- ui/component/viewers/videoViewer/internal/overlays.js | 4 ++-- ui/scss/third-party.scss | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/component/viewers/videoViewer/internal/overlays.js b/ui/component/viewers/videoViewer/internal/overlays.js index edf2c121e..bd58374e6 100644 --- a/ui/component/viewers/videoViewer/internal/overlays.js +++ b/ui/component/viewers/videoViewer/internal/overlays.js @@ -4,7 +4,7 @@ import * as ICONS from 'constants/icons'; import ReactDOMServer from 'react-dom/server'; import './plugins/videojs-overlay/plugin'; -import './plugins/videojs-overlay/plugin.scss'; +// import './plugins/videojs-overlay/plugin.scss'; --> 'scss/third-party.scss' // **************************************************************************** // **************************************************************************** @@ -45,7 +45,7 @@ export const OVERLAY_DATA = { */ function showOneOffOverlay(player, className, overlayJsx, align) { // Delete existing: - OVERLAY_DATA.overlays = OVERLAY_DATA.overlays.filter(x => x.name !== OVERLAY_NAME_ONE_OFF); + OVERLAY_DATA.overlays = OVERLAY_DATA.overlays.filter((x) => x.name !== OVERLAY_NAME_ONE_OFF); // Create new one: OVERLAY_DATA.overlays.push({ name: OVERLAY_NAME_ONE_OFF, diff --git a/ui/scss/third-party.scss b/ui/scss/third-party.scss index 886593207..0a996d8a1 100644 --- a/ui/scss/third-party.scss +++ b/ui/scss/third-party.scss @@ -3,3 +3,4 @@ @import '~@reach/combobox/styles.css'; @import '~@reach/tooltip/styles.css'; @import '~video.js/dist/alt/video-js-cdn.min.css'; +@import 'component/viewers/videoViewer/internal/plugins/videojs-overlay/plugin.scss';