From 29502ee3033a3a2038c3dbca43ffc9aa48f49784 Mon Sep 17 00:00:00 2001 From: Taranto Date: Wed, 9 Sep 2020 19:18:44 +0100 Subject: [PATCH] fix: new font sizes --- new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.js | 7 ++++--- new-lamassu-admin/src/styling/theme.js | 5 ++++- new-lamassu-admin/src/styling/variables.js | 8 ++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.js b/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.js index f818a34e..cff15b4a 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.js +++ b/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.js @@ -22,6 +22,7 @@ import { } from 'src/components/typography' import { ReactComponent as EditIcon } from 'src/styling/icons/action/edit/enabled.svg' import { ReactComponent as WarningIcon } from 'src/styling/icons/warning-icon/comet.svg' +import { fontSize5 } from 'src/styling/variables' import { fromNamespace, toNamespace, namespaces } from 'src/utils/config' import { @@ -42,12 +43,12 @@ const fieldStyles = { display: 'flex', flexDirection: 'column', '& > p:first-child': { - height: 17, + height: 16, lineHeight: '16px', - transform: 'scale(0.75)', + fontSize: fontSize5, transformOrigin: 'left', paddingLeft: 0, - margin: [[1, 0, 5, 0]] + margin: [[3, 0, 3, 0]] }, '& > p:last-child': { overflow: 'hidden', diff --git a/new-lamassu-admin/src/styling/theme.js b/new-lamassu-admin/src/styling/theme.js index 78b662e1..fdac109f 100644 --- a/new-lamassu-admin/src/styling/theme.js +++ b/new-lamassu-admin/src/styling/theme.js @@ -9,6 +9,7 @@ import { fontColor, offColor, subheaderColor, + fontSize3, fontSize5 } from './variables' @@ -93,10 +94,12 @@ export default createMuiTheme({ MuiInputLabel: { root: { font: 'inherit', + fontSize: fontSize3, color: offColor }, shrink: { - color: fontColor + color: fontColor, + transform: 'translate(0, 1.7px) scale(0.83)' } }, MuiFormLabel: { diff --git a/new-lamassu-admin/src/styling/variables.js b/new-lamassu-admin/src/styling/variables.js index fecc40d8..56f3058b 100644 --- a/new-lamassu-admin/src/styling/variables.js +++ b/new-lamassu-admin/src/styling/variables.js @@ -63,10 +63,10 @@ const fontPrimary = 'Mont' const fontSecondary = 'MuseoSans' const fontMonospaced = 'BPmono' -let fontSize1 = 25 -let fontSize2 = 21 -let fontSize3 = 17 -let fontSize4 = 15 +let fontSize1 = 24 +let fontSize2 = 20 +let fontSize3 = 16 +let fontSize4 = 14 let fontSize5 = 13 if (version === 8) {