resolve conflicts

decred · Dec 20, 2021 · cca7410 · cca7410
1 parent 0c31729
commit cca7410
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git 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/...onents/views/SettingsPage/SettingsTab/groups/TimezoneSettings/TimezoneSettings.module.css b/...onents/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);
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,7 +39,6 @@ @@
       .timezone {
         margin-left: 20px;
-        width: 21rem;
       }
     }
@@ Expand Down @@