Commit 1eddf94

authored

Merge pull request #470 from jbhannah/patch-2

Add font-display property

2 parents d841afa + b76511b commit 1eddf94Copy full SHA for 1eddf94

File tree

+16

-4

lines changed

+16

-4

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,26 +9,29 @@`
`9`	`9`	`src: url('fonts/hack-regular-subset.woff2?sha=3114f1256') format('woff2'), url('fonts/hack-regular-subset.woff?sha=3114f1256') format('woff');`
`10`	`10`	`font-weight: 400;`
`11`	`11`	`font-style: normal;`
	`12`	`+ font-display: swap;`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`@font-face {`
`15`	`16`	`font-family: 'Hack';`
`16`	`17`	`src: url('fonts/hack-bold-subset.woff2?sha=3114f1256') format('woff2'), url('fonts/hack-bold-subset.woff?sha=3114f1256') format('woff');`
`17`	`18`	`font-weight: 700;`
`18`	`19`	`font-style: normal;`
	`20`	`+ font-display: swap;`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`@font-face {`
`22`	`24`	`font-family: 'Hack';`
`23`	`25`	`src: url('fonts/hack-italic-subset.woff2?sha=3114f1256') format('woff2'), url('fonts/hack-italic-subset.woff?sha=3114f1256') format('woff');`
`24`	`26`	`font-weight: 400;`
`25`	`27`	`font-style: italic;`
	`28`	`+ font-display: swap;`
`26`	`29`	`}`
`27`	`30`
`28`	`31`	`@font-face {`
`29`	`32`	`font-family: 'Hack';`
`30`	`33`	`src: url('fonts/hack-bolditalic-subset.woff2?sha=3114f1256') format('woff2'), url('fonts/hack-bolditalic-subset.woff?sha=3114f1256') format('woff');`
`31`	`34`	`font-weight: 700;`
`32`	`35`	`font-style: italic;`
	`36`	`+ font-display: swap;`
`33`	`37`	`}`
`34`		`-`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,26 +9,29 @@`
`9`	`9`	`src: url('fonts/hack-regular-subset.woff2?sha={{ ink }}') format('woff2'), url('fonts/hack-regular-subset.woff?sha={{ ink }}') format('woff');`
`10`	`10`	`font-weight: 400;`
`11`	`11`	`font-style: normal;`
	`12`	`+ font-display: swap;`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`@font-face {`
`15`	`16`	`font-family: 'Hack';`
`16`	`17`	`src: url('fonts/hack-bold-subset.woff2?sha={{ ink }}') format('woff2'), url('fonts/hack-bold-subset.woff?sha={{ ink }}') format('woff');`
`17`	`18`	`font-weight: 700;`
`18`	`19`	`font-style: normal;`
	`20`	`+ font-display: swap;`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`@font-face {`
`22`	`24`	`font-family: 'Hack';`
`23`	`25`	`src: url('fonts/hack-italic-subset.woff2?sha={{ ink }}') format('woff2'), url('fonts/hack-italic-subset.woff?sha={{ ink }}') format('woff');`
`24`	`26`	`font-weight: 400;`
`25`	`27`	`font-style: italic;`
	`28`	`+ font-display: swap;`
`26`	`29`	`}`
`27`	`30`
`28`	`31`	`@font-face {`
`29`	`32`	`font-family: 'Hack';`
`30`	`33`	`src: url('fonts/hack-bolditalic-subset.woff2?sha={{ ink }}') format('woff2'), url('fonts/hack-bolditalic-subset.woff?sha={{ ink }}') format('woff');`
`31`	`34`	`font-weight: 700;`
`32`	`35`	`font-style: italic;`
	`36`	`+ font-display: swap;`
`33`	`37`	`}`
`34`		`-`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,26 +9,29 @@`
`9`	`9`	`src: url('fonts/hack-regular.woff2?sha=3114f1256') format('woff2'), url('fonts/hack-regular.woff?sha=3114f1256') format('woff');`
`10`	`10`	`font-weight: 400;`
`11`	`11`	`font-style: normal;`
	`12`	`+ font-display: swap;`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`@font-face {`
`15`	`16`	`font-family: 'Hack';`
`16`	`17`	`src: url('fonts/hack-bold.woff2?sha=3114f1256') format('woff2'), url('fonts/hack-bold.woff?sha=3114f1256') format('woff');`
`17`	`18`	`font-weight: 700;`
`18`	`19`	`font-style: normal;`
	`20`	`+ font-display: swap;`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`@font-face {`
`22`	`24`	`font-family: 'Hack';`
`23`	`25`	`src: url('fonts/hack-italic.woff2?sha=3114f1256') format('woff2'), url('fonts/hack-italic.woff?sha=3114f1256') format('woff');`
`24`	`26`	`font-weight: 400;`
`25`	`27`	`font-style: italic;`
	`28`	`+ font-display: swap;`
`26`	`29`	`}`
`27`	`30`
`28`	`31`	`@font-face {`
`29`	`32`	`font-family: 'Hack';`
`30`	`33`	`src: url('fonts/hack-bolditalic.woff2?sha=3114f1256') format('woff2'), url('fonts/hack-bolditalic.woff?sha=3114f1256') format('woff');`
`31`	`34`	`font-weight: 700;`
`32`	`35`	`font-style: italic;`
	`36`	`+ font-display: swap;`
`33`	`37`	`}`
`34`		`-`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,26 +9,29 @@`
`9`	`9`	`src: url('fonts/hack-regular.woff2?sha={{ ink }}') format('woff2'), url('fonts/hack-regular.woff?sha={{ ink }}') format('woff');`
`10`	`10`	`font-weight: 400;`
`11`	`11`	`font-style: normal;`
	`12`	`+ font-display: swap;`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`@font-face {`
`15`	`16`	`font-family: 'Hack';`
`16`	`17`	`src: url('fonts/hack-bold.woff2?sha={{ ink }}') format('woff2'), url('fonts/hack-bold.woff?sha={{ ink }}') format('woff');`
`17`	`18`	`font-weight: 700;`
`18`	`19`	`font-style: normal;`
	`20`	`+ font-display: swap;`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`@font-face {`
`22`	`24`	`font-family: 'Hack';`
`23`	`25`	`src: url('fonts/hack-italic.woff2?sha={{ ink }}') format('woff2'), url('fonts/hack-italic.woff?sha={{ ink }}') format('woff');`
`24`	`26`	`font-weight: 400;`
`25`	`27`	`font-style: italic;`
	`28`	`+ font-display: swap;`
`26`	`29`	`}`
`27`	`30`
`28`	`31`	`@font-face {`
`29`	`32`	`font-family: 'Hack';`
`30`	`33`	`src: url('fonts/hack-bolditalic.woff2?sha={{ ink }}') format('woff2'), url('fonts/hack-bolditalic.woff?sha={{ ink }}') format('woff');`
`31`	`34`	`font-weight: 700;`
`32`	`35`	`font-style: italic;`
	`36`	`+ font-display: swap;`
`33`	`37`	`}`
`34`		`-`

Comments

(0)