From 5534db40009c2cd2290c56eecf473dae5d7d969f Mon Sep 17 00:00:00 2001
From: Jonathan Sick <jsick@lsst.org>
Date: Fri, 30 Apr 2021 12:11:37 -0400
Subject: [PATCH 1/3] Install @fontsource/source-sans-pro

This provides the Source Sans font as part of the app bundle, allowing
us to drop the Google Fonts dependency.
---
 package-lock.json | 11 +++++++++++
 package.json      | 14 ++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index eb113421..1eabe09a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,6 +8,7 @@
       "name": "squareone",
       "version": "0.1.0",
       "dependencies": {
+        "@fontsource/source-sans-pro": "^4.2.2",
         "@fortawesome/fontawesome-svg-core": "^1.2.35",
         "@fortawesome/free-solid-svg-icons": "^5.15.3",
         "@fortawesome/react-fontawesome": "^0.1.14",
@@ -381,6 +382,11 @@
         "node": ">=8"
       }
     },
+    "node_modules/@fontsource/source-sans-pro": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@fontsource/source-sans-pro/-/source-sans-pro-4.2.2.tgz",
+      "integrity": "sha512-ApmV5F1D32nmBspCJuijDNBV7TtazFC4L7BIilHj3e6IAW/ndQMXl1+4DUjOGVO/83tF/WXjOEMxROE0QxYDwQ=="
+    },
     "node_modules/@fortawesome/fontawesome-common-types": {
       "version": "0.2.35",
       "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.35.tgz",
@@ -6559,6 +6565,11 @@
         }
       }
     },
+    "@fontsource/source-sans-pro": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@fontsource/source-sans-pro/-/source-sans-pro-4.2.2.tgz",
+      "integrity": "sha512-ApmV5F1D32nmBspCJuijDNBV7TtazFC4L7BIilHj3e6IAW/ndQMXl1+4DUjOGVO/83tF/WXjOEMxROE0QxYDwQ=="
+    },
     "@fortawesome/fontawesome-common-types": {
       "version": "0.2.35",
       "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.35.tgz",
diff --git a/package.json b/package.json
index c31d8db2..a552563c 100644
--- a/package.json
+++ b/package.json
@@ -13,8 +13,17 @@
     "prepare": "husky install"
   },
   "babel": {
-    "presets": ["next/babel"],
-    "plugins": [["styled-components", { "ssr": true }]]
+    "presets": [
+      "next/babel"
+    ],
+    "plugins": [
+      [
+        "styled-components",
+        {
+          "ssr": true
+        }
+      ]
+    ]
   },
   "eslintConfig": {
     "extends": [
@@ -37,6 +46,7 @@
     "*.js": "eslint"
   },
   "dependencies": {
+    "@fontsource/source-sans-pro": "^4.2.2",
     "@fortawesome/fontawesome-svg-core": "^1.2.35",
     "@fortawesome/free-solid-svg-icons": "^5.15.3",
     "@fortawesome/react-fontawesome": "^0.1.14",

From 51d40fc9062ac1a638f6627abfef71d0dfc35869 Mon Sep 17 00:00:00 2001
From: Jonathan Sick <jsick@lsst.org>
Date: Fri, 30 Apr 2021 12:19:35 -0400
Subject: [PATCH 2/3] Load Source Sans Pro via Font Source

---
 components/meta.js | 6 ------
 pages/_app.js      | 8 ++++++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/components/meta.js b/components/meta.js
index f49de6b7..34e1d0fe 100644
--- a/components/meta.js
+++ b/components/meta.js
@@ -33,12 +33,6 @@ const Meta = () => {
         key="ogdescription"
         content={siteDescription}
       />
-
-      <link rel="preconnect" href="https://fonts.gstatic.com" />
-      <link
-        href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:ital,wght@0,400;0,700;1,400&display=swap"
-        rel="stylesheet"
-      />
     </Head>
   );
 };
diff --git a/pages/_app.js b/pages/_app.js
index 72022a1b..8b4d793e 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -2,14 +2,22 @@ import PropTypes from 'prop-types';
 import getConfig from 'next/config';
 import { ThemeProvider } from 'next-themes';
 
+// Icons from Font Awesome
 import { library } from '@fortawesome/fontawesome-svg-core';
 import { faAngleDown } from '@fortawesome/free-solid-svg-icons';
 import '@fortawesome/fontawesome-svg-core/styles.css';
 
+// Source Sans Pro Font from Font Source
+import '@fontsource/source-sans-pro/400.css';
+import '@fontsource/source-sans-pro/400-italic.css';
+import '@fontsource/source-sans-pro/700.css';
+
+// Global CSS
 import 'normalize.css';
 import '@lsst-sqre/rubin-style-dictionary/dist/tokens.css';
 import '@lsst-sqre/rubin-style-dictionary/dist/tokens.dark.css';
 import '../styles/globals.css';
+
 import { useLogin } from '../hooks/login';
 import Page from '../components/page';
 

From 1d72603d31655de6944d33d48c35253152b1cd29 Mon Sep 17 00:00:00 2001
From: Jonathan Sick <jsick@lsst.org>
Date: Fri, 30 Apr 2021 12:23:38 -0400
Subject: [PATCH 3/3] Drop favicon.ico reference

I think this was a hold-over from the starter template; the favicons are
being set in the meta.js component module
---
 pages/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pages/index.js b/pages/index.js
index b74dfe77..032eca41 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -9,7 +9,6 @@ export default function Home({ publicRuntimeConfig }) {
     <>
       <Head>
         <title>{publicRuntimeConfig.siteName}</title>
-        <link rel="icon" href="/favicon.ico" />
       </Head>
 
       <Hero />