Skip to content

211 support font display for googlefonts #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

211 support font display for googlefonts #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
04d3574
updated GoogleFont logic to use display option
dakebl May 21, 2019
4c5d04c
updated GoogleFont tests to use new display value
dakebl May 21, 2019
5d1b67c
moved fontDisplay out of the googleFonts objects
dakebl May 21, 2019
27d6798
updated test for new fontDisplay
dakebl May 21, 2019
4a7ee37
pushed package-lock
dakebl May 21, 2019
84d5eaf
fix travis issue
dakebl May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: node_js
node_js:
- '6'
- '8'
- '10'
sudo: false
before_script:
'./node_modules/.bin/lerna bootstrap'
Expand Down
2 changes: 1 addition & 1 deletion __test__/__snapshots__/react-typography.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

exports[`GoogleFont should render with googleFonts options 1`] = `
<link
href="//fonts.googleapis.com/css?family=Montserrat:700"
href="//fonts.googleapis.com/css?family=Montserrat:700&display=optional"
rel="stylesheet"
type="text/css"
/>
Expand Down
1 change: 1 addition & 0 deletions __test__/react-typography.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ describe('GoogleFont', () => {
it('should render with googleFonts options', () => {
const component = renderer.create(React.createElement(GoogleFont, {
typography: typography({
fontDisplay: 'optional',
googleFonts: [
{
name: 'Montserrat',
Expand Down
Loading