refact: extract typography constants

This commit is contained in:
Jean-Philippe Sirois
2019-07-29 14:12:08 -04:00
parent 17728684ea
commit 7e324bff3b
3 changed files with 28 additions and 8 deletions
+7 -5
View File
@@ -1,8 +1,10 @@
import styled, { css } from "styled-components" import styled, { css } from "styled-components"
import {
const BASE_FONT_SIZE = 18 BASE_FONT_SIZE,
const BASE_LINE_HEIGHT = 26 BASE_LINE_HEIGHT,
const MODULAR_SCALE = 1.1487 MODULAR_SCALE,
fontFamily,
} from "../../design/typography"
function modularFontSize(power: number) { function modularFontSize(power: number) {
return BASE_FONT_SIZE * Math.pow(MODULAR_SCALE, power) return BASE_FONT_SIZE * Math.pow(MODULAR_SCALE, power)
@@ -36,7 +38,7 @@ export const MarkdownWrapper = styled.div`
h4, h4,
h5, h5,
h6 { h6 {
font-family: "Montserrat"; font-family: ${fontFamily.header};
letter-spacing: -1.75px; letter-spacing: -1.75px;
margin-top: ${BASE_LINE_HEIGHT * 2}px; margin-top: ${BASE_LINE_HEIGHT * 2}px;
margin-bottom: ${BASE_LINE_HEIGHT}px; margin-bottom: ${BASE_LINE_HEIGHT}px;
+13
View File
@@ -0,0 +1,13 @@
const FONT_OXYGEN = "Oxygen, sans-serif"
const FONT_MONTSERRAT = "Montserrat, sans-serif"
export const BASE_FONT_SIZE = 18
export const BASE_LINE_HEIGHT = 25
export const MODULAR_SCALE = 1.1487
export const fontFamily = {
header: FONT_MONTSERRAT,
body: FONT_OXYGEN,
}
export default fontFamily
+8 -3
View File
@@ -1,12 +1,17 @@
import { createGlobalStyle } from "styled-components" import { createGlobalStyle } from "styled-components"
import {
BASE_FONT_SIZE,
BASE_LINE_HEIGHT,
fontFamily,
} from "./design/typography"
export const GlobalStyles = createGlobalStyle` export const GlobalStyles = createGlobalStyle`
html { html {
font-family: Oxygen; font-family: ${fontFamily.body};
} }
body { body {
font-size: 18px; font-size: ${BASE_FONT_SIZE}px;
line-height: 25px; line-height: ${BASE_LINE_HEIGHT}px;
} }
` `