From 80d14a0d1814106e2755dafeb047727db1ce19c1 Mon Sep 17 00:00:00 2001 From: BFlat Date: Tue, 14 May 2024 16:37:00 +0700 Subject: [PATCH 1/3] grid css conflict fix --- .../PrelaunchLanding/PrelaunchLanding.scss | 8 ++++---- .../PrelaunchLanding/PrelaunchLanding.tsx | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/pages/landing/storyteller/PrelaunchLanding/PrelaunchLanding.scss b/packages/fakeyou.com/src/v2/view/pages/landing/storyteller/PrelaunchLanding/PrelaunchLanding.scss index 728fef697a..4de2b8209b 100644 --- a/packages/fakeyou.com/src/v2/view/pages/landing/storyteller/PrelaunchLanding/PrelaunchLanding.scss +++ b/packages/fakeyou.com/src/v2/view/pages/landing/storyteller/PrelaunchLanding/PrelaunchLanding.scss @@ -1,6 +1,6 @@ @import "scss/colours.scss"; -.grid-container { +.prelaunch-grid-container { display: grid; grid-template-columns: repeat(7, 1fr); grid-template-rows: repeat(7, calc(100vw / 7 * (9 / 16))); @@ -23,7 +23,7 @@ } } -.grid-item { +.prelaunch-grid-item { position: relative; background-color: rgba($white, 0.06); display: flex; @@ -48,7 +48,7 @@ height: 6rem; } - &.grid-item-custom { + &.prelaunch-grid-item-custom { overflow: visible; position: relative; @@ -115,7 +115,7 @@ } } -.grid-item.blank { +.prelaunch-grid-item.blank { background-color: transparent; border: none; } diff --git a/packages/fakeyou.com/src/v2/view/pages/landing/storyteller/PrelaunchLanding/PrelaunchLanding.tsx b/packages/fakeyou.com/src/v2/view/pages/landing/storyteller/PrelaunchLanding/PrelaunchLanding.tsx index f00298c952..d0794036bc 100644 --- a/packages/fakeyou.com/src/v2/view/pages/landing/storyteller/PrelaunchLanding/PrelaunchLanding.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/landing/storyteller/PrelaunchLanding/PrelaunchLanding.tsx @@ -86,7 +86,7 @@ const PrelaunchLanding: React.FC = () => { gridItems.push(
@@ -104,7 +104,7 @@ const PrelaunchLanding: React.FC = () => { gridItems.push(
@@ -122,7 +122,7 @@ const PrelaunchLanding: React.FC = () => { gridItems.push(
@@ -151,8 +151,8 @@ const PrelaunchLanding: React.FC = () => { gridItems.push(
{isBlank ? ( @@ -179,7 +179,7 @@ const PrelaunchLanding: React.FC = () => { return gridItems; }; - return
{renderGridItems()}
; + return
{renderGridItems()}
; }; export default PrelaunchLanding; From b73834a0c1844831c25c61d8f4137ea1f7cc735d Mon Sep 17 00:00:00 2001 From: BFlat Date: Tue, 14 May 2024 16:42:19 +0700 Subject: [PATCH 2/3] button link fixes --- .../PrelaunchLanding/PrelaunchLanding.tsx | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/pages/landing/storyteller/PrelaunchLanding/PrelaunchLanding.tsx b/packages/fakeyou.com/src/v2/view/pages/landing/storyteller/PrelaunchLanding/PrelaunchLanding.tsx index d0794036bc..9cc56c0490 100644 --- a/packages/fakeyou.com/src/v2/view/pages/landing/storyteller/PrelaunchLanding/PrelaunchLanding.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/landing/storyteller/PrelaunchLanding/PrelaunchLanding.tsx @@ -90,10 +90,13 @@ const PrelaunchLanding: React.FC = () => { isBlank ? "blank" : "" }`} > - +
); i += 2; @@ -108,10 +111,13 @@ const PrelaunchLanding: React.FC = () => { isBlank ? "blank" : "" }`} > - +
); i += 2; @@ -126,8 +132,10 @@ const PrelaunchLanding: React.FC = () => { isBlank ? "blank" : "" }`} > - + Join the Waitlist From 31636b4ed5336268266aec97d06c79c7e31bea5e Mon Sep 17 00:00:00 2001 From: BFlat Date: Tue, 14 May 2024 16:43:58 +0700 Subject: [PATCH 3/3] less rounded button --- .../landing/storyteller/PrelaunchLanding/PrelaunchLanding.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fakeyou.com/src/v2/view/pages/landing/storyteller/PrelaunchLanding/PrelaunchLanding.scss b/packages/fakeyou.com/src/v2/view/pages/landing/storyteller/PrelaunchLanding/PrelaunchLanding.scss index 4de2b8209b..8eda1ed07b 100644 --- a/packages/fakeyou.com/src/v2/view/pages/landing/storyteller/PrelaunchLanding/PrelaunchLanding.scss +++ b/packages/fakeyou.com/src/v2/view/pages/landing/storyteller/PrelaunchLanding/PrelaunchLanding.scss @@ -86,7 +86,7 @@ font-weight: 500; color: #fff; background-color: $primary; - border-radius: 50px; + border-radius: 1rem; cursor: pointer; transition: all 0.2s; width: 84%;