From f131e5cae1e6859d111941f240d24fdf724a249b Mon Sep 17 00:00:00 2001 From: Jolie Rabideau Date: Mon, 2 Dec 2024 15:05:09 -0500 Subject: [PATCH 1/2] Squashed 'extensions/' changes from c276fc9e7..2d3e6594f 2d3e6594f Ignore node modules in tailwind config (#33) 101dd359b Make ignore pattern more generic 3f5c87648 ignore extension node modules in tailwind config to fix warning git-subtree-dir: extensions git-subtree-split: 2d3e6594f9f06889ca9aa30a778483db160addbe --- tailwind.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tailwind.config.ts b/tailwind.config.ts index abbd71051b..f379da3999 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -7,7 +7,7 @@ import typography from '@tailwindcss/typography'; import tailwindCssAnimate from 'tailwindcss-animate'; const config: Config = { - content: ['./src/**/*.{js,ts,jsx,tsx}'], + content: ['./src/**/*.{js,ts,jsx,tsx}', '!./**/node_modules/**/*'], // Prefix on all tailwind classes so they don't clash with built-in classes // short for tailwind - we hope to have the same prefix as users of this library so the cn // function that uses tailwind-merge can properly overwrite related tailwind classes From 9e0e5bdfa48fcc4ff6ff9693e8418edba251495d Mon Sep 17 00:00:00 2001 From: Sebastian-ubs <141921979+Sebastian-ubs@users.noreply.github.com> Date: Wed, 4 Dec 2024 12:59:45 +0100 Subject: [PATCH 2/2] fix a link in code comments (#1364) --- lib/platform-bible-react/src/index.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/platform-bible-react/src/index.css b/lib/platform-bible-react/src/index.css index 37d46b4cae..0ed9765998 100644 --- a/lib/platform-bible-react/src/index.css +++ b/lib/platform-bible-react/src/index.css @@ -10,7 +10,7 @@ } } -/* #region shared with https://github.com/paranext/paranext-extension-template/blob/main/tailwind.css */ +/* #region shared with https://github.com/paranext/paranext-extension-template/blob/main/src/tailwind.css */ @layer base { @font-face {