From f6613410b7a4d82e28a3b588f950dc99ff3f000e Mon Sep 17 00:00:00 2001 From: Michael Drayer Date: Tue, 5 Mar 2024 08:24:28 -0500 Subject: [PATCH 1/2] [83] Run prettier write against 1.x-RC --- pages/_app.tsx | 2 +- source/01-global/01-typography/fonts.stories.tsx | 2 +- source/01-global/01-typography/line-height.stories.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/_app.tsx b/pages/_app.tsx index 20da41f9..c6ed2e9b 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -1,6 +1,7 @@ import type { AppProps } from 'next/app'; import Head from 'next/head'; import '../source/00-config/index.css'; +import SourceSansFontStyle from '../source/01-global/fonts/source-sans'; import '../source/01-global/index.css'; import Footer from '../source/02-layouts/Footer/Footer'; import Header from '../source/02-layouts/Header/Header'; @@ -13,7 +14,6 @@ import SiteName from '../source/03-components/SiteName/SiteName'; import Skiplink from '../source/03-components/Skiplink/Skiplink'; import addBasePath from '../source/06-utility/addBasePath'; import '../source/06-utility/index.css'; -import SourceSansFontStyle from '../source/01-global/fonts/source-sans'; function MyApp({ Component, pageProps }: AppProps) { return ( diff --git a/source/01-global/01-typography/fonts.stories.tsx b/source/01-global/01-typography/fonts.stories.tsx index a36792af..2385d024 100644 --- a/source/01-global/01-typography/fonts.stories.tsx +++ b/source/01-global/01-typography/fonts.stories.tsx @@ -1,8 +1,8 @@ import { Meta, StoryObj } from '@storybook/react'; import { Property } from 'csstype'; +import { useEffect, useState } from 'react'; import getCssVariables from '../../06-utility/storybook/getCssVariables'; import styles from './fonts.module.css'; -import { useEffect, useState } from 'react'; const meta: Meta = { title: 'Global/Typography/Fonts', diff --git a/source/01-global/01-typography/line-height.stories.tsx b/source/01-global/01-typography/line-height.stories.tsx index e89de6d8..181a8659 100644 --- a/source/01-global/01-typography/line-height.stories.tsx +++ b/source/01-global/01-typography/line-height.stories.tsx @@ -1,8 +1,8 @@ import { Meta, StoryObj } from '@storybook/react'; import { Property } from 'csstype'; +import { useEffect, useState } from 'react'; import getCssVariables from '../../06-utility/storybook/getCssVariables'; import styles from './line-height.module.css'; -import { useEffect, useState } from 'react'; const meta: Meta = { title: 'Global/Typography/Line Height', From 9cf3bf06b2b3eec2f5fa3599fa00f0586c2caaf2 Mon Sep 17 00:00:00 2001 From: KJ Monahan Date: Tue, 5 Mar 2024 09:42:52 -0500 Subject: [PATCH 2/2] Re-re-run Prettier over app directory --- app/layout.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/layout.tsx b/app/layout.tsx index 87542479..ec87fe2a 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,16 +1,16 @@ import { JSX, PropsWithChildren } from 'react'; import '../source/00-config/index.css'; -import '../source/01-global/index.css'; import SourceSansFontStyle from '../source/01-global/fonts/source-sans'; -import Skiplink from '../source/03-components/Skiplink/Skiplink'; -import SiteContainer from '../source/02-layouts/SiteContainer/SiteContainer'; -import Header from '../source/02-layouts/Header/Header'; -import SiteName from '../source/03-components/SiteName/SiteName'; -import ResponsiveMenu from '../source/03-components/Menu/ResponsiveMenu/ResponsiveMenu'; +import '../source/01-global/index.css'; import Footer from '../source/02-layouts/Footer/Footer'; +import Header from '../source/02-layouts/Header/Header'; +import SiteContainer from '../source/02-layouts/SiteContainer/SiteContainer'; +import BackToTop from '../source/03-components/BackToTop/BackToTop'; import Menu from '../source/03-components/Menu/Menu'; +import ResponsiveMenu from '../source/03-components/Menu/ResponsiveMenu/ResponsiveMenu'; import footerStyles from '../source/03-components/Menu/menu-footer.module.css'; -import BackToTop from '../source/03-components/BackToTop/BackToTop'; +import SiteName from '../source/03-components/SiteName/SiteName'; +import Skiplink from '../source/03-components/Skiplink/Skiplink'; import '../source/06-utility/index.css'; function RootLayout({ children }: PropsWithChildren): JSX.Element {