From: Chocobozzz Date: Thu, 17 Jan 2019 10:30:47 +0000 (+0100) Subject: Fix invisible things in dark mode X-Git-Tag: v1.2.0-rc.1~5 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f2fab901df31a0e7081f4bb225f28e98798950b0;p=oweals%2Fpeertube.git Fix invisible things in dark mode --- diff --git a/client/src/app/shared/misc/help.component.scss b/client/src/app/shared/misc/help.component.scss index 4565d457a..3898f3cda 100644 --- a/client/src/app/shared/misc/help.component.scss +++ b/client/src/app/shared/misc/help.component.scss @@ -10,6 +10,8 @@ position: relative; top: -2px; margin: 5px; + + @include apply-svg-color(var(--mainForegroundColor)) } } @@ -18,15 +20,15 @@ max-width: 300px; .popover-body { + font-family: $main-fonts; text-align: left; padding: 10px; font-size: 13px; - font-family: $main-fonts; - background-color: #fff; - color: #000; + background-color: var(--mainBackgroundColor); + color: var(--mainForegroundColor); box-shadow: 0 0 6px rgba(0, 0, 0, 0.5); - p:last-child { + p { margin-bottom: 0; } diff --git a/client/src/assets/images/global/help.html b/client/src/assets/images/global/help.html index 27e9bee6f..80cd40321 100644 --- a/client/src/assets/images/global/help.html +++ b/client/src/assets/images/global/help.html @@ -2,8 +2,8 @@ - - + + diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 37837bfc0..783464f86 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -290,6 +290,10 @@ ngb-tabset.bootstrap { @include disable-default-a-behaviour; color: var(--mainForegroundColor) !important; + + &.active { + color: #000 !important; + } } } } diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 8749649d3..5b3346508 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -57,11 +57,11 @@ @mixin apply-svg-color ($color) { /deep/ svg { - path[fill="#000000"], g[fill="#000000"], rect[fill="#000000"] { + path[fill="#000000"], g[fill="#000000"], rect[fill="#000000"], circle[fill="#000000"] { fill: $color; } - path[stroke="#000000"], g[stroke="#000000"], rect[stroke="#000000"] { + path[stroke="#000000"], g[stroke="#000000"], rect[stroke="#000000"], circle[stroke="#000000"] { stroke: $color; } } diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 7ba011180..b3aac9d16 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -14,7 +14,7 @@ p-table { .ui-table-caption { border: none !important; - background-color: #fff !important; + background-color: var(--mainBackgroundColor) !important; .caption { height: 40px; @@ -24,7 +24,7 @@ p-table { } th { - background-color: #fff !important; + background-color: var(--mainBackgroundColor) !important; outline: 0; } @@ -122,10 +122,14 @@ p-table { &.pi-sort-up { @extend .glyphicon-triangle-top; + + color: var(--mainForegroundColor) !important; } &.pi-sort-down { @extend .glyphicon-triangle-bottom; + + color: var(--mainForegroundColor) !important; } } }