From 78afa0c014ccb07415f042c63e7d7183068d9ea1 Mon Sep 17 00:00:00 2001 From: Lynx <141365347+iLynxcat@users.noreply.github.com> Date: Tue, 17 Dec 2024 19:10:58 -0600 Subject: [PATCH] Fix font in landing and app --- apps/desktop/src/App.tsx | 2 +- apps/storybook/.storybook/preview.ts | 2 +- packages/ui/package.json | 2 +- packages/ui/style/tailwind.js | 13 +++++++++---- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/apps/desktop/src/App.tsx b/apps/desktop/src/App.tsx index 5ad32744b..e65825200 100644 --- a/apps/desktop/src/App.tsx +++ b/apps/desktop/src/App.tsx @@ -16,7 +16,7 @@ import { } from '@sd/interface'; import { RouteTitleContext } from '@sd/interface/hooks/useRouteTitle'; -import '@sd/ui/style/style.scss'; +import '@sd/ui/style'; import SuperTokens from 'supertokens-web-js'; import EmailPassword from 'supertokens-web-js/recipe/emailpassword'; diff --git a/apps/storybook/.storybook/preview.ts b/apps/storybook/.storybook/preview.ts index 79860c5ec..1384b87e1 100644 --- a/apps/storybook/.storybook/preview.ts +++ b/apps/storybook/.storybook/preview.ts @@ -1,6 +1,6 @@ import type { Preview } from '@storybook/react'; -import '@sd/ui/style/style.scss'; +import '@sd/ui/style'; const preview: Preview = { parameters: { diff --git a/packages/ui/package.json b/packages/ui/package.json index 60f785072..ec7609f55 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -4,7 +4,7 @@ "license": "GPL-3.0-only", "main": "src/index.ts", "types": "src/index.ts", - "sideEffects": false, + "sideEffects": ["./style/index.js", "./style/style.scss"], "exports": { ".": "./src/index.ts", "./src/forms": "./src/forms/index.ts", diff --git a/packages/ui/style/tailwind.js b/packages/ui/style/tailwind.js index 59d22a478..577449833 100644 --- a/packages/ui/style/tailwind.js +++ b/packages/ui/style/tailwind.js @@ -7,6 +7,9 @@ function alpha(variableName) { } module.exports = function (app, options) { + /** + * @type {import('tailwindcss').Config} + */ let config = { content: [ `../../apps/${app}/src/**/*.{ts,tsx,html,stories.tsx}`, @@ -41,10 +44,6 @@ module.exports = function (app, options) { '7xl': '5rem' }, extend: { - fontFamily: { - plex: ['var(--font-plex-sans)', ...defaultTheme.fontFamily.sans], - sans: ['var(--font-inter)', ...defaultTheme.fontFamily.sans] - }, colors: { accent: { DEFAULT: alpha('--color-accent'), @@ -178,6 +177,12 @@ module.exports = function (app, options) { ] }; + if (app === 'landing') { + console.log('CONFIGURING TAILWIND for Landing'); + config.theme.fontFamily.sans = ['var(--font-inter)', ...defaultTheme.fontFamily.sans]; + config.theme.fontFamily.plex = ['var(--font-plex-sans)', ...defaultTheme.fontFamily.sans]; + } + return config; };