From 799fe02695ccdd2eb4be03652824fad42d72163f Mon Sep 17 00:00:00 2001
From: "lokapure.girish" <lokapure.girish@gmail.com>
Date: Tue, 23 Jan 2024 19:31:32 +0530
Subject: [PATCH 1/7] ui fixes

---
 .../components/Button/NextButtonSiteGen/index.js     |  3 ++-
 .../Button/NextButtonSiteGen/stylesheet.scss         |  7 +++++++
 .../HeadingWithSubHeading/SiteGen/stylesheet.scss    |  1 +
 .../components/StartOptions/stylesheet.scss          | 12 ++++++++----
 .../steps/SiteGen/Welcome/stylesheet.scss            |  1 +
 src/OnboardingSPA/styles/_branding.scss              |  2 +-
 6 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/OnboardingSPA/components/Button/NextButtonSiteGen/index.js b/src/OnboardingSPA/components/Button/NextButtonSiteGen/index.js
index da30df9cb..8cfa4aa31 100644
--- a/src/OnboardingSPA/components/Button/NextButtonSiteGen/index.js
+++ b/src/OnboardingSPA/components/Button/NextButtonSiteGen/index.js
@@ -37,7 +37,8 @@ const NextButtonSiteGen = ( {
 				}
 			} }
 		>
-			{ text }
+			<p>{ text }</p>
+
 			{ showChevronRight && (
 				<Icon
 					className={ 'nfd-onboarding-button--site-gen-next--icon' }
diff --git a/src/OnboardingSPA/components/Button/NextButtonSiteGen/stylesheet.scss b/src/OnboardingSPA/components/Button/NextButtonSiteGen/stylesheet.scss
index b4d93c286..29e720725 100644
--- a/src/OnboardingSPA/components/Button/NextButtonSiteGen/stylesheet.scss
+++ b/src/OnboardingSPA/components/Button/NextButtonSiteGen/stylesheet.scss
@@ -13,6 +13,7 @@
 		color: var(--nfd-onboarding-secondary);
 		background-color: var(--nfd-onboarding-primary);
 		font-size: clamp(0.5rem, 0.3864rem + 0.5682vw, 1.75rem);
+		margin-top: -20px;
 
 		@media (min-width: 2600px ) {
 			height: 76px;
@@ -31,6 +32,12 @@
 				color: var(--nfd-onboarding-secondary);
 			}
 		}
+		&--disabled p {
+			opacity: 0.5;
+		}
+		&--disabled svg {
+			opacity: 0.5;
+		}
 	}
 
 	&--icon {
diff --git a/src/OnboardingSPA/components/HeadingWithSubHeading/SiteGen/stylesheet.scss b/src/OnboardingSPA/components/HeadingWithSubHeading/SiteGen/stylesheet.scss
index d2ecccf73..1a79a0b9f 100644
--- a/src/OnboardingSPA/components/HeadingWithSubHeading/SiteGen/stylesheet.scss
+++ b/src/OnboardingSPA/components/HeadingWithSubHeading/SiteGen/stylesheet.scss
@@ -19,6 +19,7 @@
 			font-weight: 300;
 			text-align: center;
 			font-size: 20px;
+			margin-top: -20px;
 		}
 
 		&__icon {
diff --git a/src/OnboardingSPA/components/StartOptions/stylesheet.scss b/src/OnboardingSPA/components/StartOptions/stylesheet.scss
index 9dc5ff0a5..c9735ac39 100644
--- a/src/OnboardingSPA/components/StartOptions/stylesheet.scss
+++ b/src/OnboardingSPA/components/StartOptions/stylesheet.scss
@@ -47,13 +47,16 @@
 			}
 
 			&__span {
-				background-color: var(--nfd-onboarding-white);
-				color: rgb(6, 0, 0);
+				background-color: var(--nfd-onboarding-primary);
+				color: var(--nfd-onboarding-secondary);
 				padding-right: 6px;
 				padding-left: 5px;
 				margin-right: 5px;
-				border: 1px solid #fff;
+				border: 1px solid var(--nfd-onboarding-primary);
 				border-radius: 8px;
+				font-size: 18px;
+    			padding-top: 3px;
+    			padding-bottom: 2px;
 			}
 		}
 
@@ -84,7 +87,8 @@
 				font-weight: 510;
 				text-align: center;
 				font-size: 14px;
-				line-height: 16.71px;
+				margin-top: unset;
+				// line-height: 16.71px;
 			}
 		}
 	}
