diff --git a/src/components/CustomAccordion/custom-accordion.scss b/src/components/CustomAccordion/custom-accordion.scss index fe7a6fe1..2efd91fc 100644 --- a/src/components/CustomAccordion/custom-accordion.scss +++ b/src/components/CustomAccordion/custom-accordion.scss @@ -1,8 +1,8 @@ .accordion_root { margin: 16px; - margin-top: 48px; display: flex; flex-direction: column; + gap: 0.25rem; @media screen and (max-width: 786px) { margin-top: 15px; diff --git a/src/components/Footer/Footer.module.scss b/src/components/Footer/Footer.module.scss index 4327699a..1395489c 100644 --- a/src/components/Footer/Footer.module.scss +++ b/src/components/Footer/Footer.module.scss @@ -24,7 +24,7 @@ position: relative; align-self: flex-start; padding-bottom: rem(4.8); - gap: 24px; + gap: rem(1.5); } .Section1 { @@ -39,6 +39,9 @@ font-size: rem(1.6) !important; color: var(--core-color-solid-slate-1400, #000); text-align: left; + } + + h6 { margin-bottom: rem(1.6); } @@ -51,7 +54,7 @@ margin-bottom: rem(1.6) !important; display: flex; align-items: flex-start; - gap: 8px; + gap: rem(0.5); } h3 { @@ -67,10 +70,12 @@ .Link { display: flex; align-items: center; - gap: 8px; - color: #000; + gap: rem(0.5); text-decoration: none; - margin-bottom: rem(1.6); + } + + .labelcolor { + color: var(--component-textIcon-normal-prominent); } .SectionContent { @@ -90,15 +95,16 @@ font-weight: 700; line-height: 22px; display: flex; - gap: 20px; + gap: rem(0.8); white-space: nowrap; + justify-content: center; } .PaddedButton { display: flex; width: 100%; - padding: 8px 10px; - gap: 8px; + padding: rem(0.5) rem(0.625); + gap: rem(0.5); } .FullWidthButton { @@ -108,8 +114,11 @@ .Box { border: 1px solid #ddd; - padding: 16px; + padding: rem(1.6); border-radius: rem(2.4); + display: flex; + flex-direction: column; + gap: rem(0.8); } .EmailButton { @@ -118,7 +127,6 @@ line-height: 22px; display: flex; width: 100%; - margin-top: 12px; } .MobileAccordion { @@ -142,11 +150,12 @@ .CommunityButton { display: flex; flex-direction: column !important; - gap: 10px; + gap: rem(0.625); + padding-right: rem(2); } .PaddedButton { width: 100%; - padding: 10px 0px; + padding: rem(0.625) rem(0); } .FullWidthButton { width: 100%; @@ -162,8 +171,7 @@ .CommunityButton { display: flex; flex-direction: row; - align-items: center; - gap: 10px; + gap: rem(0.8); flex-wrap: nowrap; width: 100%; } @@ -173,7 +181,7 @@ } .FooterSection { grid-template-columns: 2fr; - gap: 24px; + gap: rem(1.5); display: flex; flex-direction: row; flex-wrap: wrap; @@ -196,18 +204,16 @@ } .Box { - width: 400px !important; display: flex; flex-direction: column; - gap: 16px; + gap: rem(1); flex: 1 0 0; - padding-left: 32px; - padding-right: 32px; + padding: rem(2) rem(2); } .FooterLogo { display: flex; - gap: 24px; + gap: rem(1.5); padding-bottom: 0px; } @@ -224,7 +230,7 @@ .MobileAccordion { display: block; width: 100%; - margin-bottom: 16px; + margin-bottom: rem(1); } .Box { @@ -245,13 +251,14 @@ } .FooterSection { justify-content: center; - gap: 24px; + gap: rem(1.5); width: 100%; } } .LogoWrapper { align-self: center; + padding: rem(1); } .Section1:nth-child(1), @@ -268,5 +275,5 @@ } .accordion_header_trigger { - padding: 24px 0px; + padding: rem(1.5) 0; } diff --git a/src/components/Footer/index.tsx b/src/components/Footer/index.tsx index 3d6a15c7..0b6c55c9 100644 --- a/src/components/Footer/index.tsx +++ b/src/components/Footer/index.tsx @@ -1,12 +1,13 @@ import React from 'react'; -import { Text } from '@deriv/ui'; -import { LabelPairedArrowUpRightSmRegularIcon } from '@deriv/quill-icons'; -import { Button } from '@deriv/ui'; -import { SocialTelegramBlackIcon } from '@deriv/quill-icons'; -import { LabelPairedEnvelopeCaptionBoldIcon } from '@deriv/quill-icons'; -import Translate from '@docusaurus/Translate'; -import useDocusaurusContext from '@docusaurus/useDocusaurusContext'; import CustomAccordion from '../CustomAccordion'; +import { Text, Button } from '@deriv-com/quill-ui'; +import { + LabelPairedArrowUpRightSmRegularIcon, + SocialTelegramBlackIcon, + LabelPairedEnvelopeCaptionBoldIcon, +} from '@deriv/quill-icons'; +import useDocusaurusContext from '@docusaurus/useDocusaurusContext'; +import Translate from '@docusaurus/Translate'; import styles from './Footer.module.scss'; import GrayLogo from '../../assets/gray-logo.svg'; @@ -53,13 +54,23 @@ const Footer = () => {
  • - - Deriv Tech + + Deriv Tech
  • - - Bug bounty + + Bug bounty
  • @@ -70,18 +81,28 @@ const Footer = () => { content: ( @@ -126,7 +147,7 @@ const Footer = () => {
  • - Deriv Tech + Deriv Tech
  • @@ -135,7 +156,7 @@ const Footer = () => { target='blank' className={styles.Link} > - Bug bounty + Bug bounty
  • @@ -147,17 +168,17 @@ const Footer = () => { @@ -166,7 +187,7 @@ const Footer = () => {
    - + Get connected

    @@ -174,11 +195,10 @@ const Footer = () => {

    - + We're here to help

    @@ -215,17 +234,17 @@ const Footer = () => {