Merge branch 'master' into jori/analytics

2017-11-10 17:25:26 -08:00
parent c33c7f04d8 0d1e1c71c6
commit e3e97a1c0f
15 changed files with 1 additions and 2 deletions
--- a/app/fonts/atlas/AtlasGrotesk-Black-Web.woff
+++ b/app/fonts/atlas/AtlasGrotesk-Black-Web.woff
--- a/app/fonts/atlas/AtlasGrotesk-BlackItalic-Web.woff
+++ b/app/fonts/atlas/AtlasGrotesk-BlackItalic-Web.woff
--- a/app/fonts/atlas/AtlasGrotesk-Bold-Web.woff
+++ b/app/fonts/atlas/AtlasGrotesk-Bold-Web.woff
--- a/app/fonts/atlas/AtlasGrotesk-BoldItalic-Web.woff
+++ b/app/fonts/atlas/AtlasGrotesk-BoldItalic-Web.woff
--- a/app/fonts/atlas/AtlasGrotesk-Light-Web.woff
+++ b/app/fonts/atlas/AtlasGrotesk-Light-Web.woff
--- a/app/fonts/atlas/AtlasGrotesk-LightItalic-Web.woff
+++ b/app/fonts/atlas/AtlasGrotesk-LightItalic-Web.woff
--- a/app/fonts/atlas/AtlasGrotesk-Medium-Web.woff
+++ b/app/fonts/atlas/AtlasGrotesk-Medium-Web.woff
--- a/app/fonts/atlas/AtlasGrotesk-MediumItalic-Web.woff
+++ b/app/fonts/atlas/AtlasGrotesk-MediumItalic-Web.woff
--- a/app/fonts/atlas/AtlasGrotesk-Regular-Web.woff
+++ b/app/fonts/atlas/AtlasGrotesk-Regular-Web.woff
--- a/app/fonts/atlas/AtlasGrotesk-RegularItalic-Web.woff
+++ b/app/fonts/atlas/AtlasGrotesk-RegularItalic-Web.woff
--- a/app/fonts/atlas/AtlasGrotesk-Thin-Web.woff
+++ b/app/fonts/atlas/AtlasGrotesk-Thin-Web.woff
--- a/app/fonts/atlas/AtlasGrotesk-ThinItalic-Web.woff
+++ b/app/fonts/atlas/AtlasGrotesk-ThinItalic-Web.woff
--- a/app/fonts/atlas/AtlasTypewriterMedium.woff
+++ b/app/fonts/atlas/AtlasTypewriterMedium.woff
--- a/app/fonts/atlas/AtlasTypewriterRegular.woff
+++ b/app/fonts/atlas/AtlasTypewriterRegular.woff
--- a/shared/styles/constants.js
+++ b/shared/styles/constants.js
@@ -38,8 +38,7 @@ export const fontWeight = {
 export const fonts = {
  regular: `-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen,
  Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;`,
-  monospace: `'Atlas Typewriter', 'Source Code Pro', Menlo, Consolas,
-    'Liberation Mono', monospace;`,
+  monospace: `Menlo, Consolas, 'Liberation Mono', monospace;`,
 };

 export const color = {