diff --git a/src/OnboardingSPA/steps/SiteGen/Welcome/stylesheet.scss b/src/OnboardingSPA/steps/SiteGen/Welcome/stylesheet.scss
index 11b3a18d6..d8351aa63 100644
--- a/src/OnboardingSPA/steps/SiteGen/Welcome/stylesheet.scss
+++ b/src/OnboardingSPA/steps/SiteGen/Welcome/stylesheet.scss
@@ -45,6 +45,7 @@
 						background-size: cover;
 						background-repeat: no-repeat;
 						background-image: var(--sitegen-ai-icon);
+						background-color: #fff;
 						box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.1);
 
 						@media (max-width: #{ ($break-small) }) {
diff --git a/src/OnboardingSPA/styles/_branding.scss b/src/OnboardingSPA/styles/_branding.scss
index 0677b95f7..446f76c99 100644
--- a/src/OnboardingSPA/styles/_branding.scss
+++ b/src/OnboardingSPA/styles/_branding.scss
@@ -327,7 +327,7 @@ body {
 		--nfd-onboarding-progress-bar-fill: #0060f0;
 		--nfd-onboarding-progress-bar-background: #d5d5d5;
 		--nfd-onboarding-site-logo-on-drag: rgba(53, 59, 64, 0.3);
-		--nfd-onboarding-navigation-back-background: rgba(54, 62, 68, 0.35);
+		--nfd-onboarding-navigation-back-background: rgba(212, 212, 212, 0.35);
 		--nfd-onboarding-site-logo-border: var(--nfd-onboarding-primary);
 		--nfd-onboarding-header-border: rgba(var(--nfd-onboarding-primary-rgb), 0.3);
 		--nfd-onboarding-card-overlay: rgba(0, 0, 0, 0.4);

From 26a4d8e0ac51a3c611c5602daade4af18cadf11c Mon Sep 17 00:00:00 2001
From: "lokapure.girish" <lokapure.girish@gmail.com>
Date: Wed, 24 Jan 2024 16:38:52 +0530
Subject: [PATCH 2/7] lint issues

---
 .../components/Button/NextButtonSiteGen/stylesheet.scss       | 2 ++
 src/OnboardingSPA/components/StartOptions/stylesheet.scss     | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/OnboardingSPA/components/Button/NextButtonSiteGen/stylesheet.scss b/src/OnboardingSPA/components/Button/NextButtonSiteGen/stylesheet.scss
index 29e720725..76486e583 100644
--- a/src/OnboardingSPA/components/Button/NextButtonSiteGen/stylesheet.scss
+++ b/src/OnboardingSPA/components/Button/NextButtonSiteGen/stylesheet.scss
@@ -32,9 +32,11 @@
 				color: var(--nfd-onboarding-secondary);
 			}
 		}
+
 		&--disabled p {
 			opacity: 0.5;
 		}
+
 		&--disabled svg {
 			opacity: 0.5;
 		}
diff --git a/src/OnboardingSPA/components/StartOptions/stylesheet.scss b/src/OnboardingSPA/components/StartOptions/stylesheet.scss
index c9735ac39..22d2b3a29 100644
--- a/src/OnboardingSPA/components/StartOptions/stylesheet.scss
+++ b/src/OnboardingSPA/components/StartOptions/stylesheet.scss
@@ -55,8 +55,8 @@
 				border: 1px solid var(--nfd-onboarding-primary);
 				border-radius: 8px;
 				font-size: 18px;
-    			padding-top: 3px;
-    			padding-bottom: 2px;
+				padding-top: 3px;
+				padding-bottom: 2px;
 			}
 		}
 

From 904726ec1f62a929d62050a3119e59acefde4880 Mon Sep 17 00:00:00 2001
From: "lokapure.girish" <lokapure.girish@gmail.com>
Date: Thu, 25 Jan 2024 12:35:02 +0530
Subject: [PATCH 3/7] css changes

---
 .../components/ImageUploaderWithText/stylesheet.scss          | 2 +-
 src/OnboardingSPA/components/StartOptions/stylesheet.scss     | 2 +-
 src/OnboardingSPA/steps/SiteGen/SiteLogo/stylesheet.scss      | 3 ++-
 src/OnboardingSPA/steps/SiteGen/SocialMedia/stylesheet.scss   | 4 +++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/OnboardingSPA/components/ImageUploader/components/ImageUploaderWithText/stylesheet.scss b/src/OnboardingSPA/components/ImageUploader/components/ImageUploaderWithText/stylesheet.scss
