Merge pull request #91 from tailwindcss/typekit-grotesk

adamwathan · web-flow · commit 2ec0e0a9c157 · 2017-11-03T17:17:42.000-04:00
Don't try to use local Aktiv Grotesk, only use TypeKit version
diff --git a/docs/tailwind.js b/docs/tailwind.js
@@ -19,7 +19,7 @@ config.colors = Object.assign(config.colors, {
 })
 
 config.fonts = {
-  'sans': 'Aktiv Grotesk, aktiv-grotesk, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue',
+  'sans': 'aktiv-grotesk, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue',
   'serif': 'Constantia, "Lucida Bright", Lucidabright, "Lucida Serif", Lucida, "DejaVu Serif", "Bitstream Vera Serif", "Liberation Serif", Georgia, serif',
   'mono': 'Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
 }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ config.colors = Object.assign(config.colors, {`
`19`	`19`	`})`
`20`	`20`
`21`	`21`	`config.fonts = {`
`22`		`- 'sans': 'Aktiv Grotesk, aktiv-grotesk, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue',`
	`22`	`+ 'sans': 'aktiv-grotesk, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue',`
`23`	`23`	`'serif': 'Constantia, "Lucida Bright", Lucidabright, "Lucida Serif", Lucida, "DejaVu Serif", "Bitstream Vera Serif", "Liberation Serif", Georgia, serif',`
`24`	`24`	`'mono': 'Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',`
`25`	`25`	`}`