From ade53a5bd7943d5813fecc29171ff447b532e015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 15 Oct 2021 15:35:06 +0200
Subject: [PATCH] Do more re-ordering to keep things working
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 .../legacy-light/css/_legacy-light.scss       | 51 ++++++++-----------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss
index cc61b37141..fc625876f3 100644
--- a/res/themes/legacy-light/css/_legacy-light.scss
+++ b/res/themes/legacy-light/css/_legacy-light.scss
@@ -173,8 +173,6 @@ $roomtopic-color: #9e9e9e;
 $composer-e2e-icon-color: #91a1c0;
 $header-divider-color: #91a1c0;
 
-$voipcall-plinth-color: $system;
-
 // ********************
 
 $theme-button-bg-color: #e3e8f0;
@@ -196,8 +194,29 @@ $presence-online: $accent-color;
 $presence-away: #d9b072;
 $presence-offline: #e3e8f0;
 
+// Legacy theme backports
+$accent: #0DBD8B;
+$alert: #FF5B55;
+$links: #0086e6;
+$primary-content: $primary-fg-color;
+$secondary-content: $secondary-fg-color;
+$tertiary-content: $tertiary-fg-color;
+$quaternary-content: #6F7882;
+$quinary-content: $quaternary-content;
+$system: #F4F6FA;
+$background: $primary-bg-color;
+$panels: rgba($system, 0.9);
+$panel-base: #8D97A5; // This color is not intended for use in the app
+$panel-selected: rgba($tertiary-content, 0.3);
+$panel-hover: rgba($tertiary-content, 0.1);
+$panel-actions: $roomtile-selected-bg-color;
+$space-nav: rgba($tertiary-content, 0.15);
+// Legacy theme backports
+
 // ********************
 
+$voipcall-plinth-color: $system;
+
 $username-variant1-color: #368bd6;
 $username-variant2-color: #ac3ba8;
 $username-variant3-color: #03b381;
@@ -284,25 +303,6 @@ $progressbar-bg-color: rgba(141, 151, 165, 0.2);
 
 $room-warning-bg-color: $yellow-background;
 
-// Legacy theme backports
-$accent: #0DBD8B;
-$alert: #FF5B55;
-$links: #0086e6;
-$primary-content: $primary-fg-color;
-$secondary-content: $secondary-fg-color;
-$tertiary-content: $tertiary-fg-color;
-$quaternary-content: #6F7882;
-$quinary-content: $quaternary-content;
-$system: #F4F6FA;
-$background: $primary-bg-color;
-$panels: rgba($system, 0.9);
-$panel-base: #8D97A5; // This color is not intended for use in the app
-$panel-selected: rgba($tertiary-content, 0.3);
-$panel-hover: rgba($tertiary-content, 0.1);
-$panel-actions: $roomtile-selected-bg-color;
-$space-nav: rgba($tertiary-content, 0.15);
-// Legacy theme backports
-
 $memberstatus-placeholder-color: $muted-fg-color;
 
 $authpage-bg-color: #2e3649;
@@ -355,15 +355,6 @@ $eventbubble-bg-hover: #FAFBFD;
 $eventbubble-avatar-outline: #fff;
 $eventbubble-reply-color: #C1C6CD;
 
-// Legacy theme backports
-$primary-content: $primary-fg-color;
-$secondary-content: $secondary-fg-color;
-$tertiary-content: $tertiary-fg-color;
-$quaternary-content: #C1C6CD;
-$quinary-content: #e3e8f0;
-$background: $primary-bg-color;
-$panel-actions: $roomtile-selected-bg-color;
-
 // ***** Mixins! *****
 
 @define-mixin mx_DialogButton {