diff --git a/gatsby-config.js b/gatsby-config.js index c9379be..0d4502b 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -81,19 +81,10 @@ module.exports = { icon: `src/images/gatsby-icon.png`, // This path is relative to the root of the site. }, }, - { - resolve: 'gatsby-plugin-web-font-loader', - options: { - custom: { - families: ['SharpSans'], - urls: ['/styles/typography.css'], - }, - }, - }, { resolve: `gatsby-plugin-google-fonts`, options: { - fonts: [`Roboto+Slab\:300,400,500,400i,700`], + fonts: [`Plus+Jakarta+Sans\:500,600,700`, `Manrope\:500,600,700`], display: 'swap', }, }, diff --git a/package.json b/package.json index 2bba9cf..ec6f4ab 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,6 @@ "gatsby-plugin-sitemap": "^2.12.0", "gatsby-plugin-styled-components": "^3.10.0", "gatsby-plugin-use-dark-mode": "^1.5.0", - "gatsby-plugin-web-font-loader": "^1.0.4", "gatsby-remark-images": "^3.11.1", "gatsby-remark-prismjs": "^3.13.0", "gatsby-remark-reading-time": "^1.1.0", diff --git a/src/components/Layout.js b/src/components/Layout.js index 159b26a..a6f8d24 100644 --- a/src/components/Layout.js +++ b/src/components/Layout.js @@ -8,7 +8,6 @@ import React from 'react' import PropTypes from 'prop-types' -import 'styles/typography.css' import 'styles/layout.css' import styled from 'styled-components' diff --git a/src/components/Title.js b/src/components/Title.js index 6bf4adc..d2ea322 100644 --- a/src/components/Title.js +++ b/src/components/Title.js @@ -7,7 +7,7 @@ const Title = styled.h1` color: var(--text-primary); font-style: normal; font-family: ${fonts.title}; - font-weight: 900; + font-weight: 700; font-size: 25px; line-height: 1.5em; margin: 0; diff --git a/src/styles/fonts/SharpSans-Bold.eot b/src/styles/fonts/SharpSans-Bold.eot deleted file mode 100755 index e21274e..0000000 Binary files a/src/styles/fonts/SharpSans-Bold.eot and /dev/null differ diff --git a/src/styles/fonts/SharpSans-Bold.woff b/src/styles/fonts/SharpSans-Bold.woff deleted file mode 100644 index efad339..0000000 Binary files a/src/styles/fonts/SharpSans-Bold.woff and /dev/null differ diff --git a/src/styles/fonts/SharpSans-Bold.woff2 b/src/styles/fonts/SharpSans-Bold.woff2 deleted file mode 100644 index b10207a..0000000 Binary files a/src/styles/fonts/SharpSans-Bold.woff2 and /dev/null differ diff --git a/src/styles/fonts/SharpSans-Book.eot b/src/styles/fonts/SharpSans-Book.eot deleted file mode 100755 index 6fac9ca..0000000 Binary files a/src/styles/fonts/SharpSans-Book.eot and /dev/null differ diff --git a/src/styles/fonts/SharpSans-Book.woff b/src/styles/fonts/SharpSans-Book.woff deleted file mode 100644 index 4164ac9..0000000 Binary files a/src/styles/fonts/SharpSans-Book.woff and /dev/null differ diff --git a/src/styles/fonts/SharpSans-Book.woff2 b/src/styles/fonts/SharpSans-Book.woff2 deleted file mode 100644 index 1c72a68..0000000 Binary files a/src/styles/fonts/SharpSans-Book.woff2 and /dev/null differ diff --git a/src/styles/fonts/SharpSans-Light.eot b/src/styles/fonts/SharpSans-Light.eot deleted file mode 100755 index 8c70f6f..0000000 Binary files a/src/styles/fonts/SharpSans-Light.eot and /dev/null differ diff --git a/src/styles/fonts/SharpSans-Light.woff b/src/styles/fonts/SharpSans-Light.woff deleted file mode 100644 index 118ff1f..0000000 Binary files a/src/styles/fonts/SharpSans-Light.woff and /dev/null differ diff --git a/src/styles/fonts/SharpSans-Light.woff2 b/src/styles/fonts/SharpSans-Light.woff2 deleted file mode 100644 index 9e2ae1a..0000000 Binary files a/src/styles/fonts/SharpSans-Light.woff2 and /dev/null differ diff --git a/src/styles/fonts/SharpSans-Medium.eot b/src/styles/fonts/SharpSans-Medium.eot deleted file mode 100644 index f5a8f9a..0000000 Binary files a/src/styles/fonts/SharpSans-Medium.eot and /dev/null differ diff --git a/src/styles/fonts/SharpSans-Medium.woff b/src/styles/fonts/SharpSans-Medium.woff deleted file mode 100644 index 92d4638..0000000 Binary files a/src/styles/fonts/SharpSans-Medium.woff and /dev/null differ diff --git a/src/styles/fonts/SharpSans-Medium.woff2 b/src/styles/fonts/SharpSans-Medium.woff2 deleted file mode 100644 index eab375c..0000000 Binary files a/src/styles/fonts/SharpSans-Medium.woff2 and /dev/null differ diff --git a/src/styles/fonts/SharpSans-Semibold.eot b/src/styles/fonts/SharpSans-Semibold.eot deleted file mode 100755 index 2e1538b..0000000 Binary files a/src/styles/fonts/SharpSans-Semibold.eot and /dev/null differ diff --git a/src/styles/fonts/SharpSans-Semibold.woff b/src/styles/fonts/SharpSans-Semibold.woff deleted file mode 100644 index b1a9849..0000000 Binary files a/src/styles/fonts/SharpSans-Semibold.woff and /dev/null differ diff --git a/src/styles/fonts/SharpSans-Semibold.woff2 b/src/styles/fonts/SharpSans-Semibold.woff2 deleted file mode 100644 index a5de7ea..0000000 Binary files a/src/styles/fonts/SharpSans-Semibold.woff2 and /dev/null differ diff --git a/src/styles/theme.js b/src/styles/theme.js index 5c164b5..55727eb 100644 --- a/src/styles/theme.js +++ b/src/styles/theme.js @@ -1,8 +1,8 @@ module.exports = { fonts: { - body: `SharpSans, Helvetica, Arial, sans-serif`, - title: `SharpSans, Helvetica, Arial, sans-serif`, - text: `'Roboto Slab', serif`, + body: `'Manrope', Helvetica, Arial, sans-serif`, + title: `'Plus Jakarta Sans', Helvetica, Arial, sans-serif`, + text: `'Manrope', Helvetica, Arial, sans-serif`, }, colors: { background: '--background', diff --git a/src/styles/typography.css b/src/styles/typography.css deleted file mode 100644 index d99e5a5..0000000 --- a/src/styles/typography.css +++ /dev/null @@ -1,35 +0,0 @@ -@font-face { - font-family: 'SharpSans'; - font-style: normal; - font-weight: 300; - src: url('fonts/SharpSans-Light.eot'); - src: url('fonts/SharpSans-Light.woff') format('woff'), - url('fonts/SharpSans-Light.woff2') format('woff2'); -} - -@font-face { - font-family: 'SharpSans'; - font-style: normal; - font-weight: 500; - src: url('fonts/SharpSans-Medium.eot'); - src: url('fonts/SharpSans-Medium.woff') format('woff'), - url('fonts/SharpSans-Medium.woff2') format('woff2'); -} - -@font-face { - font-family: 'SharpSans'; - font-style: normal; - font-weight: 700; - src: url('fonts/SharpSans-Bold.eot'); - src: url('fonts/SharpSans-Bold.woff') format('woff'), - url('fonts/SharpSans-Bold.woff2') format('woff2'); -} - -@font-face { - font-family: 'SharpSans'; - font-style: normal; - font-weight: 900; - src: url('fonts/SharpSans-Bold.eot'); - src: url('fonts/SharpSans-Bold.woff') format('woff'), - url('fonts/SharpSans-Bold.woff2') format('woff2'); -} diff --git a/yarn.lock b/yarn.lock index 68091f9..559d591 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7146,14 +7146,6 @@ gatsby-plugin-utils@^3.10.0: mini-svg-data-uri "^1.4.4" svgo "^2.8.0" -gatsby-plugin-web-font-loader@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/gatsby-plugin-web-font-loader/-/gatsby-plugin-web-font-loader-1.0.4.tgz#c50bdb0c1980110b3fd213a5be70feb2459514c3" - integrity sha512-3c39bX9CcsYJQFhhmTyjuMJSqpld2rX+HsTOxP9k1PKFR4Rvo3lpzBW4d1tVpmUesR8BNL6u9eHT7/XksS1iog== - dependencies: - babel-runtime "^6.26.0" - webfontloader "^1.6.28" - gatsby-react-router-scroll@^4.14.0: version "4.14.0" resolved "https://registry.yarnpkg.com/gatsby-react-router-scroll/-/gatsby-react-router-scroll-4.14.0.tgz#8825c437f2ce07144dff2013f405b43af8159069" @@ -16029,11 +16021,6 @@ web-namespaces@^1.0.0, web-namespaces@^1.1.2: resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec" integrity sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw== -webfontloader@^1.6.28: - version "1.6.28" - resolved "https://registry.yarnpkg.com/webfontloader/-/webfontloader-1.6.28.tgz#db786129253cb6e8eae54c2fb05f870af6675bae" - integrity sha512-Egb0oFEga6f+nSgasH3E0M405Pzn6y3/9tOVanv/DLfa1YBIgcv90L18YyWnvXkRbIM17v5Kv6IT2N6g1x5tvQ== - webidl-conversions@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"