Merge branch 'release/6.0.0' into develop

Chocobozzz · Dec 22, 2023 · 482223c · 482223c
2 parents 374820f + b25a6d0
commit 482223c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/client/src/app/+stats/video/video-stats.component.ts b/client/src/app/+stats/video/video-stats.component.ts
@@ -1,4 +1,4 @@
-import { ChartConfiguration, ChartData, ChartOptions, PluginOptionsByType, Scale, TooltipItem } from 'chart.js'
+import { ChartConfiguration, ChartData, ChartOptions, PluginOptionsByType, Scale, TooltipItem, defaults as ChartJSDefaults } from 'chart.js'
 import zoomPlugin from 'chartjs-plugin-zoom'
 import { Observable, of } from 'rxjs'
 import { SelectOptionsItem } from 'src/types'
@@ -35,6 +35,10 @@ type ChartBuilderResult = {
 
 type Card = { label: string, value: string | number, moreInfo?: string, help?: string }
 
+ChartJSDefaults.backgroundColor = getComputedStyle(document.body).getPropertyValue('--mainBackgroundColor')
+ChartJSDefaults.borderColor = getComputedStyle(document.body).getPropertyValue('--greySecondaryBackgroundColor')
+ChartJSDefaults.color = getComputedStyle(document.body).getPropertyValue('--mainForegroundColor')
+
 @Component({
   templateUrl: './video-stats.component.html',
   styleUrls: [ './video-stats.component.scss' ],

diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss
@@ -33,6 +33,8 @@
 
 body {
   --bs-border-color-translucent: #{pvar(--inputBorderColor)};
+
+  --bs-body-color: #{pvar(--mainForegroundColor)};
 }
 
 .accordion {
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,6 +33,8 @@ @@
     body {
       --bs-border-color-translucent: #{pvar(--inputBorderColor)};
+      --bs-body-color: #{pvar(--mainForegroundColor)};
     }
     .accordion {
@@ Expand Down @@