From 98b03e2e4a6fda337e0d8c6f4e4e7ccfa0a4797a Mon Sep 17 00:00:00 2001 From: Carl Kittelberger Date: Sun, 3 Jan 2021 18:45:26 +0100 Subject: [PATCH] Improve dark mode by integrating @forevolve/bootstrap-dark. --- frontend/styles/bootstrap.scss | 12 +++++------- frontend/util/datatypes/VideoOnDemandIdentifier.ts | 1 + 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/frontend/styles/bootstrap.scss b/frontend/styles/bootstrap.scss index 69d4416..7db375e 100644 --- a/frontend/styles/bootstrap.scss +++ b/frontend/styles/bootstrap.scss @@ -2,10 +2,12 @@ * BOOTSTRAP */ +@import '~bootstrap/scss/functions'; +@import '~bootstrap/scss/variables'; +@import '~bootstrap/scss/mixins'; +@import '~@forevolve/bootstrap-dark/scss/dark-mixins'; + html:not([data-enable-dark='true']) { - @import '~bootstrap/scss/functions'; - @import '~bootstrap/scss/variables'; - @import '~bootstrap/scss/mixins'; @import '~bootstrap/scss/root'; @import '~bootstrap/scss/reboot'; @import '~bootstrap/scss/type'; @@ -47,11 +49,7 @@ html:not([data-enable-dark='true']) { */ html[data-enable-dark='true'] { - @import '~bootstrap/scss/functions'; - @import '~bootstrap/scss/variables'; @import '~@forevolve/bootstrap-dark/scss/dark-variables'; - @import '~bootstrap/scss/mixins'; - @import '~@forevolve/bootstrap-dark/scss/dark-mixins'; @import '~bootstrap/scss/root'; @import '~bootstrap/scss/reboot'; @import '~bootstrap/scss/type'; diff --git a/frontend/util/datatypes/VideoOnDemandIdentifier.ts b/frontend/util/datatypes/VideoOnDemandIdentifier.ts index 9af0b9e..2564252 100644 --- a/frontend/util/datatypes/VideoOnDemandIdentifier.ts +++ b/frontend/util/datatypes/VideoOnDemandIdentifier.ts @@ -4,6 +4,7 @@ export interface VideoOnDemandIdentifier { } export interface VideoOnDemandIndex { + announcements: Array, ids: Array servers: { dash: string