fix: new font sizes

This commit is contained in:
Taranto 2020-09-09 19:18:44 +01:00 committed by Josh Harvey
parent 99b400f21c
commit 29502ee303
3 changed files with 12 additions and 8 deletions

View file

@ -22,6 +22,7 @@ import {
} from 'src/components/typography' } from 'src/components/typography'
import { ReactComponent as EditIcon } from 'src/styling/icons/action/edit/enabled.svg' 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 { 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 { fromNamespace, toNamespace, namespaces } from 'src/utils/config'
import { import {
@ -42,12 +43,12 @@ const fieldStyles = {
display: 'flex', display: 'flex',
flexDirection: 'column', flexDirection: 'column',
'& > p:first-child': { '& > p:first-child': {
height: 17, height: 16,
lineHeight: '16px', lineHeight: '16px',
transform: 'scale(0.75)', fontSize: fontSize5,
transformOrigin: 'left', transformOrigin: 'left',
paddingLeft: 0, paddingLeft: 0,
margin: [[1, 0, 5, 0]] margin: [[3, 0, 3, 0]]
}, },
'& > p:last-child': { '& > p:last-child': {
overflow: 'hidden', overflow: 'hidden',

View file

@ -9,6 +9,7 @@ import {
fontColor, fontColor,
offColor, offColor,
subheaderColor, subheaderColor,
fontSize3,
fontSize5 fontSize5
} from './variables' } from './variables'
@ -93,10 +94,12 @@ export default createMuiTheme({
MuiInputLabel: { MuiInputLabel: {
root: { root: {
font: 'inherit', font: 'inherit',
fontSize: fontSize3,
color: offColor color: offColor
}, },
shrink: { shrink: {
color: fontColor color: fontColor,
transform: 'translate(0, 1.7px) scale(0.83)'
} }
}, },
MuiFormLabel: { MuiFormLabel: {

View file

@ -63,10 +63,10 @@ const fontPrimary = 'Mont'
const fontSecondary = 'MuseoSans' const fontSecondary = 'MuseoSans'
const fontMonospaced = 'BPmono' const fontMonospaced = 'BPmono'
let fontSize1 = 25 let fontSize1 = 24
let fontSize2 = 21 let fontSize2 = 20
let fontSize3 = 17 let fontSize3 = 16
let fontSize4 = 15 let fontSize4 = 14
let fontSize5 = 13 let fontSize5 = 13
if (version === 8) { if (version === 8) {