From e9b236af805c211465870ec2e766d706da96ee79 Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Mon, 19 Apr 2021 18:37:16 +0300 Subject: [PATCH] Dark theme: Some more fixes (#1032) --- src/components/left/main/Chat.scss | 26 ++++++++++++++++++------- src/components/middle/message/Poll.scss | 3 ++- src/config.ts | 2 +- src/styles/themes.json | 12 ++++++------ 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/src/components/left/main/Chat.scss b/src/components/left/main/Chat.scss index 6c5de4277..aeaca70d2 100644 --- a/src/components/left/main/Chat.scss +++ b/src/components/left/main/Chat.scss @@ -25,18 +25,30 @@ &.selected, &.selected:hover { - .Avatar.online::after { - border-color: var(--color-chat-active); - } - .ListItem-button { - --background-color: var(--color-chat-active) !important; - --color-text: var(--color-white); - } --background-color: var(--color-chat-active) !important; --color-text-meta-colored: var(--color-white); --color-text-meta: var(--color-white); --color-text-secondary: var(--color-white); --color-error: var(--color-white); + --color-pinned: var(--color-white); + + .Avatar.online::after { + border-color: var(--color-chat-active); + } + + .ListItem-button { + --background-color: var(--color-chat-active) !important; + --color-text: var(--color-white); + } + + .icon-muted-chat { + color: var(--color-white) !important; + } + + .Badge:not(.pinned) { + background: var(--color-white); + color: var(--color-chat-active); + } } .info { diff --git a/src/components/middle/message/Poll.scss b/src/components/middle/message/Poll.scss index 7ccbd9d1d..b80a97fdd 100644 --- a/src/components/middle/message/Poll.scss +++ b/src/components/middle/message/Poll.scss @@ -53,9 +53,10 @@ &::before { left: 0.125rem; background-color: var(--background-color); + --color-borders: var(--color-white); .Message.own & { - border-color: var(--accent-color); + --color-borders: var(--accent-color); } } diff --git a/src/config.ts b/src/config.ts index f52473d16..8c5bf35eb 100644 --- a/src/config.ts +++ b/src/config.ts @@ -120,5 +120,5 @@ export const LANG_PACKS = ['android', 'ios']; export const TIPS_USERNAME = 'TelegramTips'; export const FEEDBACK_URL = 'https://bugs.telegram.org/?tag_ids=41&sort=time'; export const DARK_THEME_BG_COLOR = '#0F0F0F'; -export const DARK_THEME_PATTERN_COLOR = 'hsla(0, 0%, 3.82353%, 0.55)'; +export const DARK_THEME_PATTERN_COLOR = '#0a0a0a8c'; export const DEFAULT_PATTERN_COLOR = 'rgba(90, 110, 70, 0.6)'; diff --git a/src/styles/themes.json b/src/styles/themes.json index 019da81c7..5636b3302 100644 --- a/src/styles/themes.json +++ b/src/styles/themes.json @@ -10,16 +10,16 @@ "--color-borders": ["#DADCE0", "#100F10"], "--color-borders-input": ["#DADCE0", "#5B5B5A"], "--color-links": ["#52A1EF", "#868DF6"], - "--color-gray": ["#C4C9CC", "#808080"], + "--color-gray": ["#C4C9CC", "#717579"], "--color-pinned": ["#C4C9CC", "#707579"], "--color-default-shadow": ["#72727240", "#21212140"], "--color-light-shadow": ["#7272722B", "#00000040"], - "--color-green": ["#4DCD5E", "#868DF5"], - "--color-text-meta-colored": ["#4DCD5E", "#868DF5"], - "--color-reply-own-hover": ["#DBF4CE", "#A26947"], - "--color-reply-own-active": ["#C8EBBC", "#B0714C"], + "--color-green": ["#4DCD5E", "#8378DB"], + "--color-text-meta-colored": ["#4DCD5E", "#8378DB"], + "--color-reply-own-hover": ["#DBF4CE", "#6458bc"], + "--color-reply-own-active": ["#C8EBBC", "#4F4A9F"], "--color-accent-own": ["#4FAE4E", "#FFFFFF"], - "--color-message-meta-own": ["#4FAE4E", "#D9BDAD"], + "--color-message-meta-own": ["#4FAE4EFF", "#FFFFFF88"], "--color-own-links": ["#52A1EF", "#FFFFFF"], "--color-code-own": ["#3C7940", "#FFFFFF"] }