Resolve conflicts from merging in main

FordLabs · Apr 20, 2022 · 9b92cb4 · 9b92cb4
1 parent 548ad2c
commit 9b92cb4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/ui/src/Common/Dropdown/Dropdown.scss b/ui/src/Common/Dropdown/Dropdown.scss
@@ -78,6 +78,6 @@
 
 @include main.dark-theme {
 	.dropdown {
-		background-color: main.$gray;
+		background-color: main.$gray-1;
 	}
 }
diff --git a/ui/src/Common/FormTemplate/FormTemplate.scss b/ui/src/Common/FormTemplate/FormTemplate.scss
@@ -139,7 +139,7 @@
 
 				&:hover,
 				&:focus {
-					color: main.$gray;
+					color: main.$gray-1;
 				}
 			}
 		}

diff --git a/ui/src/Common/Timer/Timer.scss b/ui/src/Common/Timer/Timer.scss
@@ -80,7 +80,7 @@ $timer-height: 2.81rem;
 @include main.dark-theme {
 	.timer {
 		.timer-count-down {
-			background-color: main.$gray;
+			background-color: main.$gray-1;
 		}
 	}
 }