index 3a85d48e9..77148a5ef 100644
--- a/src/OnboardingSPA/components/ImageUploader/components/ImageUploaderWithText/stylesheet.scss
+++ b/src/OnboardingSPA/components/ImageUploader/components/ImageUploaderWithText/stylesheet.scss
@@ -106,7 +106,7 @@
 					flex-direction: column;
 					justify-content: center;
 					margin-left: 18px;
-					max-width: 27vw;
+					max-width: 26vw;
 
 					@media (max-width: #{ ($break-large) }) {
 						width: 60vw;
diff --git a/src/OnboardingSPA/components/StartOptions/stylesheet.scss b/src/OnboardingSPA/components/StartOptions/stylesheet.scss
index 22d2b3a29..cb6dea4bf 100644
--- a/src/OnboardingSPA/components/StartOptions/stylesheet.scss
+++ b/src/OnboardingSPA/components/StartOptions/stylesheet.scss
@@ -54,7 +54,7 @@
 				margin-right: 5px;
 				border: 1px solid var(--nfd-onboarding-primary);
 				border-radius: 8px;
-				font-size: 18px;
+				font-size: clamp(15px, 17px, 19px);
 				padding-top: 3px;
 				padding-bottom: 2px;
 			}
diff --git a/src/OnboardingSPA/steps/SiteGen/SiteLogo/stylesheet.scss b/src/OnboardingSPA/steps/SiteGen/SiteLogo/stylesheet.scss
index 47ec0a713..8fb635389 100644
--- a/src/OnboardingSPA/steps/SiteGen/SiteLogo/stylesheet.scss
+++ b/src/OnboardingSPA/steps/SiteGen/SiteLogo/stylesheet.scss
@@ -18,16 +18,17 @@
 				&__buttons {
 					width: 99%;
 					display: flex;
-					padding: 16px;
 					flex-direction: row;
 					align-items: center;
 					justify-content: flex-end;
+					margin-top: 30px;
 
 					&__skip {
 						font-size: clamp(0.6rem, 0.755rem + 0.227vw, 1.3rem);
 						font-style: normal;
 						font-weight: 510;
 						margin-right: 24px;
+						margin-top: -20px;
 
 						&:hover {
 							text-decoration: underline;
diff --git a/src/OnboardingSPA/steps/SiteGen/SocialMedia/stylesheet.scss b/src/OnboardingSPA/steps/SiteGen/SocialMedia/stylesheet.scss
index 915ab88cd..633cda4eb 100644
--- a/src/OnboardingSPA/steps/SiteGen/SocialMedia/stylesheet.scss
+++ b/src/OnboardingSPA/steps/SiteGen/SocialMedia/stylesheet.scss
@@ -16,13 +16,15 @@
 					display: flex;
 					align-items: center;
 					justify-content: flex-end;
-					padding: 16px;
+					// padding: 16px;
+					margin-top: 30px;
 
 					&__skip {
 						font-size: clamp(0.6rem, 0.755rem + 0.227vw, 1.3rem);
 						font-style: normal;
 						font-weight: 510;
 						margin-right: 24px;
+						margin-top: -20px;
 
 						&:hover {
 							text-decoration: underline;

From 15331f44459cefcf2cdae24db08eda484fcc4b3f Mon Sep 17 00:00:00 2001
From: "lokapure.girish" <lokapure.girish@gmail.com>
Date: Thu, 25 Jan 2024 15:17:41 +0530
Subject: [PATCH 4/7] review changes

---
 .../components/Button/NextButtonSiteGen/index.js              | 2 +-
 .../components/Button/NextButtonSiteGen/stylesheet.scss       | 4 ++--
 .../components/HeadingWithSubHeading/SiteGen/stylesheet.scss  | 3 +--
 src/OnboardingSPA/components/StartOptions/stylesheet.scss     | 1 -
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/OnboardingSPA/components/Button/NextButtonSiteGen/index.js b/src/OnboardingSPA/components/Button/NextButtonSiteGen/index.js
index 8cfa4aa31..9d7f6a5a4 100644
--- a/src/OnboardingSPA/components/Button/NextButtonSiteGen/index.js
+++ b/src/OnboardingSPA/components/Button/NextButtonSiteGen/index.js
@@ -37,7 +37,7 @@ const NextButtonSiteGen = ( {
 				}
 			} }
 		>
-			<p>{ text }</p>
+			<p className="nfd-onboarding-button--site-gen-next--text">{ text }</p>
 
 			{ showChevronRight && (
 				<Icon
diff --git a/src/OnboardingSPA/components/Button/NextButtonSiteGen/stylesheet.scss b/src/OnboardingSPA/components/Button/NextButtonSiteGen/stylesheet.scss
index 76486e583..99212f32f 100644
--- a/src/OnboardingSPA/components/Button/NextButtonSiteGen/stylesheet.scss
+++ b/src/OnboardingSPA/components/Button/NextButtonSiteGen/stylesheet.scss
@@ -33,11 +33,11 @@
 			}
 		}
 
-		&--disabled p {
+		&--disabled &--text {
 			opacity: 0.5;
 		}
 
-		&--disabled svg {
+		&--disabled &--icon {
 			opacity: 0.5;
 		}
 	}
diff --git a/src/OnboardingSPA/components/HeadingWithSubHeading/SiteGen/stylesheet.scss b/src/OnboardingSPA/components/HeadingWithSubHeading/SiteGen/stylesheet.scss
index 1a79a0b9f..f50f38677 100644
--- a/src/OnboardingSPA/components/HeadingWithSubHeading/SiteGen/stylesheet.scss
+++ b/src/OnboardingSPA/components/HeadingWithSubHeading/SiteGen/stylesheet.scss
@@ -10,7 +10,7 @@
 			font-weight: 300;
 			text-align: center;
 			color: var(--nfd-onboarding-primary);
-			margin: 35px !important;
+			margin: 35px 35px 15px 35px !important;
 			font-size: 30px;
 		}
 
@@ -19,7 +19,6 @@
 			font-weight: 300;
 			text-align: center;
 			font-size: 20px;
-			margin-top: -20px;
 		}
 
 		&__icon {
diff --git a/src/OnboardingSPA/components/StartOptions/stylesheet.scss b/src/OnboardingSPA/components/StartOptions/stylesheet.scss
index cb6dea4bf..b38b855a0 100644
--- a/src/OnboardingSPA/components/StartOptions/stylesheet.scss
+++ b/src/OnboardingSPA/components/StartOptions/stylesheet.scss
@@ -88,7 +88,6 @@
 				text-align: center;
 				font-size: 14px;
 				margin-top: unset;
-				// line-height: 16.71px;
 			}
 		}
 	}

From 734a2dc38106619dc0faa46acad4490e7d0f1ed0 Mon Sep 17 00:00:00 2001
From: "lokapure.girish" <lokapure.girish@gmail.com>
Date: Thu, 25 Jan 2024 15:32:23 +0530
Subject: [PATCH 5/7] pr

---
 src/OnboardingSPA/components/StartOptions/stylesheet.scss   | 2 +-
 src/OnboardingSPA/steps/SiteGen/SocialMedia/stylesheet.scss | 1 -
 src/OnboardingSPA/steps/SiteGen/Welcome/stylesheet.scss     | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/OnboardingSPA/components/StartOptions/stylesheet.scss b/src/OnboardingSPA/components/StartOptions/stylesheet.scss
index b38b855a0..ecce3ce08 100644
--- a/src/OnboardingSPA/components/StartOptions/stylesheet.scss
+++ b/src/OnboardingSPA/components/StartOptions/stylesheet.scss
@@ -87,7 +87,7 @@
 				font-weight: 510;
 				text-align: center;
 				font-size: 14px;
-				margin-top: unset;
+				margin-top: 0px;
 			}
 		}
 	}
