update cv and deps

Author: stringparser

.babelrc

@@ -1,7 +1,6 @@
 {
   "presets": [
     "next/babel",
-    "@zeit/next-typescript/babel"
   ],
   "plugins": [
     [

components/Font.tsx

@@ -1,15 +1,8 @@
 
-export const headerFont = `
-  font-family: 'Merriweather Sans', sans-serif;
-`;
-
-export const contentFont = `
-  font-family: 'Lato', sans-serif;
-`;
-
-export const FontHeadLink = () => (
-  <link
-    rel="stylesheet"
-    href="https://fonts.googleapis.com/css?family=Lato:100,400,700|Merriweather:400,700"
-  />
-);
+export const fontFamily =
+"'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif";
+
+export const headerFont = fontFamily;
+
+export const contentFont = fontFamily;
+

components/Heading.tsx

@@ -2,8 +2,8 @@ import styled from 'styled-components';
 import { headerFont } from './Font';
 
 const shared = `
-  margin: 0;
-  ${headerFont}
+  margin: 0.5rem 0;
+  font-family: ${headerFont};
 `;
 
 export const H1 = styled.h1`${shared}

components/Logo.tsx

@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 import Image from './layout/Image';
 import { iconSize } from './theme';
-import { BACKEND_URL } from '../config/client.js';
+import { BACKEND_URL } from '../config/client';
 
 type LogoProps = {
   dim?: number;

components/Navbar.tsx

@@ -5,7 +5,7 @@ import { createRef, Component, RefObject } from 'react';
 import Logo from './Logo';
 import { zIndex } from './theme';
 import { linkHighlight } from './mixins';
-import { BACKEND_URL } from '../config/client.js';
+import { BACKEND_URL } from '../config/client';
 
 export const navbarHeight = 4;
 
@@ -89,7 +89,7 @@ class Navbar extends Component {
 
   onScroll = () => {
     const scrollY = window.scrollY;
-    const navHeight = this.navRef.current.offsetHeight;
+    const navHeight = this.navRef.current?.offsetHeight;
 
     const nextState = {
       scrollY,

components/Page.tsx

@@ -1,15 +1,15 @@
 import Head from 'next/head';
-import { injectGlobal } from 'styled-components';
+import { createGlobalStyle } from 'styled-components'
 
 import { forMedia } from './mixins';
-import { FontHeadLink, contentFont } from './Font';
+import { contentFont } from './Font';
 
 import Navbar from './Navbar';
 import Footer from './Footer';
-import { BACKEND_URL, META_KEYWORDS, TWITTER_URL } from '../config/client.js';
+import { BACKEND_URL, META_KEYWORDS, TWITTER_URL } from '../config/client';
 import { AnalyticsHeadScript } from './Analytics';
 
-injectGlobal`
+const GlobalStyle = createGlobalStyle`
   html {
     font-size: 15px;
   }
@@ -25,7 +25,7 @@ injectGlobal`
   }
 
   body {
-    ${contentFont}
+    font-family: ${contentFont};
     background-color: snow;
   }
 
@@ -34,6 +34,10 @@ injectGlobal`
     box-sizing: border-box;
   }
 
+  li {
+    line-height: 1.6rem;
+  }
+
   a {
     color: currentColor;
   }
@@ -55,7 +59,6 @@ const Page: React.SFC<PageProps> = ({ title, children }) => (
       <title>{title}</title>
       <meta name="keywords" content={META_KEYWORDS} />
       <meta name="description" content="Javier Carrillo Milla. Freelance Software Engineer" />
-      <FontHeadLink />
 
       <meta name="theme-color" content="#000" />
       <link rel="apple-touch-icon" href={logo} />
@@ -72,6 +75,8 @@ const Page: React.SFC<PageProps> = ({ title, children }) => (
       <AnalyticsHeadScript />
     </Head>
 
+    <GlobalStyle />
+
     <Navbar />
 
     {children}

components/Text.tsx

@@ -6,6 +6,7 @@ const Text: React.SFC = ({ children }) => (
     {`
       margin: 1rem auto;
       font-size: 1rem;
+      line-height: 1.6;
       white-space: pre-line;
       line-height: 1.75rem;
       margin-bottom: 0;

components/button/Button.tsx

@@ -28,7 +28,8 @@ const Button = styled<ButtonProps, 'button'>('button')`
 
   ${({ variation = 'fullWidth' }) => styles[variation]}
 
-  border: 2px solid currentColor;
+  border: 1px solid currentColor;
+  border-radius: 4px;
 
   color: currentColor;
   background-color: transparent;

components/button/DownloadResume.tsx

@@ -1,5 +1,5 @@
 import Button from './Button';
-import resume from '@stringparser/cv';
+import resume from '@stringparser/cv/src/config';
 
 const DownloadResume: React.SFC = ({ children }) => (
   <a href={resume.pdf}>

components/button/EmailMeButton.tsx

@@ -1,7 +1,7 @@
 import Link from 'next/link';
 
 import Button from './Button';
-import { EMAIL, BACKEND_URL } from '../../config/client.js';
+import { EMAIL, BACKEND_URL } from '../../config/client';
 
 const onMailto = (href: string) => () => window.location.assign(href);