Skip to content

Fix font stylesheet rule #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MHolmes91 merged 1 commit into from
Jun 4, 2025
Merged

Fix font stylesheet rule #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions pages/_document.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import Document, { Html, Head, Main, NextScript } from 'next/document';
import getPortfolioProps from '../lib/getPortfolioProps';

const DEFAULT_GOOGLE_FONTS_URL =
"//fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic|PT+Sans:400,700|PT+Sans+Narrow:400,700|Inconsolata:400";

class MyDocument extends Document {
static async getInitialProps(ctx) {
const initialProps = await Document.getInitialProps(ctx);
const { data } = getPortfolioProps();
const fontsUrl = data.style?.fonts?.googleFontsUrl || DEFAULT_GOOGLE_FONTS_URL;
return { ...initialProps, fontsUrl };
}

render() {
const { fontsUrl } = this.props;
return (
<Html>
<Head>
{fontsUrl && <link href={fontsUrl} rel="stylesheet" type="text/css" />}
</Head>
<body>
<Main />
<NextScript />
</body>
</Html>
);
}
}

export default MyDocument;
8 changes: 0 additions & 8 deletions pages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ import Header from "../components/Header";
import Footer from "../components/Footer";
import getPortfolioProps from "../lib/getPortfolioProps";

const DEFAULT_GOOGLE_FONTS_URL =
"//fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic|PT+Sans:400,700|PT+Sans+Narrow:400,700|Inconsolata:400";

export async function getStaticProps() {
return {
props: getPortfolioProps(),
Expand Down Expand Up @@ -42,11 +39,6 @@ export default function Home({
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>{data.pageTitle ? data.pageTitle : data.title}</title>
{faviconUrl && <link rel="icon" type={faviconType} href={faviconUrl} />}
<link
href={fonts.googleFontsUrl || DEFAULT_GOOGLE_FONTS_URL}
rel="stylesheet"
type="text/css"
/>
{styleVars.length > 0 && (
<style>{`:root{${styleVars.join(";")};}`}</style>
)}
Expand Down