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) ? ( -
+
{/* TODO: remake empty screen for V3 */} -
+
{/* Icon card - Top */}
diff --git a/apps/web/app/(use-page-wrapper)/apps/routing-forms/[...pages]/IncompleteBooking.tsx b/apps/web/app/(use-page-wrapper)/apps/routing-forms/[...pages]/IncompleteBooking.tsx index 8af8bfc8ea..11c3f15e23 100644 --- a/apps/web/app/(use-page-wrapper)/apps/routing-forms/[...pages]/IncompleteBooking.tsx +++ b/apps/web/app/(use-page-wrapper)/apps/routing-forms/[...pages]/IncompleteBooking.tsx @@ -122,7 +122,7 @@ function Page({ form }: { form: RoutingFormWithResponseCount }) { />
{salesforceActionEnabled ? ( -
+
{form.team && ( <>
diff --git a/apps/web/app/(use-page-wrapper)/apps/routing-forms/[...pages]/RouteBuilder.tsx b/apps/web/app/(use-page-wrapper)/apps/routing-forms/[...pages]/RouteBuilder.tsx index d1cbfdc813..cbcee2e923 100644 --- a/apps/web/app/(use-page-wrapper)/apps/routing-forms/[...pages]/RouteBuilder.tsx +++ b/apps/web/app/(use-page-wrapper)/apps/routing-forms/[...pages]/RouteBuilder.tsx @@ -307,7 +307,7 @@ const WeightedAttributesSelector = ({ }} />
-
+
{attributeIdForWeights ? (
{formFieldsQueryBuilder}
{route.isFallback ? (
-
- {/*
+
+ {/*
{t("send_booker_to")}
*/} Send booker to
-
-
+
+
-
+
diff --git a/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/[[...pages]]/Forms.tsx b/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/[[...pages]]/Forms.tsx index 08f949f681..b08a18f8ae 100644 --- a/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/[[...pages]]/Forms.tsx +++ b/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/[[...pages]]/Forms.tsx @@ -160,7 +160,7 @@ export default function RoutingForms({ appUrl }: { appUrl: string }) { background="/tips/routing-forms" isParentLoading={} buttons={ -
+
{/* Action buttons */} -
+
{/* Desktop buttons - Set to Default, Delete, and Save */}
{/* Set to Default - desktop only */} @@ -99,14 +99,14 @@ export function AvailabilityScheduleSkeleton() { {/* Info icon */}
{/* Description */} -
+
{/* Add an override button */}
{/* Sidebar - only visible on desktop */} -
+
{/* Timezone */} diff --git a/apps/web/app/(use-page-wrapper)/availability/troubleshoot/layout.tsx b/apps/web/app/(use-page-wrapper)/availability/troubleshoot/layout.tsx index 84d2e2c794..f7231895f5 100644 --- a/apps/web/app/(use-page-wrapper)/availability/troubleshoot/layout.tsx +++ b/apps/web/app/(use-page-wrapper)/availability/troubleshoot/layout.tsx @@ -8,7 +8,7 @@ import { Icon } from "@calcom/ui/components/icon"; export default function TroubleshooterLayout({ children }: { children: React.ReactNode }) { return ( <> -
+
}>{children} diff --git a/apps/web/app/(use-page-wrapper)/event-types/[type]/skeleton.tsx b/apps/web/app/(use-page-wrapper)/event-types/[type]/skeleton.tsx index 2f95b6ac84..57e7f4304f 100644 --- a/apps/web/app/(use-page-wrapper)/event-types/[type]/skeleton.tsx +++ b/apps/web/app/(use-page-wrapper)/event-types/[type]/skeleton.tsx @@ -32,8 +32,8 @@ export const EventTypeEditPageSkeleton = () => { } afterHeading={backButtonSkeleton}>
-
-
+
+
{/* Tab navigation items */} {Array.from({ length: 8 }).map((_, index) => (
{
-
+
{/* Form fields */} -
+
-
+
@@ -73,12 +73,12 @@ export const EventTypeEditPageSkeleton = () => {
-
+
-
+
@@ -86,7 +86,7 @@ export const EventTypeEditPageSkeleton = () => {
-
+
diff --git a/apps/web/app/(use-page-wrapper)/insights/UpgradeTipWrapper.tsx b/apps/web/app/(use-page-wrapper)/insights/UpgradeTipWrapper.tsx index b592580992..dec69eb3c0 100644 --- a/apps/web/app/(use-page-wrapper)/insights/UpgradeTipWrapper.tsx +++ b/apps/web/app/(use-page-wrapper)/insights/UpgradeTipWrapper.tsx @@ -38,7 +38,7 @@ export default function UpgradeTipWrapper({ children }: { children: React.ReactN features={features} background="/tips/insights" buttons={ -
+
<> @@ -812,7 +812,7 @@ const MobileSettingsContainer = (props: { onSideContainerOpen?: () => void }) => return ( <> -