Merge pull request #13641 from ethereum/css-import-consolidation

refactor: consolidate css imports into global.css
ethereum · Aug 19, 2024 · 6ec62c3 · 6ec62c3
2 parents 89854bc + 9fb112d
commit 6ec62c3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -42,7 +42,7 @@
           // Other relative imports. Put same-folder imports and `.` last.
           ["^\\./(?=.*/)(?!/?$)", "^\\.(?!/?$)", "^\\./?$"],
           // Style imports.
-          ["^.+s?css$"],
+          ["^.+\\.s?css$"],
           // Side effect imports.
           ["^\\u0000"]
         ]

diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
@@ -6,10 +6,7 @@ import { AppPropsWithLayout } from "@/lib/types"
 
 import ThemeProvider from "@/components/ThemeProvider"
 
-import "@docsearch/css"
 import "@/styles/global.css"
-import "@/styles/fonts.css"
-import "@/styles/docsearch.css"
 
 import { BaseLayout } from "@/layouts/BaseLayout"
 

diff --git a/src/styles/global.css b/src/styles/global.css
@@ -2,6 +2,10 @@
 @tailwind components;
 @tailwind utilities;
 
+@import "@docsearch/css";
+@import "@/styles/fonts.css";
+@import "@/styles/docsearch.css";
+
 @layer base {
   :root {
     --font-inter: Inter, sans-serif;