From ea5596d259e4ce458da3aeb99f701bf29f91064b Mon Sep 17 00:00:00 2001 From: michaeltomasik Date: Tue, 27 Mar 2018 16:00:31 +0200 Subject: [PATCH] :recycle: Refactor account component styles --- src/components/header/customCountDown.css | 16 ++++++++++++---- src/components/header/customCountDown.js | 2 +- src/components/header/header.css | 20 +++++++++++++------- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/src/components/header/customCountDown.css b/src/components/header/customCountDown.css index 4c802cc1dec..68c47bd1ef5 100644 --- a/src/components/header/customCountDown.css +++ b/src/components/header/customCountDown.css @@ -1,21 +1,29 @@ .reset { - margin-right: 10px; + margin-right: 18px; padding-left: 3px; padding-right: 3px; - padding-bottom: 5px; + padding-bottom: 3px; cursor: pointer; color: white; border-bottom: solid 2px white; display: inline; + font-family: 'Open Sans'; + font-weight: 600; + font-size: 12px; +} + +.default { + color: #FFFFFF; } .timeout { color: red; - font-weight: 600; - font-size: 13px; } .timerRow { display: flex; justify-content: flex-end; + font-weight: 600; + font-size: 12px; + font-family: 'Open Sans'; } diff --git a/src/components/header/customCountDown.js b/src/components/header/customCountDown.js index 181805ab576..abd89b58355 100644 --- a/src/components/header/customCountDown.js +++ b/src/components/header/customCountDown.js @@ -12,7 +12,7 @@ const CustomCountDown = ({ minutes, autoLog, seconds, resetTimer, t }) => { resetTimer(); }} className={`${styles.reset} reset`}> {t('Reset')} :
; - const resetStyle = resetCondition ? styles.timeout : {}; + const resetStyle = resetCondition ? styles.timeout : styles.default; const timer = !timeoutCondition && {t('ID lock in')} {min}:{sec}; diff --git a/src/components/header/header.css b/src/components/header/header.css index 86b68419f89..248f1deec8c 100644 --- a/src/components/header/header.css +++ b/src/components/header/header.css @@ -11,7 +11,7 @@ --menu-icon-height-XL: 39px; --menu-icon-height-M: 34px; --font-size-normal: 16px; - --font-size-small: 13px; + --font-size-small: 12px; } .wrapper { @@ -30,9 +30,10 @@ .unlocked { color: red; + font-family: 'Open Sans'; font-weight: 600; - font-size: 13px; - line-height: 1.1em; /* stylelint-disable-line */ + font-size: var(--font-size-small); + line-height: 1.5em; /* stylelint-disable-line */ } .logoWrapper { @@ -125,31 +126,36 @@ line-height: 25px; padding-right: 20px; height: var(--avatar-height); + font-family: 'Open Sans'; + font-weight: 600; & .balance { - font-size: 29px; + font-size: 24px; + font-family: var(--heading-font); color: var(--color-white); line-height: 0.5em; /* stylelint-disable-line */ padding-top: 7px; & small { + padding-left: 5px; font-size: var(--font-size-small); } } & .address { - font-size: var(--font-size-small); + font-size: 14px; color: var(--color-grayscale-medium); } & .copy { - font-size: var(--font-size-normal); + font-size: 24px; + padding-right: 5px; } & .timer { font-size: var(--font-size-small); color: var(--color-grayscale-medium); - line-height: 1.1em; /* stylelint-disable-line */ + line-height: 1.5em; /* stylelint-disable-line */ } }