From 7d41f7d874462d4232c87ebd901c60f33f266b08 Mon Sep 17 00:00:00 2001 From: Kevin Date: Fri, 5 Feb 2021 12:24:46 +0800 Subject: [PATCH 1/7] fix: ib content translation --- .../partners/affiliate-ib/_deriv-ib-programme.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/pages/partners/affiliate-ib/_deriv-ib-programme.js b/src/pages/partners/affiliate-ib/_deriv-ib-programme.js index 4daaa898e58..3c6b45018c3 100644 --- a/src/pages/partners/affiliate-ib/_deriv-ib-programme.js +++ b/src/pages/partners/affiliate-ib/_deriv-ib-programme.js @@ -145,6 +145,7 @@ const StyledHeaderCommission = styled(StyledHeader)` const StyledCard = styled(Card)` border-radius: 8px; + min-width: 44rem; :nth-child(2) { margin: 1.6rem 2.4rem 0; @@ -285,10 +286,10 @@ const DMT5Synthetic = ({ data }) => { } return (
{!is_calculated ? ( @@ -378,7 +379,7 @@ const DMT5Standard = ({ data }) => { setCalculated(!is_calculated) } return ( - +
{!is_calculated ? (
@@ -465,7 +466,7 @@ const DMT5Advanced = ({ data }) => { setCalculated(!is_calculated) } return ( - +
{!is_calculated ? (
From df371b8f112f39f1985cad72d95010fd1d86ff4a Mon Sep 17 00:00:00 2001 From: Kevin Date: Fri, 5 Feb 2021 17:03:49 +0800 Subject: [PATCH 2/7] fix: qa comments --- .../affiliate-ib/_deriv-affiliate-programme.js | 9 +++++++++ .../partners/affiliate-ib/_deriv-ib-programme.js | 11 +++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/pages/partners/affiliate-ib/_deriv-affiliate-programme.js b/src/pages/partners/affiliate-ib/_deriv-affiliate-programme.js index b07050a9c1d..8e5cd550d5f 100644 --- a/src/pages/partners/affiliate-ib/_deriv-affiliate-programme.js +++ b/src/pages/partners/affiliate-ib/_deriv-affiliate-programme.js @@ -145,6 +145,15 @@ const StyledHeaderCommission = styled(StyledHeader)` font-size: 20px; text-align: left; margin: auto; + width: 42rem; + } + + @media ${device.mobileL} { + width: 41rem; + } + + @media ${device.mobileM} { + width: 38rem; } ` diff --git a/src/pages/partners/affiliate-ib/_deriv-ib-programme.js b/src/pages/partners/affiliate-ib/_deriv-ib-programme.js index 3c6b45018c3..174cb5d9604 100644 --- a/src/pages/partners/affiliate-ib/_deriv-ib-programme.js +++ b/src/pages/partners/affiliate-ib/_deriv-ib-programme.js @@ -131,8 +131,10 @@ const ButtonWrapper = styled.div` const StyledHeaderCommission = styled(StyledHeader)` margin-bottom: 0; + margin-left: -100px; font-size: 16px; @media (max-width: 1428px) { + margin-left: 0; text-align: center; } @@ -140,6 +142,15 @@ const StyledHeaderCommission = styled(StyledHeader)` font-size: 20px; text-align: left; margin: auto; + width: 44rem; + } + + @media ${device.mobileL} { + width: 40rem; + } + + @media ${device.mobileM} { + width: 38rem; } ` From cc3615f7b2b63074d32919207d5ebdeb4b3ea1d3 Mon Sep 17 00:00:00 2001 From: Kevin Date: Fri, 5 Feb 2021 17:20:32 +0800 Subject: [PATCH 3/7] fix: margin --- src/pages/partners/affiliate-ib/_deriv-ib-programme.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/partners/affiliate-ib/_deriv-ib-programme.js b/src/pages/partners/affiliate-ib/_deriv-ib-programme.js index 174cb5d9604..c8adda2f41b 100644 --- a/src/pages/partners/affiliate-ib/_deriv-ib-programme.js +++ b/src/pages/partners/affiliate-ib/_deriv-ib-programme.js @@ -131,7 +131,7 @@ const ButtonWrapper = styled.div` const StyledHeaderCommission = styled(StyledHeader)` margin-bottom: 0; - margin-left: -100px; + margin-left: -85px; font-size: 16px; @media (max-width: 1428px) { margin-left: 0; From 618409f41d3fd13e7d1ea88924a09760bbc3e790 Mon Sep 17 00:00:00 2001 From: Kevin Date: Fri, 5 Feb 2021 17:33:21 +0800 Subject: [PATCH 4/7] fix: button for indonesian language - sign up --- src/pages/partners/affiliate-ib/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/partners/affiliate-ib/index.js b/src/pages/partners/affiliate-ib/index.js index 94b19742a52..1e2075a6069 100644 --- a/src/pages/partners/affiliate-ib/index.js +++ b/src/pages/partners/affiliate-ib/index.js @@ -36,7 +36,7 @@ const StyledLinkButton = styled(LinkButton)` border-radius: 4px; @media ${device.tabletS} { font-size: 14px; - width: 230px; + width: 300px; height: 40px; padding: 1.2rem 1rem; white-space: nowrap; From 1afa8d5e768a8bbb305fd93c528f482584c89519 Mon Sep 17 00:00:00 2001 From: Kevin Date: Fri, 5 Feb 2021 17:38:12 +0800 Subject: [PATCH 5/7] fix: button for indonesian language - sign up --- src/pages/partners/affiliate-ib/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/partners/affiliate-ib/index.js b/src/pages/partners/affiliate-ib/index.js index 1e2075a6069..044299baf27 100644 --- a/src/pages/partners/affiliate-ib/index.js +++ b/src/pages/partners/affiliate-ib/index.js @@ -36,7 +36,6 @@ const StyledLinkButton = styled(LinkButton)` border-radius: 4px; @media ${device.tabletS} { font-size: 14px; - width: 300px; height: 40px; padding: 1.2rem 1rem; white-space: nowrap; From ee083d4ac8ac6009b3e58671fc3f9c819b8897d5 Mon Sep 17 00:00:00 2001 From: Kevin Date: Fri, 5 Feb 2021 17:45:25 +0800 Subject: [PATCH 6/7] button text and ru comission --- .../partners/affiliate-ib/_deriv-affiliate-programme.js | 2 +- src/pages/partners/affiliate-ib/_deriv-ib-programme.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pages/partners/affiliate-ib/_deriv-affiliate-programme.js b/src/pages/partners/affiliate-ib/_deriv-affiliate-programme.js index 8e5cd550d5f..3b85a5a3d0b 100644 --- a/src/pages/partners/affiliate-ib/_deriv-affiliate-programme.js +++ b/src/pages/partners/affiliate-ib/_deriv-affiliate-programme.js @@ -301,7 +301,7 @@ const DerivAffiliateProgramme = () => {
- +
{localize('CPA (EU only)')} diff --git a/src/pages/partners/affiliate-ib/_deriv-ib-programme.js b/src/pages/partners/affiliate-ib/_deriv-ib-programme.js index c8adda2f41b..f10e93db3ee 100644 --- a/src/pages/partners/affiliate-ib/_deriv-ib-programme.js +++ b/src/pages/partners/affiliate-ib/_deriv-ib-programme.js @@ -281,6 +281,11 @@ const StyledLinkButton = styled(LinkButton)` padding: 1.5rem 1.6rem; height: 40px; white-space: nowrap; + font-size: 12px; + } + + @media ${device.mobileL} { + font-size: 10px; } ` const DMT5Synthetic = ({ data }) => { From 3bb35a4838f4c4be5241e155429ff3b2f318c489 Mon Sep 17 00:00:00 2001 From: Kevin Date: Fri, 5 Feb 2021 17:56:25 +0800 Subject: [PATCH 7/7] fix: button for ru on smaller screen --- src/pages/partners/affiliate-ib/index.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pages/partners/affiliate-ib/index.js b/src/pages/partners/affiliate-ib/index.js index 044299baf27..dae30eb562c 100644 --- a/src/pages/partners/affiliate-ib/index.js +++ b/src/pages/partners/affiliate-ib/index.js @@ -40,6 +40,10 @@ const StyledLinkButton = styled(LinkButton)` padding: 1.2rem 1rem; white-space: nowrap; } + + @media ${device.mobileL} { + font-size: 10px; + } ` const StyledSectionContainer = styled(SectionContainer)`