From c977df0f92d3f540c587e47e361a299afb96aadb Mon Sep 17 00:00:00 2001 From: hasan-deriv Date: Fri, 8 Dec 2023 10:59:17 +0800 Subject: [PATCH 01/11] chore: fixed designers suggestions for hero content --- src/features/pages/home/hero/index.tsx | 22 +++++++---------- .../pages/home/hero/styles.module.scss | 24 +++++++++++++++---- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/src/features/pages/home/hero/index.tsx b/src/features/pages/home/hero/index.tsx index 9ca8a94750f..d635bd32695 100644 --- a/src/features/pages/home/hero/index.tsx +++ b/src/features/pages/home/hero/index.tsx @@ -7,6 +7,7 @@ import { hero_content_btn, hero_content_award_img, hero_content_gradient, + hero_img, } from './styles.module.scss' import { Localize } from 'components/localization' import useRegion from 'components/hooks/use-region' @@ -40,12 +41,7 @@ const HomeHero: React.FC = () => { )} -
+
@@ -61,12 +57,7 @@ const HomeHero: React.FC = () => {
-
+
= () => { />
-
+
{is_eu ? ( Date: Fri, 8 Dec 2023 11:03:02 +0800 Subject: [PATCH 02/11] chore: fixed hero height for tablet and desktop --- src/features/pages/home/hero/index.tsx | 46 +++++++++++++------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/features/pages/home/hero/index.tsx b/src/features/pages/home/hero/index.tsx index d635bd32695..9d2be1809c6 100644 --- a/src/features/pages/home/hero/index.tsx +++ b/src/features/pages/home/hero/index.tsx @@ -21,7 +21,7 @@ const HomeHero: React.FC = () => { const { is_eu } = useRegion() return ( -
+
{is_eu ? ( = () => { placeholder="none" />
+
+ {is_eu ? ( + + ) : ( + + )} +
-
- {is_eu ? ( - - ) : ( - - )} -
) From 4eaf98aef3a7c4dc690763423aaba3daaa262eaf Mon Sep 17 00:00:00 2001 From: hasan-deriv Date: Fri, 8 Dec 2023 11:04:20 +0800 Subject: [PATCH 03/11] chore: fixed hero height for tablet and desktop --- src/features/pages/home/hero/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/features/pages/home/hero/index.tsx b/src/features/pages/home/hero/index.tsx index 9d2be1809c6..efe9e96d70b 100644 --- a/src/features/pages/home/hero/index.tsx +++ b/src/features/pages/home/hero/index.tsx @@ -21,7 +21,7 @@ const HomeHero: React.FC = () => { const { is_eu } = useRegion() return ( -
+
{is_eu ? ( Date: Fri, 8 Dec 2023 11:13:59 +0800 Subject: [PATCH 04/11] chore: fixed hero image height --- src/features/pages/home/hero/index.tsx | 13 ++++--------- src/features/pages/home/hero/styles.module.scss | 5 +++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/features/pages/home/hero/index.tsx b/src/features/pages/home/hero/index.tsx index efe9e96d70b..4e54e3b89fd 100644 --- a/src/features/pages/home/hero/index.tsx +++ b/src/features/pages/home/hero/index.tsx @@ -40,7 +40,7 @@ const HomeHero: React.FC = () => { /> )} - +
@@ -80,24 +80,19 @@ const HomeHero: React.FC = () => { placeholder="none" />
-
+
{is_eu ? ( ) : ( )} diff --git a/src/features/pages/home/hero/styles.module.scss b/src/features/pages/home/hero/styles.module.scss index b19ff5beddf..47910621896 100644 --- a/src/features/pages/home/hero/styles.module.scss +++ b/src/features/pages/home/hero/styles.module.scss @@ -21,10 +21,15 @@ } } .hero_img{ + right: -72px; @media only screen and (min-width: 601px){ margin-inline-start: auto; left: auto; } + @media only screen and (min-width: 1024px){ + width: 60vh; + right: -48px; + } } .hero_content_award_img { margin-inline: auto; From d32398f9dcbef5c94ef6d204cc65eaf82107cf38 Mon Sep 17 00:00:00 2001 From: hasan-deriv Date: Fri, 8 Dec 2023 14:34:32 +0800 Subject: [PATCH 05/11] chore: fixed hero image height for mobile --- src/features/pages/home/hero/styles.module.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/features/pages/home/hero/styles.module.scss b/src/features/pages/home/hero/styles.module.scss index 47910621896..b3fcd8bd578 100644 --- a/src/features/pages/home/hero/styles.module.scss +++ b/src/features/pages/home/hero/styles.module.scss @@ -22,6 +22,7 @@ } .hero_img{ right: -72px; + width: 55vh; @media only screen and (min-width: 601px){ margin-inline-start: auto; left: auto; From fd4aa47a5470b7c479a83d808539de2c42732cf0 Mon Sep 17 00:00:00 2001 From: hasan-deriv Date: Fri, 8 Dec 2023 14:56:07 +0800 Subject: [PATCH 06/11] chore: updated header button text --- src/features/pages/home/navigation/nav.buttons.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/features/pages/home/navigation/nav.buttons.tsx b/src/features/pages/home/navigation/nav.buttons.tsx index a5f7d815431..cb4b7ab6897 100644 --- a/src/features/pages/home/navigation/nav.buttons.tsx +++ b/src/features/pages/home/navigation/nav.buttons.tsx @@ -36,7 +36,7 @@ export const MainNavigationButtons = () => { )} From 3a2d21d6561da11f66f9404ee3bc6cf33b928dc3 Mon Sep 17 00:00:00 2001 From: hasan-deriv Date: Fri, 8 Dec 2023 16:46:20 +0800 Subject: [PATCH 07/11] chore: updated years data --- src/features/pages/home/years/data.tsx | 55 +++++++++++++++++++++ src/features/pages/home/years/index.tsx | 63 ++++--------------------- 2 files changed, 64 insertions(+), 54 deletions(-) create mode 100644 src/features/pages/home/years/data.tsx diff --git a/src/features/pages/home/years/data.tsx b/src/features/pages/home/years/data.tsx new file mode 100644 index 00000000000..428ca653f26 --- /dev/null +++ b/src/features/pages/home/years/data.tsx @@ -0,0 +1,55 @@ +import React from 'react' +import { CardContent } from '@deriv-com/components' +import { + LightDependableIcon, + LightSafeAndSecureIcon, + LightRegulatedIcon, + LightTwentyFourSevenSupportIcon, + // eslint-disable-next-line import/no-unresolved +} from '@deriv/quill-icons/Illustration' +import { localize } from 'components/localization' + +export const cards: CardContent[] = [ + { + id: 1, + header: localize('_t_Dependable_t_'), + description: localize( + '_t_Cutting-edge technology with 99.97% uptime for uninterrupted trading._t_', + ), + size: 'sm', + color: 'gray', + align: 'center', + icon: , + }, + { + id: 2, + header: localize('_t_Safe & Secure_t_'), + description: localize( + '_t_Your personal data is private, and your funds are safely segregated._t_', + ), + size: 'sm', + color: 'light', + align: 'center', + icon: , + }, + { + id: 3, + header: localize('_t_Regulated_t_'), + description: localize( + '_t_We’re regulated and licensed by global financial authorities._t_', + ), + size: 'sm', + color: 'light', + align: 'center', + icon: , + }, + { + id: 4, + header: localize('_t_24/7 support_t_'), + description: localize('_t_Our professional multilingual team is here for you anytime._t_'), + size: 'sm', + color: 'light', + align: 'center', + icon: , + }, +] diff --git a/src/features/pages/home/years/index.tsx b/src/features/pages/home/years/index.tsx index 44732e12812..30a19cf1d78 100644 --- a/src/features/pages/home/years/index.tsx +++ b/src/features/pages/home/years/index.tsx @@ -1,63 +1,18 @@ import React from 'react' import { Features } from '@deriv-com/blocks' -import { CardContent } from '@deriv-com/components' -import { - LightDependableIcon, - LightSafeAndSecureIcon, - LightRegulatedIcon, - LightTwentyFourSevenSupportIcon, - // eslint-disable-next-line import/no-unresolved -} from '@deriv/quill-icons/Illustration' +import { cards } from './data' import { localize } from 'components/localization' -const cards: CardContent[] = [ - { - id: 1, - header: localize('_t_Dependable_t_'), - description: localize( - '_t_Cutting-edge technology with 99.97% uptime for uninterrupted trading._t_', - ), - size: 'sm', - color: 'light', - align: 'center', - icon: , - }, - { - id: 2, - header: localize('_t_Safe & Secure_t_'), - description: localize( - '_t_Your personal data is private, and your funds are safely segregated._t_', - ), - size: 'sm', - color: 'light', - align: 'center', - icon: , - }, - { - id: 3, - header: localize('_t_Regulated_t_'), - description: localize( - '_t_We’re regulated and licensed by global financial authorities._t_', - ), - size: 'sm', - color: 'light', - align: 'center', - icon: , - }, - { - id: 4, - header: localize('_t_24/7 support_t_'), - description: localize('_t_Our professional multilingual team is here for you anytime._t_'), - size: 'sm', - color: 'light', - align: 'center', - icon: , - }, -] - const TwentyYearsStrong = () => { return ( - + ) } From bf950bbf2b6106cc28e31c0d6bd44f92df8ef813 Mon Sep 17 00:00:00 2001 From: hasan-deriv Date: Fri, 8 Dec 2023 16:46:58 +0800 Subject: [PATCH 08/11] chore: updated years data --- src/features/pages/home/years/data.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/features/pages/home/years/data.tsx b/src/features/pages/home/years/data.tsx index 428ca653f26..06c1461f1af 100644 --- a/src/features/pages/home/years/data.tsx +++ b/src/features/pages/home/years/data.tsx @@ -17,7 +17,7 @@ export const cards: CardContent[] = [ '_t_Cutting-edge technology with 99.97% uptime for uninterrupted trading._t_', ), size: 'sm', - color: 'gray', + color: 'light', align: 'center', icon: , }, From 54060319e56758024cae0c787864ef3e888a5adc Mon Sep 17 00:00:00 2001 From: hasan-deriv Date: Fri, 8 Dec 2023 17:46:37 +0800 Subject: [PATCH 09/11] chore: updated gap between hero content and award image --- src/features/pages/home/hero/index.tsx | 11 ++++++-- .../pages/home/hero/styles.module.scss | 28 +++++++++++++++++-- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/src/features/pages/home/hero/index.tsx b/src/features/pages/home/hero/index.tsx index 4e54e3b89fd..985935ebbd1 100644 --- a/src/features/pages/home/hero/index.tsx +++ b/src/features/pages/home/hero/index.tsx @@ -3,11 +3,13 @@ import { Button, FluidContainer, Heading, Section, Text } from '@deriv/quill-des import clsx from 'clsx' import { StaticImage } from 'gatsby-plugin-image' import { + hero_container, hero_content, hero_content_btn, hero_content_award_img, hero_content_gradient, hero_img, + hero_content_text, } from './styles.module.scss' import { Localize } from 'components/localization' import useRegion from 'components/hooks/use-region' @@ -21,7 +23,7 @@ const HomeHero: React.FC = () => { const { is_eu } = useRegion() return ( -
+
{is_eu ? ( = () => { /> )} - +
- +