From 40f7314921a8b5b77975118ca51ba578e3b69e4f Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Tue, 6 Mar 2018 16:51:26 +0100 Subject: [PATCH 01/34] Remove iconButton.css --- src/components/toolbox/buttons/css/iconButton.css | 3 --- src/components/toolbox/buttons/iconButton.js | 5 ++--- 2 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 src/components/toolbox/buttons/css/iconButton.css diff --git a/src/components/toolbox/buttons/css/iconButton.css b/src/components/toolbox/buttons/css/iconButton.css deleted file mode 100644 index 6ac0950ad7..0000000000 --- a/src/components/toolbox/buttons/css/iconButton.css +++ /dev/null @@ -1,3 +0,0 @@ -.button { - font-size: 1em; -} diff --git a/src/components/toolbox/buttons/iconButton.js b/src/components/toolbox/buttons/iconButton.js index bcca2f39f4..e3e44b2c10 100644 --- a/src/components/toolbox/buttons/iconButton.js +++ b/src/components/toolbox/buttons/iconButton.js @@ -1,12 +1,11 @@ import React from 'react'; -import { themr } from 'react-css-themr'; import { IconButton as ToolBoxIconButton } from 'react-toolbox/lib/button'; -import iconButtonTheme from './css/iconButton.css'; +// this component is unnecessary and it need to be deleted class IconButton extends React.Component { render() { return ; } } -export default themr('iconButton', iconButtonTheme)(IconButton); +export default IconButton; From c529e52a184a614bcb4bcdd606f4d48c182e65cb Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Tue, 6 Mar 2018 16:51:57 +0100 Subject: [PATCH 02/34] Use paragraph-font-size in type.css --- src/components/app/type.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/app/type.css b/src/components/app/type.css index 994f6fc242..96a181e5df 100644 --- a/src/components/app/type.css +++ b/src/components/app/type.css @@ -86,7 +86,7 @@ a, b, i, strong { - font-size: var(--font-size-h6); + font-size: var(--paragraph-font-size-l); } strong { @@ -140,4 +140,8 @@ select { h5 { font-size: var(--font-size-h5-s); } + + p { + font-size: var(--paragraph-font-size-s); + } } From 977a68bf36cd8f99746c6ae27b809ae2c9dcee0e Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Tue, 6 Mar 2018 16:53:12 +0100 Subject: [PATCH 03/34] Replace all 'em' values with 'px' ones in variables.css --- src/components/app/variables.css | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/components/app/variables.css b/src/components/app/variables.css index 204453fa8b..10a7aee871 100644 --- a/src/components/app/variables.css +++ b/src/components/app/variables.css @@ -39,12 +39,12 @@ or "warn/action" ineastd of "red/green" /************************* Font *************************/ - --font-size-h1: 6.854em; - --font-size-h2: 4.236em; - --font-size-h3: 2.618em; - --font-size-h4: 1.618em; - --font-size-h5: 1.32em; - --font-size-h6: 1em; + --font-size-h1: 65px; + --font-size-h2: 32px; + --font-size-h3: 28px; + --font-size-h4: 26; + --font-size-h5: 20px; + --font-size-h6: 16px; --font-size-small: 0.875em; --heading-font: 'gilroy', 'Open Sans', sans-serif; --content-font: 'Open Sans', sans-serif; @@ -57,6 +57,7 @@ or "warn/action" ineastd of "red/green" --paragraph-font-size-l: 15px; --paragraph-font-size-s: 14px; --input-font-size: 16px; + --button-font-size: 16px; /* Font xl breakpoint */ --font-size-h2-xl: 32px; From 3075f60f1a74aa08b4f60a0c700a3a6cf11a0a84 Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Tue, 6 Mar 2018 16:54:09 +0100 Subject: [PATCH 04/34] Remove h2 font-size in confirmVotes.css --- src/components/confirmVotes/confirmVotes.css | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/confirmVotes/confirmVotes.css b/src/components/confirmVotes/confirmVotes.css index e14223f6f7..fa286810bf 100644 --- a/src/components/confirmVotes/confirmVotes.css +++ b/src/components/confirmVotes/confirmVotes.css @@ -14,7 +14,6 @@ text-align: center; & h2 { - font-size: var(--font-size-h2-xl); margin: 0; } From f88c1219bab3b653b7ec72d20c1b4cd00354e741 Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Tue, 6 Mar 2018 16:54:31 +0100 Subject: [PATCH 05/34] Remove h2 font-size in currencyGraph.css --- src/components/dashboard/currencyGraph.css | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/dashboard/currencyGraph.css b/src/components/dashboard/currencyGraph.css index 0a541f57a9..44d95042e0 100644 --- a/src/components/dashboard/currencyGraph.css +++ b/src/components/dashboard/currencyGraph.css @@ -65,7 +65,6 @@ min-height: 300px; & h2 { - font-size: var(--font-size-h2-l); margin: 45px var(--box-padding-left-M) 20px; } } From f60500bdbb9ce07466c4cf2ddcf338fa0a91c8a5 Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Tue, 6 Mar 2018 16:55:01 +0100 Subject: [PATCH 06/34] Remove h2 font-size in dashboard css --- src/components/dashboard/styles.css | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/components/dashboard/styles.css b/src/components/dashboard/styles.css index c96c008fea..8ddd34e59b 100644 --- a/src/components/dashboard/styles.css +++ b/src/components/dashboard/styles.css @@ -37,7 +37,6 @@ @media (--xLarge-viewport) { .latestActivity { & h2 { - font-size: var(--font-size-h2-xl); margin: 45px var(--box-padding-left-L) 20px; } } @@ -46,7 +45,6 @@ @media (--large-viewport) { .latestActivity { & h2 { - font-size: var(--font-size-h2-l); margin: 45px var(--box-padding-left-L) 20px; } } @@ -73,19 +71,12 @@ height: auto; & h2 { - font-size: var(--font-size-h2-l); margin: 45px var(--box-padding-left-M) 20px; } } } @media (--small-viewport) { - .latestActivity { - & h2 { - font-size: var(--font-size-h2-s); - } - } - .seeAllLink { display: block; margin-top: 16px; From f09d9f4f0b6771c19770724e2042fac8db5e57c3 Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Tue, 6 Mar 2018 16:55:24 +0100 Subject: [PATCH 07/34] Remove h2 font-size in delegateList.css --- src/components/delegateList/delegateList.css | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/components/delegateList/delegateList.css b/src/components/delegateList/delegateList.css index 5533440c17..ae9bd6b93a 100644 --- a/src/components/delegateList/delegateList.css +++ b/src/components/delegateList/delegateList.css @@ -146,7 +146,6 @@ margin-bottom: 0; font-weight: 400; padding-bottom: 60px; - font-size: var(--main-header-font-size-XL); &.desktopTitle { display: block; @@ -376,10 +375,6 @@ @media (--large-viewport) { .header { padding: 20px var(--grid-padding-L); - - & h2 { - font-size: var(--main-header-font-size-L); - } } .delegatesList { @@ -508,10 +503,6 @@ .header { padding: 20px var(--grid-padding-XS); - & h2 { - font-size: var(--main-header-font-size-XS); - } - & .account { display: none; } From 97ba719cf525f169cec8148af98706226d661f37 Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Tue, 6 Mar 2018 16:55:53 +0100 Subject: [PATCH 08/34] Remove h2 font-size in in passphraseSteps.css --- src/components/passphraseSteps/passphraseSteps.css | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/passphraseSteps/passphraseSteps.css b/src/components/passphraseSteps/passphraseSteps.css index 99c5a655df..45e39a1c14 100644 --- a/src/components/passphraseSteps/passphraseSteps.css +++ b/src/components/passphraseSteps/passphraseSteps.css @@ -26,7 +26,6 @@ & h2 { font-weight: var(--font-weight-semi-bold); margin-bottom: 0; - font-size: 2em; } } From d09b8116f5e2c6ce66e4f9733520e444822a8312 Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Tue, 6 Mar 2018 16:56:13 +0100 Subject: [PATCH 09/34] Remove h2 font-size in resulatBox.css --- src/components/resultBox/resultBox.css | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/components/resultBox/resultBox.css b/src/components/resultBox/resultBox.css index c502461580..523c0d1e1f 100644 --- a/src/components/resultBox/resultBox.css +++ b/src/components/resultBox/resultBox.css @@ -5,10 +5,11 @@ --paragraph-color: var(--color-grayscale-dark); --paragraph-line-height: 36px; --title-font-size: 32px; + --icon-font-size: 48px; } .icon { - font-size: 3em; + font-size: var(--icon-font-size); color: #ff6236; } @@ -31,10 +32,6 @@ line-height: var(--paragraph-line-height); } - & h2 { - font-size: var(--title-font-size); - } - & .copy { color: var(--copy-color); cursor: pointer; From 3cd00ed1495e256602c25eacbedf19c2b387b1bd Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Tue, 6 Mar 2018 16:56:33 +0100 Subject: [PATCH 10/34] Remove h2 font-size in sendTo.css --- src/components/sendTo/sendTo.css | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/components/sendTo/sendTo.css b/src/components/sendTo/sendTo.css index 3ab8860ebc..8991397c41 100644 --- a/src/components/sendTo/sendTo.css +++ b/src/components/sendTo/sendTo.css @@ -8,9 +8,6 @@ --header-subtitle-font-size-XL: 18px; --header-subtitle-font-size-L: 16px; --header-subtitle-font-size-XS: 14px; - --main-header-font-size-XL: 32px; - --main-header-font-size-L: 28px; - --main-header-font-size-XS: 24px; } .wrapper { @@ -61,8 +58,6 @@ @media (--xLarge-viewport) { .wrapper { & h2 { - font-size: var(--main-header-font-size-XL); - & .balanceUnit { font-size: var(--header-balance-unit-font-size-XL); } @@ -77,8 +72,6 @@ @media (--large-viewport) { .wrapper { & h2 { - font-size: var(--main-header-font-size-L); - & .balanceUnit { font-size: var(--header-balance-unit-font-size-L); } From 95310bce60258cc1171d68b48aa862f9e79adcf5 Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Tue, 6 Mar 2018 16:56:54 +0100 Subject: [PATCH 11/34] Remove h2 font-size in sendReadable.css --- src/components/sendReadable/sendReadable.css | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/components/sendReadable/sendReadable.css b/src/components/sendReadable/sendReadable.css index 7bfcf2738b..91f546e618 100644 --- a/src/components/sendReadable/sendReadable.css +++ b/src/components/sendReadable/sendReadable.css @@ -60,15 +60,6 @@ input:read-only { } } -.temporarySuccessCheck { - /* values are not saved as variable since this will be deleted anyway */ - position: absolute; - bottom: -20px; - left: 155px; - font-size: 3em; - color: #ff6236; -} - .headerWrapper { padding: 20px 0px; @@ -82,7 +73,6 @@ input:read-only { & h2 { margin-bottom: 0; - font-size: 2em; } & h3 { From 479dabd0a903df5089d70c7e7177d5cb44a1be76 Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Tue, 6 Mar 2018 16:57:25 +0100 Subject: [PATCH 12/34] Remove h2 font-size in sendWritable.css --- src/components/sendWritable/sendWritable.css | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/components/sendWritable/sendWritable.css b/src/components/sendWritable/sendWritable.css index 4dd1d72082..d44858d44e 100644 --- a/src/components/sendWritable/sendWritable.css +++ b/src/components/sendWritable/sendWritable.css @@ -102,22 +102,6 @@ input:read-only { padding-right: 85px; } -@media (--xLarge-viewport) { - .headerWrapper { - & h2 { - font-size: var(--font-size-h2-xl); - } - } -} - -@media (--large-viewport) { - .headerWrapper { - & h2 { - font-size: var(--font-size-h2-l); - } - } -} - @media (--small-viewport) { .headerWrapper { display: none; From afd0b49aa25e4f7dfea429bad6b1382437b520e8 Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Tue, 6 Mar 2018 16:57:46 +0100 Subject: [PATCH 13/34] Remove h2 font-size in transaction.css --- src/components/singleTransaction/transaction.css | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/components/singleTransaction/transaction.css b/src/components/singleTransaction/transaction.css index 1106588646..1e6e88a33c 100644 --- a/src/components/singleTransaction/transaction.css +++ b/src/components/singleTransaction/transaction.css @@ -5,9 +5,6 @@ --title-bar-extra-padding-XS: 52px; --header-subtitle-font-size-XL: 18px; --header-subtitle-font-size-L: 16px; - --main-header-font-size-XL: 32px; - --main-header-font-size-L: 28px; - --main-header-font-size-XS: 24px; --grid-padding-XL: 48px; --grid-padding-L: 32px; --grid-padding-XS: 19px; @@ -51,7 +48,6 @@ padding: 20px var(--grid-padding-XL); & h2 { - font-size: var(--main-header-font-size-XL); margin-bottom: 7px; } } @@ -64,7 +60,6 @@ padding: 20px var(--grid-padding-L); & h2 { - font-size: var(--main-header-font-size-L); margin-bottom: 5px; } } @@ -93,10 +88,6 @@ & header { padding: 20px var(--grid-padding-XS) calc(20px + var(--title-bar-extra-padding-XS)) var(--grid-padding-XS); - - & h2 { - font-size: var(--main-header-font-size-XS); - } } & .content { From adce8a6cad48dad6d4d04656158e0f7cac565428 Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Tue, 6 Mar 2018 16:58:03 +0100 Subject: [PATCH 14/34] Remove h2 font-size in transactions.css --- src/components/transactions/transactions.css | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/components/transactions/transactions.css b/src/components/transactions/transactions.css index 1f9d02349b..23c7cff20e 100644 --- a/src/components/transactions/transactions.css +++ b/src/components/transactions/transactions.css @@ -15,9 +15,6 @@ --header-balance-unit-font-size-L: 18px; --header-subtitle-font-size-XL: 18px; --header-subtitle-font-size-L: 16px; - --main-header-font-size-XL: 32px; - --main-header-font-size-L: 28px; - --main-header-font-size-XS: 24px; --grid-padding-XL: var(--box-padding-left-L); /* L until we add this padding to everywhere else too */ --grid-padding-L: var(--box-padding-left-L); --grid-padding-M: var(--box-padding-left-M); @@ -290,8 +287,6 @@ padding: 20px var(--grid-padding-XL); & h2 { - font-size: var(--main-header-font-size-XL); - & .balanceUnit { font-size: var(--header-balance-unit-font-size-XL); } @@ -373,8 +368,6 @@ padding: 20px var(--grid-padding-L); & h2 { - font-size: var(--main-header-font-size-L); - & .balanceUnit { font-size: var(--header-balance-unit-font-size-L); } @@ -479,10 +472,6 @@ & header { padding: 20px var(--grid-padding-M); - & h2 { - font-size: var(--main-header-font-size-XS); - } - & .account { display: none; } From 65c44ffdf6c7f701020e7c4f508dfe17f21c453c Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Tue, 6 Mar 2018 16:58:24 +0100 Subject: [PATCH 15/34] Remove h2 font-size in votesPreview.css --- src/components/votesPreview/votesPreview.css | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/components/votesPreview/votesPreview.css b/src/components/votesPreview/votesPreview.css index fcf5c7c230..73bab5d89e 100644 --- a/src/components/votesPreview/votesPreview.css +++ b/src/components/votesPreview/votesPreview.css @@ -3,9 +3,6 @@ :root { --danger-color: var(--color-error); --link-color: #0077bd; - --main-header-font-size-XL: var(--font-size-h2-xl); - --main-header-font-size-L: var(--font-size-h2-l); - --main-header-font-size-XS: var(--font-size-h2-s); --header-font-size: 28px; --link-font-size: 15px; --progress-bar-text-font-size: 13px; @@ -61,7 +58,6 @@ & h2 { font-weight: 400; margin: 0; - font-size: var(--main-header-font-size-XL); } & a { @@ -190,10 +186,6 @@ .wrapper { & header { margin-left: var(--box-padding-left-L); - - & h2 { - font-size: var(--main-header-font-size-L); - } } } } @@ -297,10 +289,3 @@ } } -@media (--xSmall-viewport) { - .wrapper { - & header h2 { - font-size: var(--main-header-font-size-XS); - } - } -} From 8ec15932dd8bbc84364395ef01180937904dff54 Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Tue, 6 Mar 2018 16:59:21 +0100 Subject: [PATCH 16/34] Replace static amount with subtitle-font-size variable --- src/components/login/login.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/login/login.css b/src/components/login/login.css index 251a1255e0..71ad291828 100644 --- a/src/components/login/login.css +++ b/src/components/login/login.css @@ -258,7 +258,7 @@ } & .subTitle { - font-size: 1em; + font-size: var(--subtitle-font-size); } & .shape { From 1491adb41929c6ecb6bdc7727c7dcfc1e61e8d0c Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Tue, 6 Mar 2018 17:00:04 +0100 Subject: [PATCH 17/34] Replace static font-size with font-size-h6 variable --- src/components/savedAccounts/savedAccounts.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/savedAccounts/savedAccounts.css b/src/components/savedAccounts/savedAccounts.css index 06dd8041f0..60437108aa 100644 --- a/src/components/savedAccounts/savedAccounts.css +++ b/src/components/savedAccounts/savedAccounts.css @@ -184,7 +184,7 @@ .network, .unlocked { - font-size: 1em; + font-size: var(--font-size-h6); position: absolute; top: 0; padding: 24px; From 05a8e7fa966a179eeafadeebae2024b0c1c9cefe Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Tue, 6 Mar 2018 17:00:37 +0100 Subject: [PATCH 18/34] Fix some style bugs in button thems --- src/components/toolbox/buttons/css/importantButton.css | 4 +++- src/components/toolbox/buttons/css/lightButton.css | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/toolbox/buttons/css/importantButton.css b/src/components/toolbox/buttons/css/importantButton.css index 6ac0950ad7..55b4325be9 100644 --- a/src/components/toolbox/buttons/css/importantButton.css +++ b/src/components/toolbox/buttons/css/importantButton.css @@ -1,3 +1,5 @@ +@import './base.css'; + .button { - font-size: 1em; + font-size: var(--button-font-size); } diff --git a/src/components/toolbox/buttons/css/lightButton.css b/src/components/toolbox/buttons/css/lightButton.css index 6ac0950ad7..55b4325be9 100644 --- a/src/components/toolbox/buttons/css/lightButton.css +++ b/src/components/toolbox/buttons/css/lightButton.css @@ -1,3 +1,5 @@ +@import './base.css'; + .button { - font-size: 1em; + font-size: var(--button-font-size); } From edae6d163c652028d2f5894dac6d8530641f65ab Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Wed, 7 Mar 2018 15:54:18 +0100 Subject: [PATCH 19/34] Remove unused table component --- src/components/toolbox/tables/css/theme.css | 24 --------------------- src/components/toolbox/tables/table.js | 14 ------------ src/components/toolbox/tables/table.test.js | 11 ---------- 3 files changed, 49 deletions(-) delete mode 100644 src/components/toolbox/tables/css/theme.css delete mode 100644 src/components/toolbox/tables/table.js delete mode 100644 src/components/toolbox/tables/table.test.js diff --git a/src/components/toolbox/tables/css/theme.css b/src/components/toolbox/tables/css/theme.css deleted file mode 100644 index eb528e6c8a..0000000000 --- a/src/components/toolbox/tables/css/theme.css +++ /dev/null @@ -1,24 +0,0 @@ -table tbody tr td { - color: #3c5068 !important; - font-size: 1.2em !important; - border-bottom: 0 !important; - border-top: 0 !important; -} - -tr:nth-child(even) { - background: linear-gradient(to right, #fff, #f5f8fc); -} - -tr:nth-child(odd) { - background: #fff; -} - -table thead tr th { - color: #000 !important; - font-weight: bold !important; - font-size: 1.1em !important; -} - -table tbody tr:hover { - background: #e8f0fa !important; -} diff --git a/src/components/toolbox/tables/table.js b/src/components/toolbox/tables/table.js deleted file mode 100644 index 364677d6d2..0000000000 --- a/src/components/toolbox/tables/table.js +++ /dev/null @@ -1,14 +0,0 @@ -import React from 'react'; -import { themr } from 'react-css-themr'; -import { Table as ToolBoxTable, TableHead, TableRow, TableCell } from 'react-toolbox/lib/table'; -import tableTheme from './css/theme.css'; - -const MTable = props => ; -const TBTable = themr('table', tableTheme)(MTable); - -export { - TBTable, - TableRow as TBTableRow, - TableCell as TBTableCell, - TableHead as TBTableHead, -}; diff --git a/src/components/toolbox/tables/table.test.js b/src/components/toolbox/tables/table.test.js deleted file mode 100644 index a4c9bd0345..0000000000 --- a/src/components/toolbox/tables/table.test.js +++ /dev/null @@ -1,11 +0,0 @@ -import React from 'react'; -import { expect } from 'chai'; -import { mount } from 'enzyme'; -import { TBTable } from './table'; - -describe('Table wrapper', () => { - it('Creates only one instance of the table', () => { - const wrappedTable = mount(); - expect(wrappedTable.find('Table').length).to.equal(1); - }); -}); From 897a977b16f9fcf802c0663a5ae29a6cb8300167 Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Wed, 7 Mar 2018 15:54:45 +0100 Subject: [PATCH 20/34] Fix some bug in variables.css --- src/components/app/variables.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/app/variables.css b/src/components/app/variables.css index 10a7aee871..35116d7bc8 100644 --- a/src/components/app/variables.css +++ b/src/components/app/variables.css @@ -42,10 +42,10 @@ or "warn/action" ineastd of "red/green" --font-size-h1: 65px; --font-size-h2: 32px; --font-size-h3: 28px; - --font-size-h4: 26; + --font-size-h4: 26px; --font-size-h5: 20px; --font-size-h6: 16px; - --font-size-small: 0.875em; + --font-size-small: 14px; --heading-font: 'gilroy', 'Open Sans', sans-serif; --content-font: 'Open Sans', sans-serif; --font-weight-normal: 400; From 8d48e68d78d8a1ade90d92e8929fe42987880ebf Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Wed, 7 Mar 2018 15:55:49 +0100 Subject: [PATCH 21/34] Replace values in 'em' with 'px' ones --- src/components/dialog/dialog.css | 2 +- src/components/fontIcon/icons.css | 4 ++-- src/components/passphrase/create/create.css | 2 +- src/components/savedAccounts/savedAccounts.css | 16 +++++++++------- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/components/dialog/dialog.css b/src/components/dialog/dialog.css index d49c6c3021..2d4b8b046f 100644 --- a/src/components/dialog/dialog.css +++ b/src/components/dialog/dialog.css @@ -9,7 +9,7 @@ & p { color: rgba(0, 0, 0, 0.87); - line-height: 1.4em; + line-height: 22px; } & header { diff --git a/src/components/fontIcon/icons.css b/src/components/fontIcon/icons.css index 633ccd965b..50e75ac278 100755 --- a/src/components/fontIcon/icons.css +++ b/src/components/fontIcon/icons.css @@ -14,8 +14,8 @@ font-style: normal; font-size: 24px; display: inline-block; - width: 1em; - height: 1em; + width: 16px; + height: 16px; line-height: 1 !important; text-transform: none; letter-spacing: normal; diff --git a/src/components/passphrase/create/create.css b/src/components/passphrase/create/create.css index 1d5f837d9b..f468a0f474 100644 --- a/src/components/passphrase/create/create.css +++ b/src/components/passphrase/create/create.css @@ -236,7 +236,7 @@ hr { margin: 0; & p { - margin-bottom: 1em !important; + margin-bottom: 16px !important; font-size: 16px; } diff --git a/src/components/savedAccounts/savedAccounts.css b/src/components/savedAccounts/savedAccounts.css index 60437108aa..5ed38e0034 100644 --- a/src/components/savedAccounts/savedAccounts.css +++ b/src/components/savedAccounts/savedAccounts.css @@ -1,11 +1,13 @@ @import '../app/variables.css'; :root { - --font-size-ids-h1-xl: 4em; - --font-size-ids-h1-l: 3em; - --font-size-ids-h1-s: 2em; - --font-size-card-h2: 2em; - --font-size-card-h2-s: 1.5em; + --font-size-ids-h1-xl: 64px; + --font-size-ids-h1-l: 48px; + --font-size-ids-h1-s: 32px; + --font-size-card-h2: 32px; + --font-size-card-h2-s: 24px; + --address-font-size: 18px; + --small-font-size: 11px; --close-button-shadow: 0 20px 20px 0 rgba(0, 32, 68, 0.25); --h1-padding-xl: 85px; --h1-padding-l: 40px; @@ -75,7 +77,7 @@ color: var(--color-black); & > small { - font-size: 0.6875em; + font-size: var(--small-font-size); } } @@ -116,7 +118,7 @@ .address { margin-bottom: 40px; color: var(--color-grayscale-dark); - font-size: 1.125em; + font-size: var(--address-font-size); } .cardIcon { From 785ddcfa1f38066007e0bf1b52f1cd508a5ef1d6 Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Wed, 7 Mar 2018 15:56:21 +0100 Subject: [PATCH 22/34] Add arrow-font-size variable to login.css --- src/components/login/login.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/login/login.css b/src/components/login/login.css index 71ad291828..c5c5224b5a 100644 --- a/src/components/login/login.css +++ b/src/components/login/login.css @@ -4,6 +4,7 @@ --gradient: linear-gradient(45deg, rgba(0, 74, 255, 1) 0%, rgba(147, 244, 254, 1) 100%); --transition: all ease 300ms; --header-focused-font-size: 32px; + --arrow-font-size: 19px; --rect-width: 200px; --login-box-padding-L: 48px; --login-box-padding-XL: 56px; @@ -234,7 +235,7 @@ } & .singUpArrow { - font-size: 1.2em; + font-size: var(--arrow-font-size); } & .subTitle { From c4015f0fbbc2aea760c54ff9b35c67aebe83cd2b Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Wed, 7 Mar 2018 15:59:09 +0100 Subject: [PATCH 23/34] Add to header-font-size confirm.css --- src/components/passphrase/confirm/confirm.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/passphrase/confirm/confirm.css b/src/components/passphrase/confirm/confirm.css index 1eb2dfbe7c..a65a20a7ca 100644 --- a/src/components/passphrase/confirm/confirm.css +++ b/src/components/passphrase/confirm/confirm.css @@ -8,6 +8,7 @@ --header-animation-duration: 450ms; --second-header-animation-delay: 1000ms; --steps-nav-height: 22px; + --header-font-size: var(--paragraph-font-size-l); } .table { @@ -45,7 +46,7 @@ } & header { - font-size: 0.959em; + font-size: var(--header-font-size); & h2, & h5 { From 48856d0501ac917955bb483149908882bca3fa49 Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Wed, 7 Mar 2018 16:12:09 +0100 Subject: [PATCH 24/34] Add header-font-size to safekeeping --- src/components/passphrase/safekeeping/safekeeping.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/passphrase/safekeeping/safekeeping.css b/src/components/passphrase/safekeeping/safekeeping.css index bfb7a534da..a319fb1422 100644 --- a/src/components/passphrase/safekeeping/safekeeping.css +++ b/src/components/passphrase/safekeeping/safekeeping.css @@ -7,6 +7,7 @@ --address-animation-duration: 1000ms; --header-animation-duration: 450ms; --second-header-animation-delay: 1000ms; + --header-font-size: var(--paragraph-font-size-l); } .table { @@ -60,7 +61,7 @@ } & header { - font-size: 0.959em; + font-size: var(--header-font-size); & h2, & h5 { From 490e61a3e13d2448ab57fd1a6cf9d8d1e5daeda3 Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Wed, 7 Mar 2018 16:12:55 +0100 Subject: [PATCH 25/34] Replace a value in 'em' with 'px' --- src/components/transactions/transactions.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/transactions/transactions.css b/src/components/transactions/transactions.css index 23c7cff20e..b52b18d8fd 100644 --- a/src/components/transactions/transactions.css +++ b/src/components/transactions/transactions.css @@ -62,7 +62,7 @@ color: inherit; } -@media screen and (max-width: 48em) { +@media (--small-viewport) { .hiddenXs { display: none; } From fa105569c3699b5081817b0cde2ffcade419152d Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Wed, 7 Mar 2018 16:41:18 +0100 Subject: [PATCH 26/34] Remove 'em' from stylelint unit-whitelist --- config/webpack.config.react.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/webpack.config.react.js b/config/webpack.config.react.js index 085d3367f0..714ec0a81f 100644 --- a/config/webpack.config.react.js +++ b/config/webpack.config.react.js @@ -45,7 +45,7 @@ module.exports = { extends: 'stylelint-config-standard', rules: { 'selector-pseudo-class-no-unknown': null, - 'unit-whitelist': ['px', 'deg', '%', 'em', 'ms'], + 'unit-whitelist': ['px', 'deg', '%', 'ms'], 'length-zero-no-unit': null, 'at-rule-no-unknown': null, }, From 8bd3091df59bd7351037ceda8f6aa26ca93159c5 Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Thu, 8 Mar 2018 11:09:19 +0100 Subject: [PATCH 27/34] Fix a bug in icons.css --- src/components/fontIcon/icons.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/fontIcon/icons.css b/src/components/fontIcon/icons.css index 50e75ac278..633ccd965b 100755 --- a/src/components/fontIcon/icons.css +++ b/src/components/fontIcon/icons.css @@ -14,8 +14,8 @@ font-style: normal; font-size: 24px; display: inline-block; - width: 16px; - height: 16px; + width: 1em; + height: 1em; line-height: 1 !important; text-transform: none; letter-spacing: normal; From dbc99b3024cbcd5da9e70f6a7c2374ab8bdce257 Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Thu, 8 Mar 2018 11:12:50 +0100 Subject: [PATCH 28/34] Fix a bug in login.css --- src/components/login/login.css | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/components/login/login.css b/src/components/login/login.css index c5c5224b5a..6741f0d58c 100644 --- a/src/components/login/login.css +++ b/src/components/login/login.css @@ -4,7 +4,8 @@ --gradient: linear-gradient(45deg, rgba(0, 74, 255, 1) 0%, rgba(147, 244, 254, 1) 100%); --transition: all ease 300ms; --header-focused-font-size: 32px; - --arrow-font-size: 19px; + --arrow-font-size: 60px; + --arrow-focused-font-size: 40px; --rect-width: 200px; --login-box-padding-L: 48px; --login-box-padding-XL: 56px; @@ -255,7 +256,13 @@ transform: translateZ(0); & h2 { - font-size: var(--header-focused-font-size); + & a { + font-size: var(--header-focused-font-size); + } + + & .singUpArrow { + font-size: var(--arrow-focused-font-size); + } } & .subTitle { @@ -370,7 +377,7 @@ .signUp, .login { - & h2 { + & h2 a { font-size: 65px; } } @@ -479,7 +486,7 @@ .signUp { padding: 0 20px; - & h2 { + & h2 a { font-size: var(--font-size-h2-s); margin-top: 12vh; /* stylelint-disable-line */ } From 3fd40e07c9bdf563c8531cbc6bc141cf598d1df5 Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Thu, 8 Mar 2018 11:13:45 +0100 Subject: [PATCH 29/34] Fix a style bug in mutliStep --- src/components/multiStep/multiStep.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/multiStep/multiStep.css b/src/components/multiStep/multiStep.css index bfd87ca4b9..b3e528649f 100644 --- a/src/components/multiStep/multiStep.css +++ b/src/components/multiStep/multiStep.css @@ -58,7 +58,7 @@ height: 0; border-bottom: solid 2px var(--link-color); opacity: 0.5; - font-size: 0; + font-size: 0 !important; } & .icon { From bb130955a16fbf3e129bce33e9e24e1ae5ed3fa6 Mon Sep 17 00:00:00 2001 From: Vit Stanislav Date: Thu, 8 Mar 2018 14:28:49 +0100 Subject: [PATCH 30/34] Prevent stylelint unit-whitelist errors --- src/components/fontIcon/icons.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/fontIcon/icons.css b/src/components/fontIcon/icons.css index 633ccd965b..bdffb819a0 100755 --- a/src/components/fontIcon/icons.css +++ b/src/components/fontIcon/icons.css @@ -14,8 +14,8 @@ font-style: normal; font-size: 24px; display: inline-block; - width: 1em; - height: 1em; + width: 1em; /* stylelint-disable-line unit-whitelist */ + height: 1em; /* stylelint-disable-line unit-whitelist */ line-height: 1 !important; text-transform: none; letter-spacing: normal; From daf717c88728d807778178aad9dfd5ea098b8741 Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Thu, 8 Mar 2018 14:52:52 +0100 Subject: [PATCH 31/34] Fix font-size of headers in login --- src/components/login/login.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/login/login.css b/src/components/login/login.css index 6741f0d58c..a336ffb472 100644 --- a/src/components/login/login.css +++ b/src/components/login/login.css @@ -377,7 +377,8 @@ .signUp, .login { - & h2 a { + & h2 a, + & h2 { font-size: 65px; } } From de5c05d767da38471f7a4a1b13cc54199d188a6d Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Thu, 8 Mar 2018 15:22:42 +0100 Subject: [PATCH 32/34] Fix signUp h2 bug in mobile devices --- src/components/login/login.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/login/login.css b/src/components/login/login.css index a336ffb472..ef0af4bd09 100644 --- a/src/components/login/login.css +++ b/src/components/login/login.css @@ -245,6 +245,7 @@ & a { text-decoration: none; + font-size: inherit; } & .shapes { @@ -377,7 +378,6 @@ .signUp, .login { - & h2 a, & h2 { font-size: 65px; } @@ -488,7 +488,6 @@ padding: 0 20px; & h2 a { - font-size: var(--font-size-h2-s); margin-top: 12vh; /* stylelint-disable-line */ } } From 34dfacc0f94e159eee22badd3f7d57f7dc705904 Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Thu, 8 Mar 2018 15:43:27 +0100 Subject: [PATCH 33/34] Fix a style bug in saveAccounts.css --- src/components/savedAccounts/savedAccounts.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/savedAccounts/savedAccounts.css b/src/components/savedAccounts/savedAccounts.css index 5ed38e0034..d36ed8dd86 100644 --- a/src/components/savedAccounts/savedAccounts.css +++ b/src/components/savedAccounts/savedAccounts.css @@ -7,7 +7,7 @@ --font-size-card-h2: 32px; --font-size-card-h2-s: 24px; --address-font-size: 18px; - --small-font-size: 11px; + --small-font-size: 20px; --close-button-shadow: 0 20px 20px 0 rgba(0, 32, 68, 0.25); --h1-padding-xl: 85px; --h1-padding-l: 40px; From cea9712213b8d1b15324029387acb5bfa037d756 Mon Sep 17 00:00:00 2001 From: yasharAyari Date: Thu, 8 Mar 2018 17:30:56 +0100 Subject: [PATCH 34/34] Fix signUpArrow font-size in mobile --- src/components/login/login.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/components/login/login.css b/src/components/login/login.css index ef0af4bd09..f2fb9964f9 100644 --- a/src/components/login/login.css +++ b/src/components/login/login.css @@ -455,6 +455,7 @@ .login, .signUp { & h2 { + font-size: var(--font-size-h2-l); margin-top: 28vh; /* stylelint-disable-line */ } } @@ -465,6 +466,10 @@ border-radius: 0px; width: 60%; height: calc(100vh - var(--m-top-bar-height) - var(--m-menu-bar-height)); /* stylelint-disable-line */ + + & .singUpArrow { + font-size: var(--arrow-focused-font-size); + } } .login, @@ -487,6 +492,10 @@ .signUp { padding: 0 20px; + & h2 { + font-size: var(--font-size-h2-s); + } + & h2 a { margin-top: 12vh; /* stylelint-disable-line */ }