From cca7410bd035634ca7de198ebc9ce7138280eeb5 Mon Sep 17 00:00:00 2001
From: bgptr <bgptr@protonmail.com>
Date: Mon, 20 Dec 2021 20:22:26 +0100
Subject: [PATCH] resolve conflicts

---
 .../views/SettingsPage/SettingsTab/Settings.module.css    | 1 -
 .../groups/TimezoneSettings/TimezoneSettings.module.css   | 8 ++------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/components/views/SettingsPage/SettingsTab/Settings.module.css b/app/components/views/SettingsPage/SettingsTab/Settings.module.css
index f2d787101b..89760ea454 100644
--- a/app/components/views/SettingsPage/SettingsTab/Settings.module.css
+++ b/app/components/views/SettingsPage/SettingsTab/Settings.module.css
@@ -39,7 +39,6 @@
 
   .timezone {
     margin-left: 20px;
-    width: 21rem;
   }
 }
 
diff --git a/app/components/views/SettingsPage/SettingsTab/groups/TimezoneSettings/TimezoneSettings.module.css b/app/components/views/SettingsPage/SettingsTab/groups/TimezoneSettings/TimezoneSettings.module.css
index a4d4fc36ed..c2d474ca4c 100644
--- a/app/components/views/SettingsPage/SettingsTab/groups/TimezoneSettings/TimezoneSettings.module.css
+++ b/app/components/views/SettingsPage/SettingsTab/groups/TimezoneSettings/TimezoneSettings.module.css
@@ -2,10 +2,6 @@
   margin: 0 0 1rem 0 !important;
 }
 
-.timezoneOption > label > span:nth-child(1) {
-  border-color: var(--input-color);
-}
-
-.timezoneOption > label > span:nth-child(2) {
-  background-color: var(--input-color);
+.timezoneOption label {
+  color: var(--input-color-default);
 }