diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 74cae7dd16..cf089b9f19 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -4,7 +4,6 @@ "yzhang.markdown-all-in-one", // nicer markdown support "esbenp.prettier-vscode", // prettier plugin "dbaeumer.vscode-eslint", // eslint plugin - "bradlc.vscode-tailwindcss", // hinting / autocompletion for tailwind "ban.spellright", // Spell check for docs "stripe.vscode-stripe", // stripe VSCode extension "Prisma.prisma", // syntax|format|completion for prisma diff --git a/.vscode/settings.json b/.vscode/settings.json index 43ae1c6a83..f1a8fd8ccd 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,5 +8,5 @@ "typescript.preferences.importModuleSpecifier": "non-relative", "spellright.language": ["en"], "spellright.documentTypes": ["markdown", "typescript", "typescriptreact"], - "tailwindCSS.experimental.classRegex": [["cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"]] + "tailwindCSS.classFunctions": ["cva"] } diff --git a/apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDir.tsx b/apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDir.tsx index 80ec7dbca3..32cbe46cd5 100644 --- a/apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDir.tsx +++ b/apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDir.tsx @@ -46,7 +46,7 @@ export function ShellMainAppDir(props: LayoutProps) { props.backPath ? "relative" : "pwa:bottom-[max(7rem,_calc(5rem_+_env(safe-area-inset-bottom)))] fixed bottom-32 z-40 ltr:right-4 rtl:left-4 md:z-auto md:ltr:right-0 md:rtl:left-0", - "flex-shrink-0 [-webkit-app-region:no-drag] md:relative md:bottom-auto md:right-auto" + "shrink-0 [-webkit-app-region:no-drag] md:relative md:bottom-auto md:right-auto" )}> {props.CTA} diff --git a/apps/web/app/(use-page-wrapper)/apps/routing-forms/[...pages]/FormEdit.tsx b/apps/web/app/(use-page-wrapper)/apps/routing-forms/[...pages]/FormEdit.tsx index c193242b71..f273010764 100644 --- a/apps/web/app/(use-page-wrapper)/apps/routing-forms/[...pages]/FormEdit.tsx +++ b/apps/web/app/(use-page-wrapper)/apps/routing-forms/[...pages]/FormEdit.tsx @@ -97,7 +97,7 @@ function Field({ data-testid={`${hookFieldNamespace}.label`} disabled={!!router} label="Label" - className="flex-grow" + className="grow" placeholder={t("this_is_what_your_users_would_see")} defaultValue={label || routerField?.label || "Field"} required @@ -189,7 +189,7 @@ function Field({ /> {["select", "multiselect"].includes(fieldType) ? ( -