fixed merge conflicts and CSS vars

newfold-labs · May 10, 2023 · 9571a7c · 9571a7c
1 parent 06a9ca2
commit 9571a7c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/OnboardingSPA/pages/Steps/GetStarted/SiteTypeSetup/PrimarySite/stylesheet.scss b/src/OnboardingSPA/pages/Steps/GetStarted/SiteTypeSetup/PrimarySite/stylesheet.scss
@@ -70,7 +70,7 @@
 
 	&.chosenPrimaryCategory {
 		background-color: var(--wp-admin-theme-color-darker-10);
-		color: var(--nfd-onboarding-light);
+		color: var(--nfd-onboarding-base);
 	}
 
 	&-wrapper {
@@ -95,7 +95,7 @@
 	&:hover {
 		transition: all 0.2s ease-in;
 		background-color: rgba($color: var(--wp-admin-theme-color-darker-10--rgb), $alpha: 0.7);
-		color: var(--nfd-onboarding-light);
+		color: var(--nfd-onboarding-base);
 
 		.nfd-card-pri-category-wrapper-icon {
 			transition: all 0.2s ease-in;

diff --git a/src/OnboardingSPA/pages/Steps/GetStarted/SiteTypeSetup/SecondarySite/stylesheet.scss b/src/OnboardingSPA/pages/Steps/GetStarted/SiteTypeSetup/SecondarySite/stylesheet.scss
@@ -56,23 +56,23 @@
 	margin: auto 0.2rem 1.15rem 1rem;
 	background-position: center;
 	color: var(--nfd-onboarding-black);
-	background-color: var(--nfd-onboarding-light-gray-3);
+	background-color: var(--nfd-onboarding-base-gray);
 
 	&.chosenSecondaryCategory {
 		background-color: var(--wp-admin-theme-color-darker-10);
-		color: var(--nfd-onboarding-light);
+		color: var(--nfd-onboarding-base);
 	}
 
 	&:hover {
 		transition: all 0.2s ease-in;
 		background-color: rgba($color: var(--wp-admin-theme-color-darker-10--rgb), $alpha: 0.7);
-		color: var(--nfd-onboarding-light);
+		color: var(--nfd-onboarding-base);
 	}
 
 	&-wrapper {
 		display: inline-flex;
 		margin-bottom: 2rem;
-		border-bottom: 2px solid #00568c;
+		border-bottom: 2px solid var(--wp-admin-theme-color-darker-10);
 
 	}
 }
@@ -129,7 +129,7 @@
 
 		&-text {
 			display: inline-block;
-			color: var(--nfd-onboarding-dark);
+			color: var(--nfd-onboarding-black);
 			font-size: 0.85rem;
 			font-weight: 400;
 			margin: 0;