Merge pull request #17 from lsst-sqre/tickets/DM-29972

DM-29972: Switch to Font Source from Google Fonts
lsst-sqre · Apr 30, 2021 · 8e41eba · 8e41eba
2 parents 76e8496 + 1d72603
commit 8e41eba
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 9 deletions.
diff --git 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/package-lock.json b/package-lock.json
diff --git 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",

diff --git 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';
 

diff --git 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 />