diff --git a/src/OnboardingSPA/steps/SiteGen/SocialMedia/stylesheet.scss b/src/OnboardingSPA/steps/SiteGen/SocialMedia/stylesheet.scss
index 633cda4eb..496b20266 100644
--- a/src/OnboardingSPA/steps/SiteGen/SocialMedia/stylesheet.scss
+++ b/src/OnboardingSPA/steps/SiteGen/SocialMedia/stylesheet.scss
@@ -16,7 +16,6 @@
 					display: flex;
 					align-items: center;
 					justify-content: flex-end;
-					// padding: 16px;
 					margin-top: 30px;
 
 					&__skip {
diff --git a/src/OnboardingSPA/steps/SiteGen/Welcome/stylesheet.scss b/src/OnboardingSPA/steps/SiteGen/Welcome/stylesheet.scss
index d8351aa63..11b3a18d6 100644
--- a/src/OnboardingSPA/steps/SiteGen/Welcome/stylesheet.scss
+++ b/src/OnboardingSPA/steps/SiteGen/Welcome/stylesheet.scss
@@ -45,7 +45,6 @@
 						background-size: cover;
 						background-repeat: no-repeat;
 						background-image: var(--sitegen-ai-icon);
-						background-color: #fff;
 						box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.1);
 
 						@media (max-width: #{ ($break-small) }) {

From 8eba56108c7e54aa8246e8ebf83291236146eff8 Mon Sep 17 00:00:00 2001
From: "lokapure.girish" <lokapure.girish@gmail.com>
Date: Thu, 25 Jan 2024 16:03:27 +0530
Subject: [PATCH 6/7] Update stylesheet.scss

---
 src/OnboardingSPA/components/StartOptions/stylesheet.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OnboardingSPA/components/StartOptions/stylesheet.scss b/src/OnboardingSPA/components/StartOptions/stylesheet.scss
index ecce3ce08..b57c58d58 100644
--- a/src/OnboardingSPA/components/StartOptions/stylesheet.scss
+++ b/src/OnboardingSPA/components/StartOptions/stylesheet.scss
@@ -87,7 +87,7 @@
 				font-weight: 510;
 				text-align: center;
 				font-size: 14px;
-				margin-top: 0px;
+				margin-top: 0;
 			}
 		}
 	}

