From 6693ec340101c3912f6095dcb5efef950e155e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sat, 16 Oct 2021 20:54:23 +0200 Subject: [PATCH] Reorder things to make it work MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/themes/legacy-dark/css/_legacy-dark.scss | 20 +++++++++---------- .../legacy-light/css/_legacy-light.scss | 12 +++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/res/themes/legacy-dark/css/_legacy-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss index 15c9652af8..b27b7f920b 100644 --- a/res/themes/legacy-dark/css/_legacy-dark.scss +++ b/res/themes/legacy-dark/css/_legacy-dark.scss @@ -109,6 +109,16 @@ $roomtopic-color: $text-secondary-color; $header-divider-color: $header-panel-text-primary-color; $composer-e2e-icon-color: $header-panel-text-primary-color; +// Legacy theme backports +$primary-content: $primary-fg-color; +$secondary-content: $secondary-fg-color; +$tertiary-content: $tertiary-fg-color; +$quaternary-content: #6F7882; +$quinary-content: $quaternary-content; +$background: $primary-bg-color; +$panel-actions: $roomtile-selected-bg-color; +// Legacy theme backports + // ******************** $theme-button-bg-color: #e3e8f0; @@ -208,16 +218,6 @@ $eventbubble-bg-hover: #1C2026; $eventbubble-avatar-outline: $bg-color; $eventbubble-reply-color: #C1C6CD; -// Legacy theme backports -$primary-content: $primary-fg-color; -$secondary-content: $secondary-fg-color; -$tertiary-content: $tertiary-fg-color; -$quaternary-content: #6F7882; -$quinary-content: $quaternary-content; -$background: $primary-bg-color; -$panel-actions: $roomtile-selected-bg-color; -// Legacy theme backports - // ***** Mixins! ***** @define-mixin mx_DialogButton { diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss index 682bebc4a6..09dd46d151 100644 --- a/res/themes/legacy-light/css/_legacy-light.scss +++ b/res/themes/legacy-light/css/_legacy-light.scss @@ -52,10 +52,6 @@ $info-bg-color: #2a9edf; $mention-user-pill-bg-color: $warning-color; $other-user-pill-bg-color: rgba(0, 0, 0, 0.1); -// pinned events indicator -$pinned-unread-color: $notice-primary-color; -$pinned-color: $tertiary-content; - // informational plinth $info-plinth-bg-color: #f7f7f7; $info-plinth-fg-color: #888; @@ -180,8 +176,6 @@ $roomlist-bg-color: $header-panel-bg-color; $roomlist-header-color: $primary-fg-color; $roomsublist-skeleton-ui-bg: linear-gradient(180deg, #ffffff 0%, #ffffff00 100%); -$groupFilterPanel-divider-color: $tertiary-content; - $roomtile-default-badge-bg-color: #61708b; $roomtile-selected-bg-color: #fff; @@ -347,6 +341,12 @@ $eventbubble-bg-hover: #FAFBFD; $eventbubble-avatar-outline: #fff; $eventbubble-reply-color: #C1C6CD; +// pinned events indicator +$pinned-unread-color: $notice-primary-color; +$pinned-color: $tertiary-content; + +$groupFilterPanel-divider-color: $tertiary-content; + // ***** Mixins! ***** @define-mixin mx_DialogButton {