Merge branch 'main' into add-multiselect-to-combobox

paranext · Dec 4, 2024 · ed4abcf · ed4abcf
2 parents b644219 + 9e0e5bd
commit ed4abcf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/extensions/tailwind.config.ts b/extensions/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

diff --git 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 {