From 907c2d04a15121ea627ab8e300e1e9fad17fac04 Mon Sep 17 00:00:00 2001
From: "lokapure.girish" <lokapure.girish@gmail.com>
Date: Thu, 25 Jan 2024 18:11:59 +0530
Subject: [PATCH 7/7] margin issues

---
 .../components/Button/NextButtonSiteGen/stylesheet.scss        | 1 -
 src/OnboardingSPA/steps/SiteGen/SiteLogo/stylesheet.scss       | 3 +--
 src/OnboardingSPA/steps/SiteGen/SocialMedia/stylesheet.scss    | 3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/OnboardingSPA/components/Button/NextButtonSiteGen/stylesheet.scss b/src/OnboardingSPA/components/Button/NextButtonSiteGen/stylesheet.scss
index 99212f32f..561156970 100644
--- a/src/OnboardingSPA/components/Button/NextButtonSiteGen/stylesheet.scss
+++ b/src/OnboardingSPA/components/Button/NextButtonSiteGen/stylesheet.scss
@@ -13,7 +13,6 @@
 		color: var(--nfd-onboarding-secondary);
 		background-color: var(--nfd-onboarding-primary);
 		font-size: clamp(0.5rem, 0.3864rem + 0.5682vw, 1.75rem);
-		margin-top: -20px;
 
 		@media (min-width: 2600px ) {
 			height: 76px;
diff --git a/src/OnboardingSPA/steps/SiteGen/SiteLogo/stylesheet.scss b/src/OnboardingSPA/steps/SiteGen/SiteLogo/stylesheet.scss
index 8fb635389..9812ad2cb 100644
--- a/src/OnboardingSPA/steps/SiteGen/SiteLogo/stylesheet.scss
+++ b/src/OnboardingSPA/steps/SiteGen/SiteLogo/stylesheet.scss
@@ -21,14 +21,13 @@
 					flex-direction: row;
 					align-items: center;
 					justify-content: flex-end;
-					margin-top: 30px;
+					margin-top: 20px;
 
 					&__skip {
 						font-size: clamp(0.6rem, 0.755rem + 0.227vw, 1.3rem);
 						font-style: normal;
 						font-weight: 510;
 						margin-right: 24px;
-						margin-top: -20px;
 
 						&:hover {
 							text-decoration: underline;
diff --git a/src/OnboardingSPA/steps/SiteGen/SocialMedia/stylesheet.scss b/src/OnboardingSPA/steps/SiteGen/SocialMedia/stylesheet.scss
index 496b20266..36de33880 100644
--- a/src/OnboardingSPA/steps/SiteGen/SocialMedia/stylesheet.scss
+++ b/src/OnboardingSPA/steps/SiteGen/SocialMedia/stylesheet.scss
@@ -16,14 +16,13 @@
 					display: flex;
 					align-items: center;
 					justify-content: flex-end;
-					margin-top: 30px;
+					margin-top: 20px;
 
 					&__skip {
 						font-size: clamp(0.6rem, 0.755rem + 0.227vw, 1.3rem);
 						font-style: normal;
 						font-weight: 510;
 						margin-right: 24px;
-						margin-top: -20px;
 
 						&:hover {
 							text-decoration: underline;