From b44a4ae4644126b5f713887607dd4d41f3169817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Tue, 17 Dec 2019 10:48:43 +0100 Subject: [PATCH] MOBILE-3213 styles: Dark mode fixes --- src/addon/mod/forum/components/post/post.scss | 4 ++++ .../forum/pages/discussion/discussion.scss | 2 +- .../mod/wiki/components/index/index.scss | 19 +++++++++++++++++++ src/app/app.scss | 4 ++-- src/theme/dark.scss | 7 ++++--- 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/src/addon/mod/forum/components/post/post.scss b/src/addon/mod/forum/components/post/post.scss index 995dc2f13..96f1b39dd 100644 --- a/src/addon/mod/forum/components/post/post.scss +++ b/src/addon/mod/forum/components/post/post.scss @@ -2,6 +2,10 @@ ion-app.app-root addon-mod-forum-post .addon-mod_forum-post { background-color: $white; border-bottom: 1px solid $list-md-border-color; + @include darkmode() { + background-color: $core-dark-item-bg-color; + } + .addon-forum-star { color: $core-star-color; } diff --git a/src/addon/mod/forum/pages/discussion/discussion.scss b/src/addon/mod/forum/pages/discussion/discussion.scss index 54d9b1f0c..fcc1213fd 100644 --- a/src/addon/mod/forum/pages/discussion/discussion.scss +++ b/src/addon/mod/forum/pages/discussion/discussion.scss @@ -2,7 +2,7 @@ ion-app.app-root page-addon-mod-forum-discussion { .highlight .card-header .item { background-color: $gray-lighter; @include darkmode() { - background-color: $black; + background-color: $gray-dark; } } diff --git a/src/addon/mod/wiki/components/index/index.scss b/src/addon/mod/wiki/components/index/index.scss index 4e4fcb283..a19821b4f 100644 --- a/src/addon/mod/wiki/components/index/index.scss +++ b/src/addon/mod/wiki/components/index/index.scss @@ -4,6 +4,11 @@ $addon-mod-wiki-toc-title-color: $gray-darker !default; $addon-mod-wiki-toc-border-color: $gray-dark !default; $addon-mod-wiki-toc-background-color: $gray-light !default; +$addon-mod-wiki-dark-toc-title-color: $white !default; +$addon-mod-wiki-dark-toc-border-color: $gray-dark !default; +$addon-mod-wiki-dark-toc-background-color: $gray-darker !default; +$addon-mod-wiki-dark-newentry-link-color: $red-light !default; + ion-app.app-root addon-mod-wiki-index { background-color: $white; @include darkmode() { @@ -28,6 +33,17 @@ ion-app.app-root addon-mod-wiki-index { a { color: $link-color; } + + @include darkmode() { + border: 1px solid $addon-mod-wiki-dark-toc-border-color; + background: $addon-mod-wiki-dark-toc-background-color; + p { + color: $core-dark-text-color !important; + } + a { + color: $core-dark-link-color; + } + } margin: 16px; padding: 8px; } @@ -55,6 +71,9 @@ ion-app.app-root addon-mod-wiki-index { .wiki_newentry { color: $addon-mod-wiki-newentry-link-color; font-style: italic; + @include darkmode() { + color: $addon-mod-wiki-dark-newentry-link-color !important; + } } /* Hide edit section links */ diff --git a/src/app/app.scss b/src/app/app.scss index 6e71d9caf..75f830591 100644 --- a/src/app/app.scss +++ b/src/app/app.scss @@ -500,7 +500,7 @@ ion-app.app-root { @include darkmode() { ion-select.core-button-select, .core-button-select { - background-color: $core-dark-item-divider-bg-color; + background-color: $core-dark-item-bg-color; &.select-md, @@ -509,7 +509,7 @@ ion-app.app-root { &.button-ios, &.select-wp, &.button-wp { - background: $core-dark-item-divider-bg-color; + background: $core-dark-item-bg-color; } } } diff --git a/src/theme/dark.scss b/src/theme/dark.scss index fe18c049a..0e034de87 100644 --- a/src/theme/dark.scss +++ b/src/theme/dark.scss @@ -3,8 +3,8 @@ $core-dark-text-secondary-color: $gray-light !default; $core-dark-link-color: $blue-light !default; $core-dark-item-bg-color: $gray-darker !default; -$core-dark-item-divider-bg-color: $black !default; -$core-dark-background-color: $gray-dark !default; +$core-dark-item-divider-bg-color: $gray-dark !default; +$core-dark-background-color: $black !default; // Login. $core-dark-login-page-background-color: radial-gradient(white, $gray-dark) !default; @@ -31,7 +31,8 @@ ion-app.app-root .ion-page { .item, .item-select, ion-card, - .card-header { + .card-header, + .card-content { color: $core-dark-text-color; background-color: $core-dark-item-bg-color;