diff --git a/apps/site/.prettierrc.json b/apps/site/.prettierrc.json index d9ba6f178..347bc3775 100644 --- a/apps/site/.prettierrc.json +++ b/apps/site/.prettierrc.json @@ -1,6 +1,8 @@ { "singleQuote": true, "semi": false, + "tailwindStyleSheet": "./src/app/_styles/globals.css", + "tailwindFunctions": ["clsx"], "overrides": [ { "files": "*.md", diff --git a/apps/site/package.json b/apps/site/package.json index d9c1974af..63c6b3045 100644 --- a/apps/site/package.json +++ b/apps/site/package.json @@ -26,11 +26,11 @@ "@radix-ui/react-popover": "^1.1.4", "@sentry/nextjs": "^8.52.0", "@tailwindcss/forms": "^0.5.9", + "@tailwindcss/postcss": "^4.0.0", "@tailwindcss/typography": "^0.5.15", "@tanstack/react-table": "^8.20.6", "@vercel/speed-insights": "^1.1.0", "airtable": "^0.12.2", - "autoprefixer": "^10.4.20", "camelcase-keys": "^9.1.3", "clsx": "^2.1.1", "crypto-js": "^4.2.0", @@ -60,7 +60,7 @@ "schema-dts": "^1.1.2", "slugify": "^1.6.6", "swr": "^2.3.0", - "tailwindcss": "^3.4.17", + "tailwindcss": "^4.0.0", "usehooks-ts": "^3.1.0", "zod": "^3.24.1" }, @@ -90,8 +90,7 @@ "husky": "^9.1.7", "postcss": "^8.4.41", "prettier": "^3.4.2", - "prettier-plugin-tailwindcss": "^0.6.9", - "sass": "^1.83.0", + "prettier-plugin-tailwindcss": "^0.6.11", "turbo": "^2.3.3", "typescript": "^5.7.2", "yaml-loader": "^0.8.1" diff --git a/apps/site/postcss.config.js b/apps/site/postcss.config.js index 33ad091d2..52b9b4baf 100644 --- a/apps/site/postcss.config.js +++ b/apps/site/postcss.config.js @@ -1,6 +1,5 @@ module.exports = { plugins: { - tailwindcss: {}, - autoprefixer: {}, + '@tailwindcss/postcss': {}, }, } diff --git a/apps/site/src/app/_components/AlternatingImageCard.tsx b/apps/site/src/app/_components/AlternatingImageCard.tsx index f693b01cb..109f8bf25 100644 --- a/apps/site/src/app/_components/AlternatingImageCard.tsx +++ b/apps/site/src/app/_components/AlternatingImageCard.tsx @@ -33,13 +33,13 @@ export function AlternatingImageCard({ {image.alt} -
+
{children}
diff --git a/apps/site/src/app/_components/BreadCrumbsLayout.tsx b/apps/site/src/app/_components/BreadCrumbsLayout.tsx index 63eb781ae..2409c2a58 100644 --- a/apps/site/src/app/_components/BreadCrumbsLayout.tsx +++ b/apps/site/src/app/_components/BreadCrumbsLayout.tsx @@ -6,7 +6,7 @@ import type { LayoutProps } from '@/layout' export function BreadCrumbsLayout({ children }: LayoutProps) { return ( -
+
{children}
diff --git a/apps/site/src/app/_components/FocusAreaCard.tsx b/apps/site/src/app/_components/FocusAreaCard.tsx index c0abad294..98b97cd91 100644 --- a/apps/site/src/app/_components/FocusAreaCard.tsx +++ b/apps/site/src/app/_components/FocusAreaCard.tsx @@ -22,7 +22,7 @@ export function FocusAreaCard({ {image.alt} - +
diff --git a/apps/site/src/app/_components/Form/FormInput.tsx b/apps/site/src/app/_components/Form/FormInput.tsx index 5dd2c7ab5..c1349ebe8 100644 --- a/apps/site/src/app/_components/Form/FormInput.tsx +++ b/apps/site/src/app/_components/Form/FormInput.tsx @@ -30,7 +30,7 @@ export function FormInput({ {...rest} invalid={Boolean(error)} className={clsx( - 'block w-full rounded-lg border border-brand-300 bg-brand-800 px-3.5 py-3 focus:brand-outline placeholder:text-brand-300 hover:border-brand-400 placeholder:hover:text-brand-400 focus:text-brand-100 placeholder:focus:text-brand-100 data-[disabled]:cursor-not-allowed', + 'block w-full rounded-lg border border-brand-300 bg-brand-800 px-3.5 py-3 focus:brand-outline placeholder:text-brand-300 hover:border-brand-400 hover:placeholder:text-brand-400 focus:text-brand-100 focus:placeholder:text-brand-100 data-disabled:cursor-not-allowed', error && 'border-red-400', )} /> diff --git a/apps/site/src/app/_components/Form/FormTextarea/FormTextarea.tsx b/apps/site/src/app/_components/Form/FormTextarea/FormTextarea.tsx index 79b5deb87..f3da549cd 100644 --- a/apps/site/src/app/_components/Form/FormTextarea/FormTextarea.tsx +++ b/apps/site/src/app/_components/Form/FormTextarea/FormTextarea.tsx @@ -52,7 +52,7 @@ export function FormTextarea({ {...rest} invalid={Boolean(error)} className={clsx( - 'block min-h-44 w-full rounded-lg border border-brand-300 bg-brand-800 px-3.5 py-3 focus:brand-outline placeholder:text-brand-300 hover:border-brand-400 placeholder:hover:text-brand-400 focus:text-brand-100 placeholder:focus:text-brand-100 data-[disabled]:cursor-not-allowed', + 'block min-h-44 w-full rounded-lg border border-brand-300 bg-brand-800 px-3.5 py-3 focus:brand-outline placeholder:text-brand-300 hover:border-brand-400 hover:placeholder:text-brand-400 focus:text-brand-100 focus:placeholder:text-brand-100 data-disabled:cursor-not-allowed', error && 'border-red-400', )} /> diff --git a/apps/site/src/app/_components/KeyMemberCard.tsx b/apps/site/src/app/_components/KeyMemberCard.tsx index 9861a67a1..eb37ffb8d 100644 --- a/apps/site/src/app/_components/KeyMemberCard.tsx +++ b/apps/site/src/app/_components/KeyMemberCard.tsx @@ -62,10 +62,10 @@ function KeyMemberImage({ alt: `Photo of ${name}`, quality: 100, sizes: '150px', - className: 'rounded object-cover', + className: 'rounded-sm object-cover', } - const containerClass = 'aspect-[3/4] w-32 shrink-0' + const containerClass = 'aspect-3/4 w-32 shrink-0' const isStaticImage = typeof image === 'object' if (isStaticImage) { diff --git a/apps/site/src/app/_components/Listbox/ListboxOption.tsx b/apps/site/src/app/_components/Listbox/ListboxOption.tsx index 4fa4aeb2d..fd28708d8 100644 --- a/apps/site/src/app/_components/Listbox/ListboxOption.tsx +++ b/apps/site/src/app/_components/Listbox/ListboxOption.tsx @@ -26,7 +26,7 @@ export function ListboxOption({ as={as} value={option} disabled={option.disabled} - className="group flex cursor-default items-center justify-between gap-12 px-5 py-2 data-[disabled]:cursor-not-allowed ui-active:bg-brand-500" + className="group flex cursor-default items-center justify-between gap-12 px-5 py-2 data-disabled:cursor-not-allowed ui-active:bg-brand-500" > {option.name} @@ -35,7 +35,7 @@ export function ListboxOption({ )} - + diff --git a/apps/site/src/app/_components/MarkdownContent.tsx b/apps/site/src/app/_components/MarkdownContent.tsx index 30e7faced..d4420fec5 100644 --- a/apps/site/src/app/_components/MarkdownContent.tsx +++ b/apps/site/src/app/_components/MarkdownContent.tsx @@ -13,8 +13,6 @@ import { buildImageSizeProp } from '@/utils/buildImageSizeProp' import { SmartTextLink } from '@/components/TextLink/SmartTextLink' -import styles from '@/security/maturity-model/components/TableOfContents.module.scss' - type PluggableList = Parameters[0]['rehypePlugins'] export type MarkdownContentProps = { @@ -113,7 +111,7 @@ function addTableOfContentsHeader(nodeTree: HtmlElementNode) { const headerNode = { type: 'element', tagName: 'p', - properties: { className: styles.tableOfContentsHeader }, + properties: { className: 'toc-header' }, children: [{ type: 'text', value: 'Table of Contents' }], } diff --git a/apps/site/src/app/_components/Navigation/MobileNavigation/LinkItem.tsx b/apps/site/src/app/_components/Navigation/MobileNavigation/LinkItem.tsx index 51695def1..7e8458aee 100644 --- a/apps/site/src/app/_components/Navigation/MobileNavigation/LinkItem.tsx +++ b/apps/site/src/app/_components/Navigation/MobileNavigation/LinkItem.tsx @@ -10,7 +10,6 @@ import { isExternalLink } from '@/utils/linkUtils' import { BaseLink } from '@/components/BaseLink' import { Icon } from '@/components/Icon' -import styles from '@/components/TextLink/TextLink.module.scss' export type LinkItemProps = { label: string @@ -25,16 +24,12 @@ export function LinkItem({ label, href, nested, setOpen }: LinkItemProps) { nested && 'ml-6', isExternal && 'inline-flex items-center gap-1', ) - const linkStyles = clsx( - styles.base, - "relative before:absolute before:inset-0 before:-m-3.5 before:content-['']", - ) return (
  • setOpen(false)} > {label} diff --git a/apps/site/src/app/_components/Navigation/MobileNavigation/MobileNavigation.tsx b/apps/site/src/app/_components/Navigation/MobileNavigation/MobileNavigation.tsx index c23e98938..6a03af2e0 100644 --- a/apps/site/src/app/_components/Navigation/MobileNavigation/MobileNavigation.tsx +++ b/apps/site/src/app/_components/Navigation/MobileNavigation/MobileNavigation.tsx @@ -32,7 +32,7 @@ export function MobileNavigation() {
    setOpen(false)} diff --git a/apps/site/src/app/_components/Navigation/Navigation.tsx b/apps/site/src/app/_components/Navigation/Navigation.tsx index 806b8f53b..4a84fbbb2 100644 --- a/apps/site/src/app/_components/Navigation/Navigation.tsx +++ b/apps/site/src/app/_components/Navigation/Navigation.tsx @@ -11,7 +11,7 @@ export function Navigation() { return (