diff --git a/app/components/Typography/Text.tsx b/app/components/Typography/Text.tsx index bb45dab..b6945e0 100644 --- a/app/components/Typography/Text.tsx +++ b/app/components/Typography/Text.tsx @@ -14,7 +14,7 @@ export type TypographyProps = { variant?: types.TextVariantType; leading?: types.FontLeadingType; /** - * If true, use default tracking for the font - for Druk and Druk Wide + * If true, use default tracking for the font - for DM Sans */ useDefaultTracking?: boolean; italic?: boolean; @@ -38,10 +38,10 @@ export const Text = ({ color = 'default', variant, leading, - useDefaultTracking = font === 'druk-wide', + useDefaultTracking = font === 'ds-sans', italic, srOnly, - uppercase = font === 'druk', + uppercase = font === 'ds-sans', icon, iconProps, className, @@ -66,7 +66,7 @@ export const Text = ({ srOnly ? 'sr-only' : '', uppercase ? 'uppercase' : '', useDefaultTracking ? 'tracking-normal' : '', - font === 'druk' ? 'tracking-normal sm:tracking-wide' : '', + font === 'ds-sans' ? 'tracking-normal sm:tracking-wide' : '', className, ) } diff --git a/app/components/Typography/typography.styles.ts b/app/components/Typography/typography.styles.ts index e98e6b9..922d04a 100644 --- a/app/components/Typography/typography.styles.ts +++ b/app/components/Typography/typography.styles.ts @@ -1,6 +1,7 @@ export const fontFamilies = { sans: 'font-sans', serif: 'font-serif', + 'ds-sans': 'font-ds-sans', }; export const fontWeights = { diff --git a/app/layout.tsx b/app/layout.tsx index 7769580..96872c8 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,21 +1,20 @@ import './globals.css'; import localFont from 'next/font/local'; -import { Source_Sans_3, Source_Serif_4 } from 'next/font/google'; +import { Source_Sans_3, DM_Sans } from 'next/font/google'; import { cnb } from 'cnbuilder'; - -const source_sans = Source_Sans_3({ +const dm_sans = DM_Sans({ subsets: ['latin'], style: ['italic','normal'], display: 'swap', - variable: '--font-source-sans', + variable: '--font-dm-sans', }); -const source_serif = Source_Serif_4({ +const source_sans = Source_Sans_3({ subsets: ['latin'], style: ['italic','normal'], display: 'swap', - variable: '--font-source-serif', + variable: '--font-source-sans', }); const stanford = localFont({ @@ -33,8 +32,8 @@ export default function RootLayout({ diff --git a/app/page.tsx b/app/page.tsx index 17c2632..882cf13 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,9 +1,9 @@ -import { TimelineBanner } from './components/TimelineBanner'; +import { Heading } from './components/Typography'; export default function Home() { return (
- + SOE Centennial
); }