diff --git a/src/common/utility.js b/src/common/utility.js index f324f9d5b85..f917dd72239 100644 --- a/src/common/utility.js +++ b/src/common/utility.js @@ -87,7 +87,7 @@ function debounce(func, wait, immediate) { } } -const trimSpaces = value => value.trim() +const trimSpaces = (value) => value.trim() const deriv_app_url = 'https://app.deriv.com' const deriv_bot_app_url = 'https://app.deriv.com/bot' diff --git a/src/components/elements/background-image.js b/src/components/elements/background-image.js index dc43ace003b..541b396650e 100644 --- a/src/components/elements/background-image.js +++ b/src/components/elements/background-image.js @@ -12,7 +12,7 @@ const StyledBackground = styled(BackgroundImage)` } ` -const Background = ({ children, data, style, dark, ...props }) => { +export const Background = ({ children, data, style, dark, ...props }) => { return ( props.width}; height: ${(props) => props.height}; diff --git a/src/components/elements/index.js b/src/components/elements/index.js index 8dd1926b7c2..d67cf155137 100644 --- a/src/components/elements/index.js +++ b/src/components/elements/index.js @@ -7,7 +7,7 @@ import DotLoader from './dot-loader' import Dropdown from './dropdown' import Checkbox from './checkbox' import Image from './image' -import QueryImage from './query-image' +import QueryImage, { ImageWrapper } from './query-image' import { StyledLink } from './link' import { OffCanvasMenuWrapper as OffCanvasMenu, @@ -16,7 +16,7 @@ import { } from './off-canvas-menu' import SideTab from './side-tab' import Tabs from './default-tab' -import { Text, LinkText, LocalizedLinkText, Header, BaseElement } from './typography' +import { Text, LinkText, LocalizedLinkText, Header, BaseElement, SpanLinkText } from './typography' import Timeline from './timeline' import { Ul, Li } from './lists' import { Carousel } from './carousel' @@ -37,6 +37,7 @@ export { Dropdown, Checkbox, Image, + ImageWrapper, QueryImage, StyledLink, NavCard, @@ -49,6 +50,7 @@ export { LinkText, LocalizedLinkText, Header, + SpanLinkText, Timeline, Ul, Li, diff --git a/src/components/elements/query-image.js b/src/components/elements/query-image.js index 0fb54266bf3..93a3a551ada 100644 --- a/src/components/elements/query-image.js +++ b/src/components/elements/query-image.js @@ -4,7 +4,7 @@ import styled from 'styled-components' import Img from 'gatsby-image' import PropTypes from 'prop-types' -const ImageWrapper = styled.div` +export const ImageWrapper = styled.div` width: ${(props) => (props.width ? props.width : '100%')}; height: ${(props) => props.height}; diff --git a/src/components/elements/typography.js b/src/components/elements/typography.js index 455a65928aa..3282d9b7708 100644 --- a/src/components/elements/typography.js +++ b/src/components/elements/typography.js @@ -6,6 +6,16 @@ import device from 'themes/device' const createElement = React.createElement +export const BaseLink = css` + text-decoration: none; + cursor: pointer; + + &:hover { + color: var(--color-red); + text-decoration: underline; + } +` + export const BaseElement = css` text-align: ${(props) => props.align || 'left'}; padding: ${(props) => props.padding || ''}; @@ -46,13 +56,11 @@ export const Header = styled(({ as = 'h1', children, ...props }) => ` export const LinkText = styled(Text).attrs({ as: 'a' })` - text-decoration: none; - cursor: pointer; + ${BaseLink} +` - &:hover { - color: var(--color-red); - text-decoration: underline; - } +export const SpanLinkText = styled(Text).attrs({ as: 'span' })` + ${BaseLink} ` export const LocalizedLinkText = styled((props) => )` diff --git a/src/components/layout/copyright.js b/src/components/layout/copyright.js index 9bae2dfc494..1c1a99e6364 100644 --- a/src/components/layout/copyright.js +++ b/src/components/layout/copyright.js @@ -2,13 +2,13 @@ import React from 'react' import { Box, Container } from 'components/containers' import { Text } from 'components/elements' import { localize } from 'components/localization' -import CopyrightIc from 'images/svg/copyright.svg' +import CopyrightIc from 'images/svg/copyright-white.svg' const Copyright = () => { return ( - copyright ic + copyright ic {localize('2020 Deriv | All rights reserved')} diff --git a/src/components/layout/layout.js b/src/components/layout/layout.js index 14051de7c8f..5c7a128b202 100644 --- a/src/components/layout/layout.js +++ b/src/components/layout/layout.js @@ -6,6 +6,7 @@ import Footer from './footer' import Copyright from './copyright' import { Nav, NavStatic, NavPartners, NavInterim } from './nav' import { NavCareers } from './nav-careers' +import { NavP2P } from './nav-p2p' import { LocationProvider } from './location-context' import EURedirect, { useModal } from 'components/custom/_eu-redirect-modal.js' import CookieBanner from 'components/custom/cookie-banner' @@ -27,7 +28,15 @@ const has_dataLayer = isBrowser() && window.dataLayer const TRACKING_STATUS_KEY = 'tracking_status' const tracking_status_cookie = new CookieStorage(TRACKING_STATUS_KEY) -const Layout = ({ children, type, interim_type, padding_top, no_login_signup }) => { +const Layout = ({ + children, + type, + interim_type, + padding_top, + no_login_signup, + no_live_chat, + nav_type, +}) => { const { is_eu_country } = React.useContext(DerivStore) const [has_mounted, setMounted] = React.useState(false) const [show_cookie_banner, setShowCookieBanner] = React.useState(false) @@ -88,6 +97,10 @@ const Layout = ({ children, type, interim_type, padding_top, no_login_signup }) Navigation = FooterNav =