Remove deprecated nodes

.agents/checks/adr-compliance.md

@@ -33,15 +33,15 @@ Flag:
 - **New circular entity dependencies** — New circular imports between `LGraph` ↔ `Subgraph`, `LGraphNode` ↔ `LGraphCanvas`, or similar entity classes.
 - **Direct `graph._version++`** — Mutating the private version counter directly instead of through a public API. Extensions already depend on this side-channel; it must become a proper API.
 
-### Dedicated Stores and Data/Behavior Separation
+### Centralized Registries and ECS-Style Access
 
-Entity data lives in dedicated Pinia stores keyed by string IDs (`widgetValueStore`, `domWidgetStore`, `layoutStore`, `nodeOutputStore`, `subgraphNavigationStore`, `previewExposureStore`), not on entity instances.
+All entity data access should move toward centralized query patterns, not instance property access.
 
 Flag:
 
-- **New instance method/property patterns** — Adding `node.someProperty` or `node.someMethod()` for data that belongs in a dedicated store (e.g. widget values → `widgetValueStore` keyed by `WidgetId`).
+- **New instance method/property patterns** — Adding `node.someProperty` or `node.someMethod()` for data that should be a component in the World, queried via `world.getComponent(entityId, ComponentType)`.
 - **OOP inheritance for entity modeling** — Extending entity classes with new subclasses instead of composing behavior through components and systems.
-- **Duplicated authority** — Storing the same entity state in both a class property and a store, or across two stores, so ownership becomes ambiguous. Each piece of state should have one owning store.
+- **Scattered state** — New entity state stored in multiple locations (class properties, stores, local variables) instead of being consolidated in the World or in a single store.
 
 ### Extension Ecosystem Impact
 

.coderabbit.yaml

@@ -2,7 +2,6 @@ issue_enrichment:
   auto_enrich:
     enabled: true
 reviews:
-  profile: assertive
   high_level_summary: false
   request_changes_workflow: true
   auto_review:
@@ -16,11 +15,6 @@ reviews:
       - github-actions[bot]
   pre_merge_checks:
     override_requested_reviewers_only: true
-    # Explicitly disable the built-in docstring coverage check, which is
-    # enabled via organization-level settings. This repo opts out at the
-    # repo level without affecting other org repos.
-    docstrings:
-      mode: 'off'
     custom_checks:
       - name: End-to-end regression coverage for fixes
         mode: error

.github/actions/setup-frontend/action.yaml

@@ -29,5 +29,3 @@ runs:
       if: ${{ inputs.include_build_step == 'true' }}
       shell: bash
       run: pnpm build
-      env:
-        VITE_USE_LEGACY_DEFAULT_GRAPH: 'true'

.github/workflows/ci-dist-telemetry-scan.yaml

@@ -133,24 +133,3 @@ jobs:
             exit 1
           fi
           echo '✅ No Customer.io references found'
-
-      - name: Scan dist for Cloudflare Turnstile sitekey references
-        run: |
-          set -euo pipefail
-          echo '🔍 Scanning for Cloudflare Turnstile sitekeys...'
-          if rg --no-ignore -n \
-            -g '*.html' \
-            -g '*.js' \
-            -e '0x4AAAAAADnYZPVOpFCL_zeo' \
-            -e '0x4AAAAAADnYY4_Q0qxHZ5a7' \
-            -e '1x00000000000000000000AA' \
-            dist; then
-            echo '❌ ERROR: Cloudflare Turnstile sitekey found in dist assets!'
-            echo 'The per-env Turnstile sitekeys are cloud-only and must be tree-shaken from OSS builds.'
-            echo ''
-            echo 'To fix this:'
-            echo '1. Gate sitekey selection on the __DISTRIBUTION__ build define, not the runtime isCloud const'
-            echo '2. See getTurnstileSiteKey() in src/config/turnstile.ts'
-            exit 1
-          fi
-          echo '✅ No Turnstile sitekey references found'

.github/workflows/ci-tests-e2e-coverage.yaml

@@ -85,16 +85,6 @@ jobs:
             fi
           done
 
-      - name: Strip non-source entries from coverage
-        if: steps.coverage-shards.outputs.has-coverage == 'true'
-        run: |
-          lcov --remove coverage/playwright/coverage.lcov \
-            '*localhost-8188*' \
-            'assets/images/*' \
-            -o coverage/playwright/coverage.lcov \
-            --ignore-errors unused
-          wc -l coverage/playwright/coverage.lcov
-
       - name: Upload merged coverage data
         if: steps.coverage-shards.outputs.has-coverage == 'true'
         uses: actions/upload-artifact@v6
@@ -121,8 +111,7 @@ jobs:
             --title "ComfyUI E2E Coverage" \
             --no-function-coverage \
             --precision 1 \
-            --ignore-errors source,unmapped,range \
-            --synthesize-missing
+            --ignore-errors source,unmapped
 
       - name: Upload HTML report artifact
         if: steps.coverage-shards.outputs.has-coverage == 'true'

.github/workflows/ci-tests-e2e.yaml

@@ -47,8 +47,6 @@ jobs:
 
       - name: Build cloud frontend
         run: pnpm build:cloud
-        env:
-          VITE_USE_LEGACY_DEFAULT_GRAPH: 'true'
 
       - name: Upload cloud frontend
         uses: actions/upload-artifact@v6

.github/workflows/ci-tests-unit.yaml

@@ -55,6 +55,3 @@ jobs:
           flags: unit
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: false
-
-      - name: Enforce critical coverage gate
-        run: pnpm test:coverage:critical

.github/workflows/cla.yml

@@ -1,63 +0,0 @@
-name: CLA Assistant
-
-on:
-  issue_comment:
-    types: [created]
-  pull_request_target:
-    types: [opened, synchronize, closed]
-  merge_group:
-
-permissions:
-  actions: write
-  contents: read # 'read' is enough because signatures live in a REMOTE repo
-  pull-requests: write
-  statuses: write
-
-jobs:
-  cla-assistant:
-    runs-on: ubuntu-latest
-    steps:
-      - name: CLA Assistant
-        # Run on PR events, on "recheck" comment, or when someone posts the exact signing phrase.
-        # IMPORTANT: this phrase must match `custom-pr-sign-comment` below.
-        if: >
-          github.event_name == 'pull_request_target' ||
-          github.event.comment.body == 'recheck' ||
-          github.event.comment.body == 'I have read and agree to the Contributor License Agreement'
-        uses: contributor-assistant/github-action@ca4a40a7d1004f18d9960b404b97e5f30a505a08 # v2.6.1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # PAT required to write to the centralized signatures repo.
-          PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-        with:
-          # Where the CLA document lives (shown to contributors)
-          path-to-document: https://github.com/Comfy-Org/comfy-cla/blob/main/comfyui_icla.md
-
-          # Centralized signature storage
-          remote-organization-name: comfy-org
-          remote-repository-name: comfy-cla
-          path-to-signatures: signatures/cla.json
-          branch: main
-
-          # Allowlist bots so they don't need to sign (optional, comma-separated).
-          # *[bot] is a catch-all for any GitHub App bot account.
-          allowlist: action@github.com,actions-user,ampagent,claude,comfy-pr-bot,GitHub Action,github-actions,Glary Bot,Glary-Bot,*[bot]
-
-          # Custom PR comment messages
-          custom-notsigned-prcomment: |
-            🎉 Thank you for your contribution, we really appreciate it! 🎉
-
-            Like many open source projects, we require contributors to sign our [Contributor License Agreement (CLA)](https://github.com/Comfy-Org/comfy-cla/blob/main/comfyui_icla.md). A CLA makes the ownership of contributions explicit, so contributors and the project share a clear understanding of how the code can be used. By signing, you:
-
-            - Confirm that you own your contribution.
-            - Keep the right to reuse your own code.
-            - Grant us a copyright license to include and share it within our projects.
-
-            CLAs are standard practice across major open source projects including those under the Apache Software Foundation and the Linux Foundation. Ours is based on the Apache Software Foundation's CLA. Most importantly, it would enable us to relicense the project under a more permissive license in the future, giving the project and its community greater flexibility.
-
-            ✍ **To sign, please post a new comment on this PR with exactly the following text:** ✍
-
-          custom-pr-sign-comment: I have read and agree to the Contributor License Agreement
-
-          custom-allsigned-prcomment: |
-            ✅ All contributors have signed the CLA. Thank you! This PR is ready to be merged.

.github/workflows/pr-backport.yaml

@@ -67,11 +67,6 @@ jobs:
         uses: actions/checkout@v6
         with:
           fetch-depth: 0
-          # Persist a token with `workflow` scope so the backport push can
-          # include changes to .github/workflows/**. The default GITHUB_TOKEN
-          # is refused by GitHub when a push creates/updates workflow files,
-          # which silently aborted the whole job (see PR #12804 backport).
-          token: ${{ secrets.PR_GH_TOKEN }}
 
       - name: Configure git
         run: |

.github/workflows/publish-desktop-bridge-types.yaml

@@ -1,142 +0,0 @@
-name: Publish Desktop Bridge Types
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Version to publish (e.g., 0.1.2)'
-        required: true
-        type: string
-      dist_tag:
-        description: 'npm dist-tag to use'
-        required: true
-        default: latest
-        type: string
-      ref:
-        description: 'Git ref to checkout (commit SHA, tag, or branch)'
-        required: false
-        type: string
-  workflow_call:
-    inputs:
-      version:
-        required: true
-        type: string
-      dist_tag:
-        required: false
-        type: string
-        default: latest
-      ref:
-        required: false
-        type: string
-    secrets:
-      NPM_TOKEN:
-        required: true
-
-concurrency:
-  group: publish-desktop-bridge-types-${{ github.workflow }}-${{ inputs.version }}-${{ inputs.dist_tag }}
-  cancel-in-progress: false
-
-jobs:
-  publish_desktop_bridge_types:
-    name: Publish @comfyorg/comfyui-desktop-bridge-types
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    steps:
-      - name: Validate inputs
-        env:
-          VERSION: ${{ inputs.version }}
-        shell: bash
-        run: |
-          set -euo pipefail
-          SEMVER_REGEX='^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-((0|[1-9][0-9]*|[0-9]*[A-Za-z-][0-9A-Za-z-]*)(\.(0|[1-9][0-9]*|[0-9]*[A-Za-z-][0-9A-Za-z-]*))*))?(\+([0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*))?$'
-          if [[ ! "$VERSION" =~ $SEMVER_REGEX ]]; then
-            echo "::error title=Invalid version::Version '$VERSION' must follow semantic versioning (x.y.z[-suffix][+build])" >&2
-            exit 1
-          fi
-
-      - name: Determine ref to checkout
-        id: resolve_ref
-        env:
-          REF: ${{ inputs.ref }}
-          DEFAULT_REF: ${{ github.ref_name }}
-        shell: bash
-        run: |
-          set -euo pipefail
-          if [ -z "$REF" ]; then
-            REF="$DEFAULT_REF"
-          fi
-          if ! git check-ref-format --allow-onelevel "$REF"; then
-            echo "::error title=Invalid ref::Ref '$REF' fails git check-ref-format validation." >&2
-            exit 1
-          fi
-          echo "ref=$REF" >> "$GITHUB_OUTPUT"
-
-      - name: Checkout repository
-        uses: actions/checkout@v6
-        with:
-          ref: ${{ steps.resolve_ref.outputs.ref }}
-          fetch-depth: 1
-          persist-credentials: false
-
-      - name: Install pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4.4.0
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'pnpm'
-          registry-url: https://registry.npmjs.org
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile --ignore-scripts
-        env:
-          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: '1'
-
-      - name: Verify package
-        id: pkg
-        env:
-          INPUT_VERSION: ${{ inputs.version }}
-        shell: bash
-        run: |
-          set -euo pipefail
-          PACKAGE_JSON=packages/comfyui-desktop-bridge-types/package.json
-          NAME=$(node -p "require('./${PACKAGE_JSON}').name")
-          VERSION=$(node -p "require('./${PACKAGE_JSON}').version")
-          if [ "$VERSION" != "$INPUT_VERSION" ]; then
-            echo "::error title=Version mismatch::${PACKAGE_JSON} version $VERSION does not match input $INPUT_VERSION" >&2
-            exit 1
-          fi
-          echo "name=$NAME" >> "$GITHUB_OUTPUT"
-          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
-
-      - name: Check if version already on npm
-        id: check_npm
-        env:
-          NAME: ${{ steps.pkg.outputs.name }}
-          VER: ${{ steps.pkg.outputs.version }}
-        shell: bash
-        run: |
-          set -euo pipefail
-          STATUS=0
-          OUTPUT=$(npm view "${NAME}@${VER}" --json 2>&1) || STATUS=$?
-          if [ "$STATUS" -eq 0 ]; then
-            echo "exists=true" >> "$GITHUB_OUTPUT"
-            echo "::warning title=Already published::${NAME}@${VER} already exists on npm. Skipping publish."
-          else
-            if echo "$OUTPUT" | grep -q "E404"; then
-              echo "exists=false" >> "$GITHUB_OUTPUT"
-            else
-              echo "::error title=Registry lookup failed::$OUTPUT" >&2
-              exit "$STATUS"
-            fi
-          fi
-
-      - name: Publish package
-        if: steps.check_npm.outputs.exists == 'false'
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-          DIST_TAG: ${{ inputs.dist_tag }}
-        run: pnpm publish --access public --tag "$DIST_TAG" --no-git-checks --ignore-scripts
-        working-directory: packages/comfyui-desktop-bridge-types

.github/workflows/release-draft-create.yaml

@@ -92,7 +92,9 @@ jobs:
           make_latest: >-
             ${{ github.event.pull_request.base.ref == 'main' &&
                 needs.build.outputs.is_prerelease == 'false' }}
-          draft: ${{ needs.build.outputs.is_prerelease == 'true' }}
+          draft: >-
+            ${{ github.event.pull_request.base.ref != 'main' ||
+                needs.build.outputs.is_prerelease == 'true' }}
           prerelease: >-
             ${{ needs.build.outputs.is_prerelease == 'true' }}
           generate_release_notes: true

.i18nrc.cjs

@@ -21,8 +21,7 @@ module.exports = defineConfig({
     'ar',
     'tr',
     'pt-BR',
-    'fa',
-    'he'
+    'fa'
   ],
   reference: `Special names to keep untranslated: flux, photomaker, clip, vae, cfg, stable audio, stable cascade, stable zero, controlnet, lora, HiDream, Civitai, Hugging Face.
   'latent' is the short form of 'latent space'.
@@ -38,11 +37,5 @@ module.exports = defineConfig({
   - Keep commonly used technical terms in English when they are standard in Persian software (e.g., node, workflow).
   - Use Arabic-Indic numerals (۰-۹) for numbers where appropriate.
   - Maintain consistency with terminology used in Persian software and design applications.
-
-  IMPORTANT Hebrew Translation Guidelines:
-  - For 'he' locale: Use modern, formal Hebrew (עברית תקנית) for a professional tone throughout the UI.
-  - Hebrew is a right-to-left (RTL) language. Keep all interpolation placeholders ({name}, {count}), pipe-separated plural forms, and English technical terms intact and in their original positions.
-  - Preferred glossary: node = צומת (plural צמתים), workflow = תהליך עבודה, queue = תור, canvas = קנבס, widget = פקד, subgraph = תת-גרף, prompt = פרומפט/הנחיה (per context), bypass = עקיפה, mute = השתקה.
-  - Keep widely-recognized technical terms in English (Latin script): API, GPU, CUDA, VAE, CLIP, LoRA, ControlNet, Civitai, Hugging Face, Nodes 2.0, etc.
   `
 })

.oxfmtrc.json

@@ -9,7 +9,6 @@
     "packages/registry-types/src/comfyRegistryTypes.ts",
     "public/materialdesignicons.min.css",
     "src/types/generatedManagerTypes.ts",
-    "**/__fixtures__/**/*.json",
-    "apps/website/src/content/**/*.mdx"
+    "**/__fixtures__/**/*.json"
   ]
 }

.storybook/main.ts

@@ -78,21 +78,6 @@ const config: StorybookConfig = {
             find: '@/composables/queue/useJobActions',
             replacement: process.cwd() + '/src/storybook/mocks/useJobActions.ts'
           },
-          {
-            find: '@/composables/billing/useBillingContext',
-            replacement:
-              process.cwd() + '/src/storybook/mocks/useBillingContext.ts'
-          },
-          {
-            find: '@/composables/useFeatureFlags',
-            replacement:
-              process.cwd() + '/src/storybook/mocks/useFeatureFlags.ts'
-          },
-          {
-            find: '@/platform/workspace/stores/teamWorkspaceStore',
-            replacement:
-              process.cwd() + '/src/storybook/mocks/teamWorkspaceStore.ts'
-          },
           {
             find: '@/utils/formatUtil',
             replacement:

.storybook/preview.ts

@@ -5,6 +5,7 @@ import type { Preview, StoryContext, StoryFn } from '@storybook/vue3-vite'
 import { createPinia } from 'pinia'
 import 'primeicons/primeicons.css'
 import PrimeVue from 'primevue/config'
+import ConfirmationService from 'primevue/confirmationservice'
 import ToastService from 'primevue/toastservice'
 import Tooltip from 'primevue/tooltip'
 
@@ -41,6 +42,7 @@ setup((app) => {
       }
     }
   })
+  app.use(ConfirmationService)
   app.use(ToastService)
 })
 

AGENTS.md

@@ -179,9 +179,6 @@ This project uses **pnpm**. Always prefer scripts defined in `package.json` (e.g
 23. Favor pure functions (especially testable ones)
 24. Do not use function expressions if it's possible to use function declarations instead
 25. Watch out for [Code Smells](https://wiki.c2.com/?CodeSmell) and refactor to avoid them
-26. Do not add alias helpers whose implementation is just a single-line call to another function
-    - Bad: `function id(value) { return nodeId(value) }`
-    - Use the real function directly, or introduce a named helper only when it adds validation, branching, domain meaning, or shared behavior beyond renaming
 
 ## Design Standards
 
@@ -249,7 +246,7 @@ All architectural decisions are documented in `docs/adr/`. Code changes must be
 ### Entity Architecture Constraints (ADR 0003 + ADR 0008)
 
 1. **Command pattern for all mutations**: Every entity state change must be a serializable, idempotent, deterministic command — replayable, undoable, and transmittable over CRDT. No imperative fire-and-forget mutation APIs. Systems produce command batches, not direct side effects.
-2. **Dedicated stores over instance state**: Entity data lives in dedicated Pinia stores keyed by string IDs — widget values in `widgetValueStore` keyed by `WidgetId` (`graphId:nodeId:name`, see `src/types/widgetId.ts`), plus `domWidgetStore`, `layoutStore`, `nodeOutputStore`, `subgraphNavigationStore`, and `previewExposureStore`. Prefer a focused store to a single unified registry. Do not add new instance properties/methods to entity classes for data that belongs in a store. Do not use OOP inheritance for entity modeling.
+2. **Centralized registries and ECS-style access**: Entity data lives in the World (centralized registry), queried via `world.getComponent(entityId, ComponentType)`. Do not add new instance properties/methods to entity classes. Do not use OOP inheritance for entity modeling.
 3. **No god-object growth**: Do not add methods to `LGraphNode`, `LGraphCanvas`, `LGraph`, or `Subgraph`. Extract to systems, stores, or composables.
 4. **Plain data components**: ECS components are plain data objects — no methods, no back-references to parent entities. Behavior belongs in systems (pure functions).
 5. **Extension ecosystem impact**: Changes to entity callbacks (`onConnectionsChange`, `onRemoved`, `onAdded`, `onConnectInput/Output`, `onConfigure`, `onWidgetChanged`), `node.widgets` access, `node.serialize`, or `graph._version++` affect 40+ custom node repos and require migration guidance.

apps/website/astro.config.ts

@@ -1,5 +1,4 @@
 import { defineConfig } from 'astro/config'
-import mdx from '@astrojs/mdx'
 import sitemap from '@astrojs/sitemap'
 import vue from '@astrojs/vue'
 import tailwindcss from '@tailwindcss/vite'
@@ -25,9 +24,6 @@ export default defineConfig({
   site: 'https://comfy.org',
   output: 'static',
   prefetch: { prefetchAll: true },
-  // Keep MDX punctuation verbatim; SmartyPants would turn the source's straight
-  // quotes into curly ones and drift from the rest of the site's copy.
-  markdown: { smartypants: false },
   redirects: {
     '/cloud/enterprise-case-studies/comfyui-at-architectural-scale-how-moment-factory-reimagined-3d-projection-mapping':
       '/customers/moment-factory/',
@@ -41,7 +37,6 @@ export default defineConfig({
   devToolbar: { enabled: !process.env.NO_TOOLBAR },
   integrations: [
     vue(),
-    mdx(),
     sitemap({
       filter: (page) => !isExcludedFromSitemap(page)
     })

apps/website/components.json

@@ -1,24 +0,0 @@
-{
-  "$schema": "https://shadcn-vue.com/schema.json",
-  "style": "new-york",
-  "font": "inter",
-  "typescript": true,
-  "tailwind": {
-    "config": "",
-    "css": "src/styles/global.css",
-    "baseColor": "neutral",
-    "cssVariables": true,
-    "prefix": ""
-  },
-  "iconLibrary": "lucide",
-  "rtl": false,
-  "pointer": true,
-  "aliases": {
-    "components": "@/components",
-    "utils": "@/lib/utils",
-    "ui": "@/components/ui",
-    "lib": "@/lib",
-    "composables": "@/composables"
-  },
-  "registries": {}
-}

apps/website/e2e/customers-detail.spec.ts

@@ -1,73 +0,0 @@
-import { expect } from '@playwright/test'
-
-import { test } from './fixtures/blockExternalMedia'
-
-test.describe('Customer story detail @smoke', () => {
-  test('renders the migrated article: hero, section nav, and body', async ({
-    page
-  }) => {
-    await page.goto('/customers/series-entertainment')
-
-    await expect(
-      page.getByRole('heading', {
-        level: 1,
-        name: /Series Entertainment Rebuilt Game and Video Production/i
-      })
-    ).toBeVisible()
-
-    const nav = page.getByRole('navigation', { name: 'Category filter' })
-    await expect(nav.getByRole('button', { name: 'INTRO' })).toBeVisible()
-    await expect(nav.getByRole('button', { name: 'CONCLUSION' })).toBeVisible()
-
-    // Section title rendered from the MDX <Section title> wrapper.
-    await expect(
-      page.getByRole('heading', {
-        name: 'The Output Series Achieved Using ComfyUI'
-      })
-    ).toBeVisible()
-  })
-
-  test('section nav highlights the section the reader selects', async ({
-    page
-  }) => {
-    await page.goto('/customers/series-entertainment')
-    const nav = page.getByRole('navigation', { name: 'Category filter' })
-    const intro = nav.getByRole('button', { name: 'INTRO' })
-    const problem = nav.getByRole('button', { name: 'THE PROBLEM' })
-
-    await expect(intro).toHaveAttribute('aria-pressed', 'true')
-
-    await problem.click()
-    await expect(problem).toHaveAttribute('aria-pressed', 'true')
-  })
-
-  test('shows the read-more link only when an external source exists', async ({
-    page
-  }) => {
-    await page.goto('/customers/open-story-movement')
-    await expect(
-      page.getByRole('link', { name: /read more on this topic/i })
-    ).toBeVisible()
-
-    // series-entertainment only redirected back to itself, so the link is gone.
-    await page.goto('/customers/series-entertainment')
-    await expect(
-      page.getByRole('link', { name: /read more on this topic/i })
-    ).toHaveCount(0)
-  })
-
-  test('links to the next story in the what-is-next section', async ({
-    page
-  }) => {
-    await page.goto('/customers/series-entertainment')
-    const nextLink = page.getByRole('link', { name: /view article/i })
-    await expect(nextLink).toBeVisible()
-    // Links to another customer story, without coupling the test to the
-    // specific slug or sort order.
-    await expect(nextLink).toHaveAttribute('href', /^\/customers\/[a-z0-9-]+$/)
-    await expect(nextLink).not.toHaveAttribute(
-      'href',
-      '/customers/series-entertainment'
-    )
-  })
-})

apps/website/e2e/download.spec.ts

@@ -47,11 +47,6 @@ test.describe('Download page @smoke', () => {
     const downloadBtn = hero.getByRole('link', { name: /DOWNLOAD DESKTOP/i })
     await expect(downloadBtn).toBeVisible()
     await expect(downloadBtn).toHaveAttribute('target', '_blank')
-    await expect(downloadBtn).toHaveAttribute(
-      'href',
-      'https://comfy.org/download/windows/nsis/x64'
-    )
-    await expect(downloadBtn).toHaveAttribute('data-astro-prefetch', 'false')
 
     const githubBtn = hero.getByRole('link', { name: /INSTALL FROM GITHUB/i })
     await expect(githubBtn).toBeVisible()
@@ -78,7 +73,7 @@ test.describe('Download page @smoke', () => {
     })
 
     const windowsBtn = hero.locator(
-      'a[href="https://comfy.org/download/windows/nsis/x64"]'
+      'a[href="https://download.comfy.org/windows/nsis/x64"]'
     )
     await expect(windowsBtn).toBeVisible()
     await expect(windowsBtn).toHaveText(/DOWNLOAD DESKTOP/i)

apps/website/e2e/launches.spec.ts

@@ -1,231 +0,0 @@
-import type { Page } from '@playwright/test'
-import { expect } from '@playwright/test'
-
-import { externalLinks } from '../src/config/routes'
-import { drops } from '../src/data/drops'
-import type { Locale } from '../src/i18n/translations'
-import { t } from '../src/i18n/translations'
-import { test } from './fixtures/blockExternalMedia'
-
-const PATH_EN = '/launches'
-const PATH_ZH = '/zh-CN/launches'
-const CLOUD_URL = 'https://cloud.comfy.org'
-
-const LOCALES: ReadonlyArray<readonly [string, Locale]> = [
-  [PATH_EN, 'en'],
-  [PATH_ZH, 'zh-CN']
-]
-
-function heroSection(page: Page, locale: Locale) {
-  return page.locator('section').filter({
-    has: page.getByRole('heading', {
-      level: 1,
-      name: t('launches.hero.title', locale)
-    })
-  })
-}
-
-function ctaSection(page: Page, locale: Locale) {
-  return page.locator('section').filter({
-    has: page.getByRole('heading', {
-      level: 2,
-      name: t('launches.cta.heading', locale)
-    })
-  })
-}
-
-function dropsSection(page: Page, locale: Locale) {
-  return page.locator('section').filter({
-    has: page.getByRole('heading', {
-      level: 2,
-      name: t('launches.section.title', locale)
-    })
-  })
-}
-
-test.describe('Launches landing — desktop @smoke', () => {
-  test('renders the configured title at /launches', async ({ page }) => {
-    await page.goto(PATH_EN)
-    await expect(page).toHaveTitle(t('launches.page.title', 'en'))
-  })
-
-  test('renders the localized title at /zh-CN/launches', async ({ page }) => {
-    await page.goto(PATH_ZH)
-    await expect(page).toHaveTitle(t('launches.page.title', 'zh-CN'))
-  })
-
-  test('is indexable at both locales', async ({ page }) => {
-    await page.goto(PATH_EN)
-    await expect(page.locator('meta[name="robots"]')).toHaveCount(0)
-
-    await page.goto(PATH_ZH)
-    await expect(page.locator('meta[name="robots"]')).toHaveCount(0)
-  })
-
-  test('hero h1 renders the localized title in both locales', async ({
-    page
-  }) => {
-    await page.goto(PATH_EN)
-    await expect(
-      page.getByRole('heading', {
-        level: 1,
-        name: t('launches.hero.title', 'en')
-      })
-    ).toBeVisible()
-
-    await page.goto(PATH_ZH)
-    await expect(
-      page.getByRole('heading', {
-        level: 1,
-        name: t('launches.hero.title', 'zh-CN')
-      })
-    ).toBeVisible()
-  })
-
-  test('hero primary CTA links to /download per locale', async ({ page }) => {
-    for (const [path, locale, expectedHref] of [
-      [PATH_EN, 'en', '/download'],
-      [PATH_ZH, 'zh-CN', '/zh-CN/download']
-    ] as const) {
-      await page.goto(path)
-      const primary = heroSection(page, locale).getByRole('link', {
-        name: t('launches.hero.primary', locale)
-      })
-      await expect(primary).toBeVisible()
-      await expect(primary).toHaveAttribute('href', expectedHref)
-    }
-  })
-
-  test('hero secondary CTA opens external Cloud in a new tab on both locales', async ({
-    page
-  }) => {
-    for (const [path, locale] of LOCALES) {
-      await page.goto(path)
-      const secondary = heroSection(page, locale).getByRole('link', {
-        name: t('launches.hero.secondary', locale)
-      })
-      await expect(secondary).toBeVisible()
-      await expect(secondary).toHaveAttribute('href', CLOUD_URL)
-      await expect(secondary).toHaveAttribute('target', '_blank')
-      await expect(secondary).toHaveAttribute('rel', 'noopener noreferrer')
-    }
-  })
-
-  test('closing CTA shows heading and both action buttons in both locales', async ({
-    page
-  }) => {
-    for (const [path, locale] of LOCALES) {
-      await page.goto(path)
-      const section = ctaSection(page, locale)
-      await expect(
-        section.getByRole('heading', {
-          level: 2,
-          name: t('launches.cta.heading', locale)
-        })
-      ).toBeVisible()
-
-      const primary = section.getByRole('link', {
-        name: t('launches.cta.primary', locale)
-      })
-      await expect(primary).toBeVisible()
-      await expect(primary).toHaveAttribute('href', externalLinks.cloud)
-      await expect(primary).toHaveAttribute('target', '_blank')
-      await expect(primary).toHaveAttribute('rel', 'noopener noreferrer')
-
-      const secondary = section.getByRole('link', {
-        name: t('launches.cta.secondary', locale)
-      })
-      await expect(secondary).toBeVisible()
-      await expect(secondary).toHaveAttribute('href', externalLinks.workflows)
-      await expect(secondary).toHaveAttribute('target', '_blank')
-      await expect(secondary).toHaveAttribute('rel', 'noopener noreferrer')
-    }
-  })
-
-  test('drops section renders one card per data entry with the correct localized href in both locales', async ({
-    page
-  }) => {
-    for (const [path, locale] of LOCALES) {
-      await page.goto(path)
-      const section = dropsSection(page, locale)
-
-      await expect(
-        section.getByRole('heading', {
-          level: 2,
-          name: t('launches.section.title', locale)
-        })
-      ).toBeVisible()
-
-      const cards = section.locator('[data-slot="card"]')
-      await expect(cards).toHaveCount(drops.length)
-
-      for (const [i, drop] of drops.entries()) {
-        const card = cards.nth(i)
-        await expect(card).toContainText(drop.title[locale])
-        const explore = card.getByRole('link', {
-          name: drop.cta.label[locale]
-        })
-        await expect(explore).toBeVisible()
-        await expect(explore).toHaveAttribute('href', drop.cta.href[locale])
-      }
-    }
-  })
-
-  test('desktop: first 4 drop cards are wider than cards 5+', async ({
-    page
-  }) => {
-    await page.goto(PATH_EN)
-    const cards = dropsSection(page, 'en').locator('[data-slot="card"]')
-    await expect(cards).toHaveCount(drops.length)
-
-    await expect
-      .poll(async () => {
-        const firstWidth = (await cards.nth(0).boundingBox())?.width ?? 0
-        const fifthWidth = (await cards.nth(4).boundingBox())?.width ?? 0
-        return firstWidth - fifthWidth
-      })
-      .toBeGreaterThan(0)
-  })
-})
-
-test.describe('Launches landing — mobile @mobile', () => {
-  test('drops grid stacks in a single column at mobile width', async ({
-    page
-  }) => {
-    await page.goto(PATH_EN)
-    const cards = dropsSection(page, 'en').locator('[data-slot="card"]')
-    await expect(cards).toHaveCount(drops.length)
-
-    const viewport = page.viewportSize()
-    expect(viewport, 'viewport size').not.toBeNull()
-
-    await expect
-      .poll(async () => (await cards.nth(0).boundingBox())?.width ?? 0)
-      .toBeGreaterThanOrEqual(viewport!.width * 0.7)
-
-    await expect
-      .poll(async () => {
-        const firstBox = await cards.nth(0).boundingBox()
-        const secondBox = await cards.nth(1).boundingBox()
-        if (!firstBox || !secondBox) return false
-        return secondBox.y >= firstBox.y + firstBox.height
-      })
-      .toBe(true)
-  })
-
-  test('closing CTA heading stays within viewport width', async ({ page }) => {
-    await page.goto(PATH_EN)
-    const heading = page.getByRole('heading', {
-      level: 2,
-      name: t('launches.cta.heading', 'en')
-    })
-    await heading.scrollIntoViewIfNeeded()
-    await expect(heading).toBeVisible()
-
-    const box = await heading.boundingBox()
-    expect(box, 'CTA heading bounding box').not.toBeNull()
-    const viewport = page.viewportSize()
-    expect(viewport, 'viewport size').not.toBeNull()
-    expect(box!.x + box!.width).toBeLessThanOrEqual(viewport!.width + 1)
-  })
-})

apps/website/e2e/navigation.spec.ts

@@ -2,13 +2,6 @@ import { expect } from '@playwright/test'
 
 import { test } from './fixtures/blockExternalMedia'
 
-const TOP_LEVEL_LABELS = [
-  'Products',
-  'Pricing',
-  'Community',
-  'Company'
-] as const
-
 test.describe('Desktop navigation @smoke', () => {
   test.beforeEach(async ({ page }) => {
     await page.goto('/')
@@ -24,10 +17,14 @@ test.describe('Desktop navigation @smoke', () => {
     const nav = page.getByRole('navigation', { name: 'Main navigation' })
     const desktopLinks = nav.getByTestId('desktop-nav-links')
 
-    for (const label of TOP_LEVEL_LABELS) {
-      await expect(
-        desktopLinks.getByText(label, { exact: true }).first()
-      ).toBeVisible()
+    for (const label of [
+      'PRODUCTS',
+      'PRICING',
+      'COMMUNITY',
+      'RESOURCES',
+      'COMPANY'
+    ]) {
+      await expect(desktopLinks.getByText(label).first()).toBeVisible()
     }
   })
 
@@ -52,11 +49,11 @@ test.describe('Desktop dropdown @interaction', () => {
     const nav = page.getByRole('navigation', { name: 'Main navigation' })
     const desktopLinks = nav.getByTestId('desktop-nav-links')
     const productsButton = desktopLinks.getByRole('button', {
-      name: 'Products'
+      name: /PRODUCTS/i
     })
     await productsButton.hover()
 
-    const dropdown = nav.getByTestId('nav-dropdown')
+    const dropdown = productsButton.locator('..').getByTestId('nav-dropdown')
     for (const item of [
       'Comfy Desktop',
       'Comfy Cloud',
@@ -70,20 +67,19 @@ test.describe('Desktop dropdown @interaction', () => {
   test('moving mouse away closes dropdown', async ({ page }) => {
     const nav = page.getByRole('navigation', { name: 'Main navigation' })
     const desktopLinks = nav.getByTestId('desktop-nav-links')
-    await desktopLinks.getByRole('button', { name: 'Products' }).hover()
+    await desktopLinks.getByRole('button', { name: /PRODUCTS/i }).hover()
 
     const comfyLocal = nav.getByRole('link', { name: 'Comfy Desktop' }).first()
     await expect(comfyLocal).toBeVisible()
 
-    const viewport = page.viewportSize()
-    await page.mouse.move(10, (viewport?.height ?? 800) - 10)
+    await page.locator('main').hover()
     await expect(comfyLocal).toBeHidden()
   })
 
   test('Escape key closes dropdown', async ({ page }) => {
     const nav = page.getByRole('navigation', { name: 'Main navigation' })
     const desktopLinks = nav.getByTestId('desktop-nav-links')
-    await desktopLinks.getByRole('button', { name: 'Products' }).hover()
+    await desktopLinks.getByRole('button', { name: /PRODUCTS/i }).hover()
 
     const comfyLocal = nav.getByRole('link', { name: 'Comfy Desktop' }).first()
     await expect(comfyLocal).toBeVisible()
@@ -109,11 +105,11 @@ test.describe('Mobile menu @mobile', () => {
   }) => {
     await page.getByRole('button', { name: 'Toggle menu' }).click()
 
-    const menu = page.getByRole('dialog')
+    const menu = page.locator('#site-mobile-menu')
     await expect(menu).toBeVisible()
 
-    for (const label of ['Products', 'Pricing', 'Community']) {
-      await expect(menu.getByText(label, { exact: true }).first()).toBeVisible()
+    for (const label of ['PRODUCTS', 'PRICING', 'COMMUNITY']) {
+      await expect(menu.getByText(label).first()).toBeVisible()
     }
   })
 
@@ -122,14 +118,24 @@ test.describe('Mobile menu @mobile', () => {
   }) => {
     await page.getByRole('button', { name: 'Toggle menu' }).click()
 
-    const menu = page.getByRole('dialog')
-    await menu.getByRole('button', { name: 'Products' }).click()
+    const menu = page.locator('#site-mobile-menu')
+    await menu.getByText('PRODUCTS').first().click()
 
     await expect(menu.getByText('Comfy Desktop')).toBeVisible()
     await expect(menu.getByText('Comfy Cloud')).toBeVisible()
 
     await menu.getByRole('button', { name: /BACK/i }).click()
-    await expect(menu.getByRole('button', { name: 'Products' })).toBeVisible()
+    await expect(menu.getByText('PRODUCTS').first()).toBeVisible()
+  })
+
+  test('CTA buttons visible in mobile menu', async ({ page }) => {
+    await page.getByRole('button', { name: 'Toggle menu' }).click()
+
+    const menu = page.locator('#site-mobile-menu')
+    await expect(
+      menu.getByRole('link', { name: 'DOWNLOAD DESKTOP' })
+    ).toBeVisible()
+    await expect(menu.getByRole('link', { name: 'LAUNCH CLOUD' })).toBeVisible()
   })
 })
 

apps/website/package.json

@@ -25,31 +25,25 @@
     "@comfyorg/object-info-parser": "workspace:*",
     "@comfyorg/shared-frontend-utils": "workspace:*",
     "@comfyorg/tailwind-utils": "workspace:*",
-    "@lucide/vue": "catalog:",
     "@vercel/analytics": "catalog:",
     "@vueuse/core": "catalog:",
-    "class-variance-authority": "catalog:",
     "cva": "catalog:",
     "gsap": "catalog:",
     "lenis": "catalog:",
     "posthog-js": "catalog:",
-    "reka-ui": "catalog:",
     "three": "catalog:",
     "vue": "catalog:",
     "zod": "catalog:"
   },
   "devDependencies": {
     "@astrojs/check": "catalog:",
-    "@astrojs/mdx": "catalog:",
     "@astrojs/vue": "catalog:",
     "@playwright/test": "catalog:",
     "@tailwindcss/vite": "catalog:",
     "astro": "catalog:",
     "tailwindcss": "catalog:",
     "tsx": "catalog:",
-    "tw-animate-css": "catalog:",
     "typescript": "catalog:",
-    "vitest": "catalog:",
-    "vue-component-type-helpers": "catalog:"
+    "vitest": "catalog:"
   }
 }

apps/website/public/favicon-dark.svg

@@ -0,0 +1,4 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="48" height="48" rx="12" fill="#F0EFED"/>
+<path d="M31.0126 30.4797C31.0576 30.3275 31.0822 30.1671 31.0822 29.9985C31.0822 29.0649 30.3294 28.3081 29.4006 28.3081H21.8643C21.4593 28.3122 21.1279 27.9832 21.1279 27.576C21.1279 27.5019 21.1401 27.432 21.1565 27.3662L23.1858 20.259C23.2717 19.9465 23.5581 19.7161 23.8936 19.7161L31.4586 19.7079C33.0542 19.7079 34.4003 18.6262 34.8053 17.1497L35.9427 13.1889C35.9795 13.0491 36 12.8969 36 12.7447C36 11.8152 35.2513 11.0625 34.3266 11.0625H25.1742C23.5868 11.0625 22.2448 12.136 21.8316 13.5961L21.0624 16.2983C20.9724 16.6068 20.6901 16.833 20.3546 16.833H18.1575C16.5823 16.833 15.2526 17.8859 14.8271 19.3295L12.0614 29.0402C12.0205 29.1841 12 29.3404 12 29.4967C12 30.4304 12.7528 31.1871 13.6816 31.1871H15.8418C16.2468 31.1871 16.5782 31.5162 16.5782 31.9275C16.5782 31.9974 16.5701 32.0673 16.5496 32.1331L15.7845 34.8107C15.7477 34.9546 15.7232 35.1027 15.7232 35.2549C15.7232 36.1844 16.4719 36.937 17.3965 36.937L26.553 36.9288C28.1446 36.9288 29.4865 35.8512 29.8957 34.3829L31.0085 30.4838L31.0126 30.4797Z" fill="#211927"/>
+</svg>

apps/website/public/favicon-light.svg

@@ -0,0 +1,11 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_3062_2148)">
+<path d="M36.8451 0H11.1549C4.99423 0 0 4.99423 0 11.1549V36.8451C0 43.0058 4.99423 48 11.1549 48H36.8451C43.0058 48 48 43.0058 48 36.8451V11.1549C48 4.99423 43.0058 0 36.8451 0Z" fill="#211927"/>
+<path d="M31.0126 30.48C31.0576 30.3278 31.0822 30.1674 31.0822 29.9987C31.0822 29.0651 30.3294 28.3083 29.4006 28.3083H21.8643C21.4592 28.3124 21.1278 27.9834 21.1278 27.5762C21.1278 27.5022 21.1401 27.4323 21.1565 27.3665L23.1858 20.2593C23.2718 19.9467 23.5581 19.7164 23.8936 19.7164L31.4586 19.7082C33.0542 19.7082 34.4001 18.6264 34.8054 17.1499L35.9429 13.1891C35.9794 13.0493 36 12.8971 36 12.7449C36 11.8154 35.2513 11.0627 34.3268 11.0627H25.1742C23.5868 11.0627 22.2448 12.1362 21.8316 13.5963L21.0624 16.2985C20.9724 16.607 20.6901 16.8332 20.3546 16.8332H18.1575C16.5823 16.8332 15.2526 17.8861 14.8271 19.3298L12.0614 29.0404C12.0205 29.1844 12 29.3407 12 29.4969C12 30.4306 12.7528 31.1874 13.6816 31.1874H15.8418C16.2469 31.1874 16.5783 31.5164 16.5783 31.9277C16.5783 31.9976 16.5701 32.0675 16.5496 32.1334L15.7845 34.8109C15.7477 34.9549 15.7231 35.1029 15.7231 35.255C15.7231 36.1846 16.4719 36.9374 17.3965 36.9374L26.553 36.929C28.1446 36.929 29.4865 35.8513 29.8957 34.3833L31.0085 30.4841L31.0126 30.48Z" fill="#F2FF59"/>
+</g>
+<defs>
+<clipPath id="clip0_3062_2148">
+<rect width="48" height="48" fill="white"/>
+</clipPath>
+</defs>
+</svg>

apps/website/public/icons/node-link.svg

@@ -1,3 +1,3 @@
-<svg preserveAspectRatio="none" width="100%" height="100%" overflow="visible" style="display: block;" viewBox="0 0 20 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path id="Vector" d="M20 32V0C20 5.39616 15.5172 9.78053 10 9.78053C4.48276 9.78053 0 5.416 0 0V32C0 26.6038 4.48276 22.2195 10 22.2195C15.5172 22.2195 20 26.6038 20 32Z" fill="var(--fill-0, #F2FF59)"/>
+<svg width="20" height="32" viewBox="0 0 20 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 32V0C20 5.39616 15.5172 9.78053 10 9.78053C4.48276 9.78053 0 5.416 0 0V32C0 26.6038 4.48276 22.2195 10 22.2195C15.5172 22.2195 20 26.6038 20 32Z" fill="#F2FF59"/>
 </svg>

apps/website/public/robots.txt

@@ -29,5 +29,6 @@ Allow: /
 Disallow: /_astro/
 Disallow: /_website/
 Disallow: /_vercel/
+Disallow: /payment/
 
 Sitemap: https://comfy.org/sitemap-index.xml

apps/website/src/components/blocks/CtaCenter01.vue

@@ -1,14 +1,10 @@
 <script setup lang="ts">
-import type { AnchorHTMLAttributes } from 'vue'
-
-import Button from '../ui/button/Button.vue'
-import { resolveRel } from '../../utils/cta'
+import BrandButton from '../common/BrandButton.vue'
 
 type Cta = {
   label: string
   href: string
-  target?: AnchorHTMLAttributes['target']
-  rel?: AnchorHTMLAttributes['rel']
+  target?: '_blank' | '_self' | '_parent' | '_top'
 }
 
 type TermsLink = {
@@ -16,11 +12,10 @@ type TermsLink = {
   href: string
 }
 
-const { heading, primaryCta, secondaryCta, termsLink } = defineProps<{
+defineProps<{
   heading: string
   primaryCta: Cta
-  secondaryCta?: Cta
-  termsLink?: TermsLink
+  termsLink: TermsLink
 }>()
 </script>
 
@@ -29,37 +24,23 @@ const { heading, primaryCta, secondaryCta, termsLink } = defineProps<{
     class="max-w-9xl mx-auto flex flex-col items-center px-6 py-16 text-center lg:py-24"
   >
     <h2
-      class="max-w-3xl text-4xl/snug font-light tracking-tight text-pretty text-primary-comfy-canvas lg:text-6xl/snug"
+      class="text-4xl font-light tracking-tight text-primary-comfy-canvas lg:text-6xl"
     >
       {{ heading }}
     </h2>
 
-    <div class="mt-10 flex flex-col gap-4 sm:flex-row lg:mt-12">
-      <Button
-        as="a"
-        :href="primaryCta.href"
-        :target="primaryCta.target"
-        :rel="resolveRel(primaryCta)"
-        variant="default"
-        size="lg"
-      >
-        {{ primaryCta.label }}
-      </Button>
-      <Button
-        v-if="secondaryCta"
-        as="a"
-        :href="secondaryCta.href"
-        :target="secondaryCta.target"
-        :rel="resolveRel(secondaryCta)"
-        variant="outline"
-        size="lg"
-      >
-        {{ secondaryCta.label }}
-      </Button>
-    </div>
+    <BrandButton
+      :href="primaryCta.href"
+      :target="primaryCta.target"
+      :rel="primaryCta.target === '_blank' ? 'noopener noreferrer' : undefined"
+      variant="outline"
+      size="lg"
+      class="mt-10 px-20 py-4 text-base uppercase lg:mt-12"
+    >
+      {{ primaryCta.label }}
+    </BrandButton>
 
     <a
-      v-if="termsLink"
       :href="termsLink.href"
       class="mt-8 text-sm text-primary-comfy-canvas/70 underline underline-offset-4 transition-colors hover:text-primary-comfy-canvas"
     >

apps/website/src/components/blocks/FAQSplit01.vue

@@ -26,13 +26,13 @@ function toggle(index: number) {
 </script>
 
 <template>
-  <section class="max-w-9xl mx-auto px-6 py-16 lg:py-24">
+  <section class="max-w-9xl mx-auto px-4 py-24 md:px-20 md:py-40">
     <div class="flex flex-col gap-6 md:flex-row md:gap-16">
       <!-- Left heading -->
       <div
-        class="sticky top-20 z-10 w-full shrink-0 self-start bg-primary-comfy-ink py-4 md:top-28 md:w-80 md:py-0"
+        class="bg-primary-comfy-ink sticky top-20 z-10 w-full shrink-0 self-start py-4 md:top-28 md:w-80 md:py-0"
       >
-        <h2 class="text-4xl font-light text-primary-comfy-canvas md:text-5xl">
+        <h2 class="text-primary-comfy-canvas text-4xl font-light md:text-5xl">
           {{ heading }}
         </h2>
       </div>
@@ -42,7 +42,7 @@ function toggle(index: number) {
         <div
           v-for="(faq, index) in faqs"
           :key="faq.id"
-          class="border-b border-primary-comfy-canvas/20"
+          class="border-primary-comfy-canvas/20 border-b"
         >
           <button
             :id="`faq-trigger-${faq.id}`"
@@ -83,7 +83,7 @@ function toggle(index: number) {
             :aria-labelledby="`faq-trigger-${faq.id}`"
             class="pb-6"
           >
-            <p class="text-sm whitespace-pre-line text-primary-comfy-canvas/70">
+            <p class="text-primary-comfy-canvas/70 text-sm whitespace-pre-line">
               {{ faq.answer }}
             </p>
           </section>

apps/website/src/components/blocks/FeatureGrid01.vue

@@ -1,120 +0,0 @@
-<script setup lang="ts">
-import { cn } from '@comfyorg/tailwind-utils'
-
-import type { Component } from 'vue'
-
-import Button from '@/components/ui/button/Button.vue'
-import CopyableField from '@/components/ui/copyable-field/CopyableField.vue'
-
-import SectionHeader from '../common/SectionHeader.vue'
-
-type CardAction =
-  | {
-      type: 'link'
-      label: string
-      href: string
-      target?: '_blank'
-      icon?: Component
-      variant?: 'default' | 'outline'
-    }
-  | { type: 'code'; value: string }
-
-export interface FeatureCard {
-  id: string
-  label?: string
-  title: string
-  description: string
-  action?: CardAction
-}
-
-type ColumnCount = 2 | 3 | 4
-
-const {
-  cards,
-  columns = 3,
-  copiedLabel,
-  copyLabel,
-  eyebrow,
-  heading,
-  subtitle
-} = defineProps<{
-  cards: readonly FeatureCard[]
-  columns?: ColumnCount
-  copiedLabel?: string
-  copyLabel?: string
-  eyebrow?: string
-  heading: string
-  subtitle?: string
-}>()
-
-const columnClass: Record<ColumnCount, string> = {
-  2: 'lg:grid-cols-2',
-  3: 'lg:grid-cols-3',
-  4: 'lg:grid-cols-4'
-}
-</script>
-
-<template>
-  <section class="max-w-9xl mx-auto px-6 py-16 lg:py-24">
-    <SectionHeader :label="eyebrow" align="start">
-      {{ heading }}
-      <template v-if="subtitle" #subtitle>
-        <p class="mt-4 max-w-xl text-sm text-smoke-700 lg:text-base">
-          {{ subtitle }}
-        </p>
-      </template>
-    </SectionHeader>
-
-    <div :class="cn('mt-16 grid grid-cols-1 gap-6', columnClass[columns])">
-      <div
-        v-for="card in cards"
-        :key="card.id"
-        class="bg-transparency-white-t4 flex flex-col rounded-3xl p-6 lg:p-8"
-      >
-        <p
-          v-if="card.label"
-          class="text-primary-comfy-yellow text-xs font-bold tracking-widest uppercase"
-        >
-          {{ card.label }}
-        </p>
-        <h3
-          :class="
-            cn(
-              'text-xl font-light text-primary-comfy-canvas lg:text-2xl',
-              card.label && 'mt-3'
-            )
-          "
-        >
-          {{ card.title }}
-        </h3>
-        <p class="mt-3 text-sm text-smoke-700">
-          {{ card.description }}
-        </p>
-
-        <div v-if="card.action" class="mt-6">
-          <Button
-            v-if="card.action.type === 'link'"
-            as="a"
-            :href="card.action.href"
-            :target="card.action.target"
-            :rel="
-              card.action.target === '_blank'
-                ? 'noopener noreferrer'
-                : undefined
-            "
-            :variant="card.action.variant ?? 'outline'"
-            :append-icon="card.action.icon"
-          >
-            {{ card.action.label }}
-          </Button>
-          <CopyableField
-            v-else
-            :value="card.action.value"
-            :copy-label="copyLabel"
-            :copied-label="copiedLabel"
-          />
-        </div>
-      </div>
-    </div>
-  </section>
-</template>

apps/website/src/components/blocks/FeatureGrid02.vue

@@ -1,100 +0,0 @@
-<script setup lang="ts">
-import Button from '@/components/ui/button/Button.vue'
-
-import SectionHeader from '../common/SectionHeader.vue'
-import NodeUnionIcon from '../icons/NodeUnionIcon.vue'
-
-type Cta = { label: string; href: string; target?: '_blank' }
-
-export interface FeatureStep {
-  id: string
-  number: string
-  title: string
-  description: string
-}
-
-defineProps<{
-  heading: string
-  steps: readonly FeatureStep[]
-  primaryCta?: Cta
-  secondaryCta?: Cta
-}>()
-</script>
-
-<template>
-  <section class="max-w-9xl mx-auto px-6 py-16 lg:py-24">
-    <SectionHeader>{{ heading }}</SectionHeader>
-
-    <!-- Step cards in a row, joined by node-union connectors on desktop -->
-    <div
-      class="mt-12 flex flex-col gap-4 lg:flex-row lg:items-stretch lg:gap-0"
-    >
-      <template v-for="(step, i) in steps" :key="step.id">
-        <div
-          v-if="i > 0"
-          class="relative z-10 -mx-px hidden shrink-0 items-center justify-center self-stretch lg:flex"
-          aria-hidden="true"
-        >
-          <NodeUnionIcon
-            class="text-primary-comfy-yellow size-4 scale-x-150 rotate-90"
-          />
-        </div>
-
-        <div
-          class="border-primary-comfy-yellow flex flex-1 flex-col rounded-[40px] border-2 bg-primary-comfy-ink p-2"
-        >
-          <div class="flex flex-1 flex-col gap-4 p-8">
-            <div>
-              <p
-                class="text-primary-comfy-yellow text-xs font-bold tracking-widest uppercase"
-              >
-                {{ step.number }}
-              </p>
-              <h3
-                class="mt-1 text-2xl font-medium tracking-widest text-primary-comfy-canvas uppercase"
-              >
-                {{ step.title }}
-              </h3>
-            </div>
-            <p class="text-primary-comfy-canvas">
-              {{ step.description }}
-            </p>
-          </div>
-        </div>
-      </template>
-    </div>
-
-    <div
-      v-if="primaryCta || secondaryCta"
-      class="mt-12 flex flex-col items-center gap-4 lg:flex-row lg:justify-center"
-    >
-      <Button
-        v-if="primaryCta"
-        as="a"
-        :href="primaryCta.href"
-        :target="primaryCta.target"
-        :rel="
-          primaryCta.target === '_blank' ? 'noopener noreferrer' : undefined
-        "
-        size="lg"
-        class="w-full lg:w-auto lg:min-w-48"
-      >
-        {{ primaryCta.label }}
-      </Button>
-      <Button
-        v-if="secondaryCta"
-        as="a"
-        :href="secondaryCta.href"
-        :target="secondaryCta.target"
-        :rel="
-          secondaryCta.target === '_blank' ? 'noopener noreferrer' : undefined
-        "
-        variant="outline"
-        size="lg"
-        class="w-full lg:w-auto lg:min-w-48"
-      >
-        {{ secondaryCta.label }}
-      </Button>
-    </div>
-  </section>
-</template>

apps/website/src/components/blocks/FeatureRows01.vue

@@ -1,108 +0,0 @@
-<script setup lang="ts">
-import { cn } from '@comfyorg/tailwind-utils'
-
-import type { Locale } from '../../i18n/translations'
-import GlassCard from '../common/GlassCard.vue'
-import SectionHeader from '../common/SectionHeader.vue'
-import VideoPlayer from '../common/VideoPlayer.vue'
-import type { VideoTrack } from '../common/VideoPlayer.vue'
-
-type RowMedia =
-  | { type: 'image'; src: string; alt?: string }
-  | {
-      type: 'video'
-      src: string
-      // <video> has no native alt; used as the player's accessible label.
-      alt?: string
-      poster?: string
-      tracks?: readonly VideoTrack[]
-      autoplay?: boolean
-      loop?: boolean
-      minimal?: boolean
-      hideControls?: boolean
-    }
-
-export interface FeatureRow {
-  id: string
-  title: string
-  description: string
-  media: RowMedia
-}
-
-const {
-  heading,
-  eyebrow,
-  locale = 'en',
-  rows
-} = defineProps<{
-  heading: string
-  eyebrow?: string
-  locale?: Locale
-  rows: readonly FeatureRow[]
-}>()
-</script>
-
-<template>
-  <section class="max-w-9xl mx-auto px-6 py-16 lg:py-24">
-    <SectionHeader :label="eyebrow" max-width="xl">
-      {{ heading }}
-    </SectionHeader>
-
-    <div class="mt-16 flex flex-col gap-4 lg:gap-6">
-      <GlassCard
-        v-for="(row, i) in rows"
-        :key="row.id"
-        class="flex flex-col gap-8 lg:flex-row lg:items-stretch lg:gap-0"
-      >
-        <!-- Text -->
-        <div
-          :class="
-            cn(
-              'order-2 flex flex-col justify-center gap-4 p-6 lg:w-1/2 lg:p-12',
-              i % 2 === 0 ? 'lg:order-1' : 'lg:order-2'
-            )
-          "
-        >
-          <h3 class="text-2xl font-light text-primary-comfy-canvas lg:text-3xl">
-            {{ row.title }}
-          </h3>
-          <p class="text-sm text-smoke-700 lg:text-base">
-            {{ row.description }}
-          </p>
-        </div>
-
-        <!-- Media: image or video -->
-        <div
-          :class="
-            cn(
-              'order-1 flex lg:w-1/2',
-              i % 2 === 0 ? 'lg:order-2' : 'lg:order-1'
-            )
-          "
-        >
-          <img
-            v-if="row.media.type === 'image'"
-            :src="row.media.src"
-            :alt="row.media.alt ?? row.title"
-            loading="lazy"
-            decoding="async"
-            class="aspect-4/3 w-full rounded-4xl object-cover"
-          />
-          <VideoPlayer
-            v-else
-            :locale="locale"
-            :aria-label="row.media.alt ?? row.title"
-            :src="row.media.src"
-            :poster="row.media.poster"
-            :tracks="row.media.tracks"
-            :autoplay="row.media.autoplay"
-            :loop="row.media.loop"
-            :minimal="row.media.minimal"
-            :hide-controls="row.media.hideControls"
-            class="w-full"
-          />
-        </div>
-      </GlassCard>
-    </div>
-  </section>
-</template>

apps/website/src/components/blocks/HeroLivestream01.vue

@@ -1,166 +0,0 @@
-<script setup lang="ts">
-import type { AnchorHTMLAttributes } from 'vue'
-import { computed, onMounted, ref } from 'vue'
-import { useNow } from '@vueuse/core'
-
-import Button from '../ui/button/Button.vue'
-import { resolveRel } from '../../utils/cta'
-
-type Cta = {
-  label: string
-  href: string
-  target?: AnchorHTMLAttributes['target']
-  rel?: AnchorHTMLAttributes['rel']
-}
-
-type Visual =
-  | {
-      type: 'image'
-      src: string
-      alt: string
-      width?: number
-      height?: number
-    }
-  | {
-      type: 'video'
-      src: string
-      alt: string
-      poster?: string
-      width?: number
-      height?: number
-    }
-
-const {
-  visual,
-  eyebrow,
-  title,
-  subtitle,
-  primaryCta,
-  secondaryCta,
-  youtubeVideoId,
-  startDateTime,
-  endDateTime
-} = defineProps<{
-  visual?: Visual
-  eyebrow?: string
-  title: string
-  subtitle?: string
-  primaryCta: Cta
-  secondaryCta?: Cta
-  youtubeVideoId: string
-  startDateTime: string
-  endDateTime: string
-}>()
-
-const embedUrl = computed(
-  () =>
-    `https://www.youtube-nocookie.com/embed/${youtubeVideoId}?autoplay=1&mute=1&rel=0`
-)
-
-// Keep SSR/initial paint deterministic on the logo and only flip to the embed
-// after client hydration — avoids a build-time `now` leaking into the markup.
-const mounted = ref(false)
-onMounted(() => {
-  mounted.value = true
-})
-
-const now = useNow({ interval: 30_000 })
-const startMs = computed(() => new Date(startDateTime).getTime())
-const endMs = computed(() => new Date(endDateTime).getTime())
-
-const isLive = computed(
-  () =>
-    mounted.value &&
-    now.value.getTime() >= startMs.value &&
-    now.value.getTime() < endMs.value
-)
-</script>
-
-<template>
-  <section
-    class="max-w-9xl mx-auto flex flex-col items-center px-6 py-16 text-center lg:py-24"
-  >
-    <div
-      v-if="isLive"
-      class="mb-10 aspect-video w-full overflow-hidden rounded-2xl lg:mb-12"
-    >
-      <iframe
-        :src="embedUrl"
-        :title="title"
-        class="size-full"
-        loading="lazy"
-        allow="autoplay; encrypted-media; picture-in-picture"
-        allowfullscreen
-      />
-    </div>
-    <slot v-else name="visual">
-      <img
-        v-if="visual?.type === 'image'"
-        :src="visual.src"
-        :alt="visual.alt"
-        :width="visual.width"
-        :height="visual.height"
-        fetchpriority="high"
-        decoding="async"
-        class="mb-10 h-auto w-full max-w-md lg:mb-12 lg:max-w-lg"
-      />
-      <video
-        v-else-if="visual?.type === 'video'"
-        :src="visual.src"
-        :poster="visual.poster"
-        :aria-label="visual.alt"
-        :width="visual.width"
-        :height="visual.height"
-        autoplay
-        loop
-        muted
-        playsinline
-        preload="metadata"
-        class="mb-10 h-auto w-full max-w-md lg:mb-12 lg:max-w-2xl"
-      />
-    </slot>
-
-    <p
-      v-if="eyebrow"
-      class="mb-4 text-sm font-medium tracking-wide text-primary-comfy-canvas/70 uppercase"
-    >
-      {{ eyebrow }}
-    </p>
-
-    <h1
-      class="max-w-3xl text-4xl/snug font-light tracking-tight text-pretty text-primary-comfy-canvas lg:text-6xl/snug"
-    >
-      {{ title }}
-    </h1>
-
-    <p
-      v-if="subtitle"
-      class="mt-6 max-w-2xl text-base text-primary-comfy-canvas/70 lg:text-lg"
-    >
-      {{ subtitle }}
-    </p>
-
-    <div class="mt-10 flex flex-col gap-4 sm:flex-row lg:mt-12">
-      <Button
-        as="a"
-        :href="primaryCta.href"
-        :target="primaryCta.target"
-        :rel="resolveRel(primaryCta)"
-        size="lg"
-      >
-        {{ primaryCta.label }}
-      </Button>
-      <Button
-        v-if="secondaryCta"
-        as="a"
-        :href="secondaryCta.href"
-        :target="secondaryCta.target"
-        :rel="resolveRel(secondaryCta)"
-        variant="outline"
-        size="lg"
-      >
-        {{ secondaryCta.label }}
-      </Button>
-    </div>
-  </section>
-</template>

apps/website/src/components/blocks/HeroSplit01.vue

@@ -1,8 +1,6 @@
 <script setup lang="ts">
 import { cn } from '@comfyorg/tailwind-utils'
 
-import type { HTMLAttributes } from 'vue'
-
 import type { Locale } from '../../i18n/translations'
 import BrandButton from '../common/BrandButton.vue'
 import ProductHeroBadge from '../common/ProductHeroBadge.vue'
@@ -29,7 +27,6 @@ const {
   badgeLogoAlt,
   title,
   titleHighlight,
-  subtitle,
   features = [],
   primaryCta,
   secondaryCta,
@@ -44,17 +41,14 @@ const {
   videoAutoplay = false,
   videoLoop = false,
   videoMinimal = false,
-  videoHideControls = false,
-  class: className
+  videoHideControls = false
 } = defineProps<{
   locale?: Locale
-  class?: HTMLAttributes['class']
   badgeText: string
   badgeLogoSrc?: string
   badgeLogoAlt?: string
   title: string
   titleHighlight?: string
-  subtitle?: string
   features?: string[]
   primaryCta: Cta
   secondaryCta?: Cta
@@ -78,8 +72,7 @@ const {
     :class="
       cn(
         'max-w-9xl relative mx-auto flex flex-col items-center gap-12 px-6 pt-20 pb-16 md:pt-28 md:pb-24 lg:items-center lg:gap-16 lg:px-16',
-        imagePosition === 'right' ? 'lg:flex-row' : 'lg:flex-row-reverse',
-        className
+        imagePosition === 'right' ? 'lg:flex-row' : 'lg:flex-row-reverse'
       )
     "
   >
@@ -91,7 +84,7 @@ const {
       />
 
       <h1
-        class="mt-8 text-2xl leading-[125%] font-light tracking-[-1.44px] whitespace-pre-line text-primary-comfy-canvas md:text-4xl lg:text-5xl"
+        class="mt-8 text-2xl leading-[125%] font-light tracking-[-1.44px] text-primary-comfy-canvas md:text-4xl lg:text-5xl"
       >
         <template v-if="titleHighlight">
           <span class="text-primary-warm-white">{{ titleHighlight }}</span>
@@ -100,13 +93,6 @@ const {
         <template v-else>{{ title }}</template>
       </h1>
 
-      <p
-        v-if="subtitle"
-        class="mt-6 max-w-xl text-base text-primary-comfy-canvas/80"
-      >
-        {{ subtitle }}
-      </p>
-
       <ul v-if="features.length" class="mt-8 space-y-3">
         <li
           v-for="feature in features"
@@ -141,29 +127,27 @@ const {
     </div>
 
     <div class="order-first w-full lg:order-last lg:flex-1">
-      <slot name="media">
-        <VideoPlayer
-          v-if="videoSrc"
-          :locale
-          :src="videoSrc"
-          :poster="videoPoster"
-          :tracks="videoTracks"
-          :autoplay="videoAutoplay"
-          :loop="videoLoop"
-          :minimal="videoMinimal"
-          :hide-controls="videoHideControls"
-        />
-        <img
-          v-else-if="imageSrc"
-          :src="imageSrc"
-          :alt="imageAlt"
-          :width="imageWidth"
-          :height="imageHeight"
-          fetchpriority="high"
-          decoding="async"
-          class="aspect-4/3 w-full rounded-3xl object-cover"
-        />
-      </slot>
+      <VideoPlayer
+        v-if="videoSrc"
+        :locale
+        :src="videoSrc"
+        :poster="videoPoster"
+        :tracks="videoTracks"
+        :autoplay="videoAutoplay"
+        :loop="videoLoop"
+        :minimal="videoMinimal"
+        :hide-controls="videoHideControls"
+      />
+      <img
+        v-else-if="imageSrc"
+        :src="imageSrc"
+        :alt="imageAlt"
+        :width="imageWidth"
+        :height="imageHeight"
+        fetchpriority="high"
+        decoding="async"
+        class="aspect-4/3 w-full rounded-3xl object-cover"
+      />
     </div>
   </section>
 </template>

apps/website/src/components/blocks/ReasonsSplit01.vue

@@ -1,59 +0,0 @@
-<script setup lang="ts">
-export interface Reason {
-  id: string
-  title: string
-  description: string
-}
-
-const { highlightClass = 'text-white' } = defineProps<{
-  heading: string
-  headingHighlight?: string
-  highlightClass?: string
-  subtitle?: string
-  reasons: readonly Reason[]
-}>()
-</script>
-
-<template>
-  <section
-    class="max-w-9xl mx-auto flex flex-col gap-4 px-6 py-16 lg:flex-row lg:gap-16 lg:py-24"
-  >
-    <!-- Left heading -->
-    <div
-      class="sticky top-20 z-10 w-full shrink-0 self-start bg-primary-comfy-ink py-4 lg:top-28 lg:w-115 lg:py-0"
-    >
-      <h2
-        class="text-4xl/16 font-light whitespace-pre-line text-primary-comfy-canvas lg:text-5xl/16"
-      >
-        {{ heading
-        }}<span v-if="headingHighlight" :class="highlightClass">{{
-          headingHighlight
-        }}</span>
-      </h2>
-      <p v-if="subtitle" class="mt-6 text-sm text-primary-comfy-canvas/70">
-        {{ subtitle }}
-      </p>
-    </div>
-
-    <!-- Right reasons list -->
-    <div class="flex-1">
-      <div
-        v-for="reason in reasons"
-        :key="reason.id"
-        class="flex flex-col gap-4 border-b border-primary-comfy-canvas/20 py-10 first:pt-0 lg:gap-12 xl:flex-row"
-      >
-        <div class="shrink-0 xl:w-84">
-          <h3
-            class="text-2xl font-light whitespace-pre-line text-primary-comfy-canvas"
-          >
-            {{ reason.title }}
-          </h3>
-          <slot name="reason-extra" :reason="reason" />
-        </div>
-        <p class="flex-1 text-sm text-primary-comfy-canvas/70">
-          {{ reason.description }}
-        </p>
-      </div>
-    </div>
-  </section>
-</template>

apps/website/src/components/common/Badge.vue

@@ -0,0 +1,17 @@
+<script setup lang="ts">
+import { cn } from '@comfyorg/tailwind-utils'
+
+import type { BadgeVariants } from './badge.variants'
+import { badgeVariants } from './badge.variants'
+
+const { variant, class: className } = defineProps<{
+  variant?: BadgeVariants['variant']
+  class?: string
+}>()
+</script>
+
+<template>
+  <span :class="cn(badgeVariants({ variant }), className)">
+    <slot />
+  </span>
+</template>

apps/website/src/components/common/BrandButton.vue

@@ -6,7 +6,6 @@ import type { HTMLAttributes } from 'vue'
 
 import type { BrandButtonVariants } from './brandButton.variants'
 import { brandButtonVariants } from './brandButton.variants'
-import { resolveRel } from '../../utils/cta'
 
 const props = defineProps<{
   href?: string
@@ -17,8 +16,9 @@ const props = defineProps<{
   class?: HTMLAttributes['class']
 }>()
 
-const resolvedRel = computed(() =>
-  resolveRel({ rel: props.rel, target: props.target })
+const resolvedRel = computed(
+  () =>
+    props.rel ?? (props.target === '_blank' ? 'noopener noreferrer' : undefined)
 )
 </script>
 

apps/website/src/components/common/CallToActionSection.vue

@@ -25,7 +25,7 @@ const {
   <section class="max-w-9xl mx-auto px-6 py-20 lg:py-32">
     <div class="flex flex-col items-center text-center">
       <h2
-        class="max-w-5xl text-3xl font-light tracking-tight text-primary-comfy-canvas lg:text-5xl"
+        class="text-primary-comfy-canvas max-w-5xl text-3xl font-light tracking-tight lg:text-5xl"
       >
         {{ t(headingKey, locale) }}
       </h2>

apps/website/src/components/common/ContentSection.vue

@@ -114,7 +114,7 @@ function scrollToSection(id: string) {
   <section class="px-4 pt-8 pb-24 lg:px-20 lg:pt-24 lg:pb-40">
     <div class="lg:flex lg:gap-16">
       <!-- Desktop sticky nav -->
-      <aside class="hidden scrollbar-none lg:block lg:w-48 lg:shrink-0">
+      <aside class="scrollbar-none hidden lg:block lg:w-48 lg:shrink-0">
         <div class="sticky top-32">
           <CategoryNav
             :categories="categories"
@@ -135,7 +135,7 @@ function scrollToSection(id: string) {
         >
           <h2
             v-if="section.hasTitle"
-            class="mb-6 text-2xl font-light text-primary-comfy-canvas"
+            class="text-primary-comfy-canvas mb-6 text-2xl font-light"
           >
             {{ t(key(section.id, 'title'), locale) }}
           </h2>
@@ -144,7 +144,7 @@ function scrollToSection(id: string) {
             <!-- Paragraph -->
             <p
               v-if="block.type === 'paragraph'"
-              class="mt-4 text-sm/relaxed text-primary-comfy-canvas"
+              class="text-primary-comfy-canvas mt-4 text-sm/relaxed"
               v-html="t(key(section.id, `block.${i}`), locale)"
             />
 
@@ -167,7 +167,7 @@ function scrollToSection(id: string) {
                   locale
                 ).split('\n')"
                 :key="j"
-                class="flex items-start gap-2 text-primary-comfy-canvas"
+                class="text-primary-comfy-canvas flex items-start gap-2"
               >
                 <span
                   class="bg-primary-comfy-yellow mt-1.5 size-1.5 shrink-0 rounded-full"
@@ -187,7 +187,7 @@ function scrollToSection(id: string) {
                   locale
                 ).split('\n')"
                 :key="j"
-                class="flex items-start gap-3 text-primary-comfy-canvas"
+                class="text-primary-comfy-canvas flex items-start gap-3"
               >
                 <span
                   class="text-primary-comfy-yellow shrink-0 font-semibold tabular-nums"
@@ -205,7 +205,7 @@ function scrollToSection(id: string) {
                 :alt="t(key(section.id, `block.${i}.alt`), locale)"
                 class="w-full rounded-2xl object-cover"
               />
-              <figcaption class="mt-3 text-xs text-primary-comfy-canvas">
+              <figcaption class="text-primary-comfy-canvas mt-3 text-xs">
                 {{ t(key(section.id, `block.${i}.caption`), locale) }}
               </figcaption>
             </figure>
@@ -221,7 +221,7 @@ function scrollToSection(id: string) {
               "
             >
               <p
-                class="text-lg/relaxed font-light text-primary-comfy-canvas italic"
+                class="text-primary-comfy-canvas text-lg/relaxed font-light italic"
               >
                 "{{ t(key(section.id, `block.${i}.text`), locale) }}"
               </p>
@@ -238,17 +238,17 @@ function scrollToSection(id: string) {
               <SectionLabel>
                 {{ t(key(section.id, `block.${i}.label`), locale) }}
               </SectionLabel>
-              <p class="mt-2 text-sm font-semibold text-primary-comfy-canvas">
+              <p class="text-primary-comfy-canvas mt-2 text-sm font-semibold">
                 {{ t(key(section.id, `block.${i}.name`), locale) }}
               </p>
-              <p class="text-xs text-primary-comfy-canvas">
+              <p class="text-primary-comfy-canvas text-xs">
                 {{ t(key(section.id, `block.${i}.role`), locale) }}
               </p>
               <template v-if="hasKey(key(section.id, `block.${i}.name2`))">
-                <p class="mt-4 text-sm font-semibold text-primary-comfy-canvas">
+                <p class="text-primary-comfy-canvas mt-4 text-sm font-semibold">
                   {{ t(key(section.id, `block.${i}.name2`), locale) }}
                 </p>
-                <p class="text-xs text-primary-comfy-canvas">
+                <p class="text-primary-comfy-canvas text-xs">
                   {{ t(key(section.id, `block.${i}.role2`), locale) }}
                 </p>
               </template>

apps/website/src/components/common/EventsSection.vue

@@ -40,12 +40,12 @@ const {
       <div class="grid grid-cols-1 gap-12 lg:grid-cols-2 lg:gap-16">
         <div class="flex flex-col gap-8">
           <h2
-            class="text-4xl font-light tracking-tight text-primary-comfy-canvas lg:text-6xl"
+            class="text-primary-comfy-canvas text-4xl font-light tracking-tight lg:text-6xl"
           >
             {{ t(headingKey, locale) }}
           </h2>
           <p
-            class="max-w-sm text-sm/relaxed text-primary-comfy-canvas lg:text-base"
+            class="text-primary-comfy-canvas max-w-sm text-sm/relaxed lg:text-base"
           >
             {{ t(descriptionKey, locale) }}
           </p>
@@ -66,10 +66,10 @@ const {
             v-for="(event, i) in events"
             :key="i"
             :href="event.href"
-            class="group flex items-center gap-4 border-b border-primary-comfy-canvas/15 py-6 lg:gap-8"
+            class="group border-primary-comfy-canvas/15 flex items-center gap-4 border-b py-6 lg:gap-8"
           >
             <span
-              class="shrink-0 text-sm font-medium text-primary-comfy-canvas"
+              class="text-primary-comfy-canvas shrink-0 text-sm font-medium"
             >
               {{ event.label[locale] }}
             </span>

apps/website/src/components/common/HeaderMain/HeaderMain.vue

@@ -1,85 +0,0 @@
-<script setup lang="ts">
-import type { Locale } from '../../../i18n/translations.ts'
-import { t } from '../../../i18n/translations.ts'
-import { externalLinks, getRoutes } from '../../../config/routes.ts'
-import GitHubStarBadge from '../GitHubStarBadge.vue'
-import HeaderMainDesktop from './HeaderMainDesktop.vue'
-import HeaderMainMobile from './HeaderMainMobile.vue'
-import Button from '@/components/ui/button/Button.vue'
-
-const { locale = 'en', githubStars = '' } = defineProps<{
-  locale?: Locale
-  githubStars?: string
-}>()
-const routes = getRoutes(locale)
-
-const ctaButtons = [
-  {
-    prefix: t('nav.ctaDesktopPrefix', locale),
-    core: t('nav.ctaDesktopCore', locale),
-    ariaLabel: t('nav.downloadLocal', locale),
-    href: routes.download,
-    primary: false
-  },
-  {
-    prefix: t('nav.ctaCloudPrefix', locale),
-    core: t('nav.ctaCloudCore', locale),
-    ariaLabel: t('nav.launchCloud', locale),
-    href: externalLinks.cloud,
-    primary: true
-  }
-]
-</script>
-
-<template>
-  <nav
-    class="fixed inset-x-0 top-0 z-50 flex items-center justify-between gap-4 bg-primary-comfy-ink px-6 py-5 lg:gap-4 lg:px-[clamp(0.25rem,4vw,5rem)] lg:py-8"
-    aria-label="Main navigation"
-  >
-    <a
-      :href="routes.home"
-      class="inline-grid h-10 shrink-0 grid-cols-1 grid-rows-1 transition-[width]"
-      aria-label="Comfy home"
-    >
-      <img
-        src="/icons/logomark.svg"
-        alt="Comfy"
-        class="col-span-full row-span-full h-8"
-      />
-      <div
-        class="relative col-span-full row-span-full h-10 w-0 overflow-clip transition-[width] xl:w-36"
-      >
-        <img
-          src="/icons/logo.svg"
-          alt="Comfy"
-          class="absolute top-0 left-0 h-10 w-36 max-w-none object-contain object-left"
-        />
-      </div>
-    </a>
-
-    <!-- Desktop nav links -->
-    <HeaderMainDesktop :locale class="hidden lg:block" />
-    <HeaderMainMobile :locale class="lg:hidden" />
-
-    <!-- Desktop CTA buttons -->
-    <div
-      data-testid="desktop-nav-cta"
-      class="hidden shrink-0 items-center gap-2 lg:flex"
-    >
-      <GitHubStarBadge v-if="githubStars" :stars="githubStars" />
-      <Button
-        v-for="cta in ctaButtons"
-        :key="cta.href"
-        as="a"
-        :href="cta.href"
-        :variant="cta.primary ? 'default' : 'outline'"
-        :aria-label="cta.ariaLabel"
-      >
-        <span
-          ><span class="hidden xl:inline-block">{{ cta.prefix }}&nbsp;</span
-          >{{ cta.core }}</span
-        >
-      </Button>
-    </div>
-  </nav>
-</template>

apps/website/src/components/common/HeaderMain/HeaderMainDesktop.vue

@@ -1,76 +0,0 @@
-<script setup lang="ts">
-import NavigationMenu from '@/components/ui/navigation-menu/NavigationMenu.vue'
-import NavigationMenuContent from '@/components/ui/navigation-menu/NavigationMenuContent.vue'
-import NavigationMenuItem from '@/components/ui/navigation-menu/NavigationMenuItem.vue'
-import NavigationMenuLink from '@/components/ui/navigation-menu/NavigationMenuLink.vue'
-import NavigationMenuList from '@/components/ui/navigation-menu/NavigationMenuList.vue'
-import NavigationMenuTrigger from '@/components/ui/navigation-menu/NavigationMenuTrigger.vue'
-import { navigationMenuTriggerStyle } from '@/components/ui/navigation-menu/navigationMenuTriggerStyle'
-
-import {
-  isHrefActive,
-  useCurrentPath
-} from '../../../composables/useCurrentPath'
-import { getMainNavigation } from '../../../data/mainNavigation'
-import type { NavItem } from '../../../data/mainNavigation'
-import type { Locale } from '../../../i18n/translations'
-import NavColumn from './NavColumn.vue'
-import NavFeaturedCard from './NavFeaturedCard.vue'
-
-const { locale = 'en' } = defineProps<{ locale?: Locale }>()
-const mainNavigation = getMainNavigation(locale)
-const currentPath = useCurrentPath()
-
-function isNavItemActive(navItem: NavItem, path: string): boolean {
-  if (navItem.href) return isHrefActive(navItem.href, path)
-  return (
-    navItem.columns?.some((column) =>
-      column.items.some((item) => isHrefActive(item.href, path))
-    ) ?? false
-  )
-}
-</script>
-
-<template>
-  <NavigationMenu data-testid="desktop-nav-links">
-    <NavigationMenuList>
-      <NavigationMenuItem
-        v-for="navItem in mainNavigation"
-        :key="navItem.label"
-      >
-        <template v-if="navItem.columns?.length">
-          <NavigationMenuTrigger
-            :active="isNavItemActive(navItem, currentPath)"
-          >
-            {{ navItem.label }}
-          </NavigationMenuTrigger>
-          <NavigationMenuContent class="w-auto" data-testid="nav-dropdown">
-            <ul class="flex w-max gap-16">
-              <NavFeaturedCard
-                v-if="navItem.featured"
-                :featured="navItem.featured"
-              />
-              <NavColumn
-                v-for="column in navItem.columns"
-                :key="column.header"
-                :column="column"
-                :locale="locale"
-                :current-path="currentPath"
-              />
-            </ul>
-          </NavigationMenuContent>
-        </template>
-        <NavigationMenuLink
-          v-else
-          as-child
-          :active="isNavItemActive(navItem, currentPath)"
-          :class="navigationMenuTriggerStyle()"
-        >
-          <a :href="navItem.href" class="ppformula-text-center">{{
-            navItem.label
-          }}</a>
-        </NavigationMenuLink>
-      </NavigationMenuItem>
-    </NavigationMenuList>
-  </NavigationMenu>
-</template>

apps/website/src/components/common/HeaderMain/HeaderMainMobile.vue

@@ -1,167 +0,0 @@
-<script setup lang="ts">
-import BreadthumbIcon from '@/components/icons/BreadthumbIcon.vue'
-import { ChevronLeft, ChevronRight } from '@lucide/vue'
-import { computed, onUnmounted, ref, watch } from 'vue'
-import { getMainNavigation } from '../../../data/mainNavigation'
-import { getRoutes } from '../../../config/routes.ts'
-import { lockScroll, unlockScroll } from '../../../composables/scrollLock'
-import type { Locale } from '../../../i18n/translations.ts'
-import { t } from '../../../i18n/translations.ts'
-import NavLinkContent from './NavLinkContent.vue'
-import Sheet from '@/components/ui/sheet/Sheet.vue'
-import SheetContent from '@/components/ui/sheet/SheetContent.vue'
-import SheetDescription from '@/components/ui/sheet/SheetDescription.vue'
-import SheetHeader from '@/components/ui/sheet/SheetHeader.vue'
-import SheetTitle from '@/components/ui/sheet/SheetTitle.vue'
-import SheetTrigger from '@/components/ui/sheet/SheetTrigger.vue'
-import Button from '@/components/ui/button/Button.vue'
-import { cn } from '@comfyorg/tailwind-utils'
-
-const { locale = 'en' } = defineProps<{ locale?: Locale }>()
-const routes = getRoutes(locale)
-const mainNavigation = getMainNavigation(locale)
-
-const isOpen = ref(false)
-const activeSection = ref<string | null>(null)
-
-const activeItem = computed(() =>
-  mainNavigation.find(
-    (item) => item.label === activeSection.value && item.columns
-  )
-)
-
-watch(isOpen, (open) => {
-  if (open) {
-    lockScroll()
-  } else {
-    unlockScroll()
-    activeSection.value = null
-  }
-})
-
-onUnmounted(() => {
-  if (isOpen.value) unlockScroll({ skipRestore: true })
-})
-</script>
-
-<template>
-  <div>
-    <Sheet v-model:open="isOpen">
-      <SheetTrigger
-        :aria-label="t('nav.toggleMenu', locale)"
-        class="bg-primary-comfy-yellow grid size-10 shrink-0 cursor-pointer place-items-center rounded-xl text-primary-comfy-ink hover:opacity-90"
-      >
-        <BreadthumbIcon class="h-3 w-5 text-primary-comfy-ink" />
-      </SheetTrigger>
-      <SheetContent
-        side="right"
-        class="flex size-full flex-col px-6 py-5 sm:max-w-none"
-        :close-label="t('nav.close', locale)"
-      >
-        <SheetHeader class="sr-only">
-          <SheetTitle>{{ t('nav.menu', locale) }}</SheetTitle>
-          <SheetDescription>
-            {{ t('nav.mobileMenuDescription', locale) }}
-          </SheetDescription>
-        </SheetHeader>
-
-        <div>
-          <a
-            :href="routes.home"
-            class="focus-visible:border-primary-comfy-yellow focus-visible:ring-primary-comfy-yellow/50 inline-flex w-auto shrink-0 focus-visible:ring-3"
-          >
-            <img src="/icons/logomark.svg" alt="" class="h-11 w-auto" />
-            <span class="sr-only">{{ t('nav.home', locale) }}</span>
-          </a>
-        </div>
-
-        <div class="relative mt-4 flex-1 overflow-hidden">
-          <!-- Top-level nav -->
-          <nav
-            :class="
-              cn(
-                'absolute inset-0 overflow-y-auto p-1',
-                activeItem ? 'opacity-0' : ''
-              )
-            "
-            :aria-label="t('nav.menu', locale)"
-            :inert="activeItem ? true : undefined"
-          >
-            <ul class="flex flex-col gap-y-8">
-              <li v-for="item in mainNavigation" :key="item.label">
-                <Button
-                  :as="item.columns ? 'button' : 'a'"
-                  variant="navMuted"
-                  :type="item.columns ? 'button' : undefined"
-                  :href="item.columns ? undefined : item.href"
-                  @click="item.columns && (activeSection = item.label)"
-                >
-                  {{ item.label }}
-                  <template #append>
-                    <ChevronRight class="size-7" />
-                  </template>
-                </Button>
-              </li>
-            </ul>
-          </nav>
-
-          <!-- Drill-down sub-panel -->
-          <div
-            class="absolute inset-0 bg-primary-comfy-ink transition-transform duration-300 ease-out"
-            :class="
-              activeItem
-                ? 'translate-x-0'
-                : 'pointer-events-none translate-x-full'
-            "
-            :inert="activeItem ? undefined : true"
-            :aria-hidden="!activeItem"
-          >
-            <div class="size-full overflow-y-auto py-8">
-              <Button
-                type="button"
-                variant="link"
-                @click="activeSection = null"
-              >
-                <template #prepend>
-                  <ChevronLeft />
-                </template>
-                {{ t('nav.back', locale) }}
-              </Button>
-
-              <div v-if="activeItem" class="mt-6 flex flex-col gap-y-12">
-                <div
-                  v-for="column in activeItem.columns"
-                  :key="column.header"
-                  class="flex flex-col gap-y-3"
-                >
-                  <p
-                    class="text-primary-warm-gray text-base font-bold tracking-wider uppercase"
-                  >
-                    {{ column.header }}
-                  </p>
-                  <Button
-                    v-for="link in column.items"
-                    :key="link.label"
-                    :href="link.href"
-                    variant="nav"
-                    as="a"
-                    :target="link.external ? '_blank' : undefined"
-                    :rel="link.external ? 'noopener noreferrer' : undefined"
-                  >
-                    <NavLinkContent :item="link" :locale="locale" />
-                  </Button>
-                </div>
-              </div>
-            </div>
-            <div
-              class="pointer-events-none absolute inset-x-0 top-0 h-8 bg-linear-to-b from-primary-comfy-ink to-transparent"
-            />
-            <div
-              class="pointer-events-none absolute inset-x-0 bottom-0 h-8 bg-linear-to-t from-primary-comfy-ink to-transparent"
-            />
-          </div>
-        </div>
-      </SheetContent>
-    </Sheet>
-  </div>
-</template>

apps/website/src/components/common/HeaderMain/NavColumn.vue

@@ -1,36 +0,0 @@
-<script setup lang="ts">
-import NavigationMenuLink from '@/components/ui/navigation-menu/NavigationMenuLink.vue'
-
-import { isHrefActive } from '../../../composables/useCurrentPath'
-import type { NavColumn } from '../../../data/mainNavigation'
-import type { Locale } from '../../../i18n/translations'
-import NavLinkContent from './NavLinkContent.vue'
-
-defineProps<{ column: NavColumn; locale: Locale; currentPath: string }>()
-</script>
-
-<template>
-  <li class="flex flex-col space-y-4">
-    <p class="font-formula text-primary-warm-gray pl-2 text-sm font-medium">
-      {{ column.header }}
-    </p>
-    <ul class="flex flex-col">
-      <li v-for="item in column.items" :key="item.label">
-        <NavigationMenuLink
-          as-child
-          :active="isHrefActive(item.href, currentPath)"
-          class="hover:bg-transparency-white-t4"
-        >
-          <a
-            :href="item.href"
-            :target="item.external ? '_blank' : undefined"
-            :rel="item.external ? 'noopener noreferrer' : undefined"
-            class="whitespace-nowrap"
-          >
-            <NavLinkContent :item="item" :locale="locale" />
-          </a>
-        </NavigationMenuLink>
-      </li>
-    </ul>
-  </li>
-</template>

apps/website/src/components/common/HeaderMain/NavFeaturedCard.vue

@@ -1,31 +0,0 @@
-<script setup lang="ts">
-import ButtonPill from '@/components/ui/button-pill/ButtonPill.vue'
-
-import type { NavFeatured } from '../../../data/mainNavigation'
-
-defineProps<{ featured: NavFeatured }>()
-</script>
-
-<template>
-  <li class="shrink-0">
-    <a
-      :href="featured.cta.href"
-      :aria-label="featured.cta.ariaLabel"
-      class="group/pill-trigger relative block"
-    >
-      <img
-        class="aspect-4/3 w-62 max-w-none rounded-xl"
-        :src="featured.imageSrc"
-        :alt="featured.imageAlt ?? ''"
-      />
-      <p class="mt-4 font-extrabold uppercase">
-        {{ featured.title }}
-      </p>
-      <div class="mt-1">
-        <ButtonPill as="span" icon-position="left" variant="ghost">
-          {{ featured.cta.label }}
-        </ButtonPill>
-      </div>
-    </a>
-  </li>
-</template>

apps/website/src/components/common/HeaderMain/NavLinkContent.vue

@@ -1,23 +0,0 @@
-<script setup lang="ts">
-import Badge from '@/components/ui/badge/Badge.vue'
-import { ArrowUpRight } from '@lucide/vue'
-
-import type { NavColumnItem } from '../../../data/mainNavigation'
-import type { Locale } from '../../../i18n/translations'
-import { t } from '../../../i18n/translations'
-
-defineProps<{ item: NavColumnItem; locale: Locale }>()
-</script>
-
-<template>
-  <span class="flex items-center gap-2">
-    <span class="ppformula-text-center">{{ item.label }}</span>
-    <Badge v-if="item.badge" size="xs" variant="accent">
-      {{ t('nav.badgeNew', locale) }}
-    </Badge>
-    <ArrowUpRight
-      v-if="item.external"
-      class="text-primary-comfy-yellow size-4"
-    />
-  </span>
-</template>

apps/website/src/components/common/MaskRevealButton.stories.ts

@@ -1,10 +1,10 @@
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 
-import ButtonMask from './ButtonMask.vue'
+import MaskRevealButton from './MaskRevealButton.vue'
 
-const meta: Meta<typeof ButtonMask> = {
-  title: 'Website/UI/ButtonMask',
-  component: ButtonMask,
+const meta: Meta<typeof MaskRevealButton> = {
+  title: 'Website/Common/MaskRevealButton',
+  component: MaskRevealButton,
   tags: ['autodocs'],
   decorators: [
     () => ({
@@ -12,19 +12,22 @@ const meta: Meta<typeof ButtonMask> = {
     })
   ],
   argTypes: {
-    as: {
+    href: { control: 'text' },
+    target: { control: 'text' },
+    rel: { control: 'text' },
+    type: {
       control: { type: 'select' },
-      options: ['button', 'a']
+      options: ['button', 'submit', 'reset']
     },
-    asChild: { control: 'boolean' },
     disabled: { control: 'boolean' },
+    ariaLabel: { control: 'text' },
     variant: {
       control: { type: 'select' },
       options: ['solid', 'ghost']
     },
     size: {
       control: { type: 'select' },
-      options: ['default', 'lg', 'icon']
+      options: ['sm', 'md', 'lg']
     },
     iconPosition: {
       control: { type: 'select' },
@@ -38,57 +41,57 @@ export default meta
 type Story = StoryObj<typeof meta>
 
 export const Default: Story = {
-  args: { as: 'a', href: '#' },
+  args: { href: '#' },
   render: (args) => ({
-    components: { ButtonMask },
+    components: { MaskRevealButton },
     setup: () => ({ args }),
-    template: `<ButtonMask v-bind="args">Try Workflow</ButtonMask>`
+    template: `<MaskRevealButton v-bind="args">Try Workflow</MaskRevealButton>`
   })
 }
 
 export const Ghost: Story = {
-  args: { as: 'a', href: '#', variant: 'ghost' },
+  args: { href: '#', variant: 'ghost' },
   render: (args) => ({
-    components: { ButtonMask },
+    components: { MaskRevealButton },
     setup: () => ({ args }),
-    template: '<ButtonMask v-bind="args">Read More</ButtonMask>'
+    template: '<MaskRevealButton v-bind="args">Read More</MaskRevealButton>'
   })
 }
 
 export const IconLeft: Story = {
-  args: { as: 'a', href: '#', iconPosition: 'left' },
+  args: { href: '#', iconPosition: 'left' },
   render: (args) => ({
-    components: { ButtonMask },
+    components: { MaskRevealButton },
     setup: () => ({ args }),
-    template: '<ButtonMask v-bind="args">Go Back</ButtonMask>'
+    template: '<MaskRevealButton v-bind="args">Go Back</MaskRevealButton>'
   })
 }
 
-export const DefaultSolid: Story = {
-  args: { as: 'a', href: '#', size: 'default' },
+export const SmallSolid: Story = {
+  args: { href: '#', size: 'sm' },
   render: (args) => ({
-    components: { ButtonMask },
+    components: { MaskRevealButton },
     setup: () => ({ args }),
-    template: '<ButtonMask v-bind="args">Try Workflow</ButtonMask>'
+    template: '<MaskRevealButton v-bind="args">Try Workflow</MaskRevealButton>'
   })
 }
 
 export const LargeSolid: Story = {
-  args: { as: 'a', href: '#', size: 'lg' },
+  args: { href: '#', size: 'lg' },
   render: (args) => ({
-    components: { ButtonMask },
+    components: { MaskRevealButton },
     setup: () => ({ args }),
-    template: `<ButtonMask v-bind="args">Let's Collaborate</ButtonMask>`
+    template: `<MaskRevealButton v-bind="args">Let's Collaborate</MaskRevealButton>`
   })
 }
 
 export const WithCustomIcon: Story = {
-  args: { as: 'a', href: '#' },
+  args: { href: '#' },
   render: (args) => ({
-    components: { ButtonMask },
+    components: { MaskRevealButton },
     setup: () => ({ args }),
     template: `
-      <ButtonMask v-bind="args">
+      <MaskRevealButton v-bind="args">
         Next Step
         <template #icon>
           <svg
@@ -103,53 +106,57 @@ export const WithCustomIcon: Story = {
             <polyline points="9 6 15 12 9 18" />
           </svg>
         </template>
-      </ButtonMask>
+      </MaskRevealButton>
     `
   })
 }
 
 export const LabelVisible: Story = {
-  args: { as: 'a', href: '#', hideLabel: false },
+  args: { href: '#', hideLabel: false },
   render: (args) => ({
-    components: { ButtonMask },
+    components: { MaskRevealButton },
     setup: () => ({ args }),
-    template: '<ButtonMask v-bind="args">Always Visible</ButtonMask>'
+    template:
+      '<MaskRevealButton v-bind="args">Always Visible</MaskRevealButton>'
   })
 }
 
 export const Disabled: Story = {
   args: { disabled: true },
   render: (args) => ({
-    components: { ButtonMask },
+    components: { MaskRevealButton },
     setup: () => ({ args }),
-    template: '<ButtonMask v-bind="args">Unavailable</ButtonMask>'
+    template: '<MaskRevealButton v-bind="args">Unavailable</MaskRevealButton>'
   })
 }
 
 export const AllVariants: Story = {
   render: () => ({
-    components: { ButtonMask },
+    components: { MaskRevealButton },
     template: `
       <div class="flex flex-col gap-8">
         <div class="flex flex-col gap-3">
           <span class="text-primary-comfy-canvas text-xs uppercase tracking-wider">Solid</span>
           <div class="flex flex-wrap items-center gap-4">
-            <ButtonMask as="a" href="#" variant="solid" size="default">Default</ButtonMask>
-            <ButtonMask as="a" href="#" variant="solid" size="lg">Large</ButtonMask>
+            <MaskRevealButton href="#" variant="solid" size="sm">Small</MaskRevealButton>
+            <MaskRevealButton href="#" variant="solid" size="md">Medium</MaskRevealButton>
+            <MaskRevealButton href="#" variant="solid" size="lg">Large</MaskRevealButton>
           </div>
         </div>
         <div class="flex flex-col gap-3">
           <span class="text-primary-comfy-canvas text-xs uppercase tracking-wider">Ghost</span>
           <div class="flex flex-wrap items-center gap-4">
-            <ButtonMask as="a" href="#" variant="ghost" size="default">Default</ButtonMask>
-            <ButtonMask as="a" href="#" variant="ghost" size="lg">Large</ButtonMask>
+            <MaskRevealButton href="#" variant="ghost" size="sm">Small</MaskRevealButton>
+            <MaskRevealButton href="#" variant="ghost" size="md">Medium</MaskRevealButton>
+            <MaskRevealButton href="#" variant="ghost" size="lg">Large</MaskRevealButton>
           </div>
         </div>
         <div class="flex flex-col gap-3">
           <span class="text-primary-comfy-canvas text-xs uppercase tracking-wider">Icon Left</span>
           <div class="flex flex-wrap items-center gap-4">
-            <ButtonMask as="a" href="#" iconPosition="left" size="default">Default</ButtonMask>
-            <ButtonMask as="a" href="#" iconPosition="left" size="lg">Large</ButtonMask>
+            <MaskRevealButton href="#" iconPosition="left" size="sm">Small</MaskRevealButton>
+            <MaskRevealButton href="#" iconPosition="left" size="md">Medium</MaskRevealButton>
+            <MaskRevealButton href="#" iconPosition="left" size="lg">Large</MaskRevealButton>
           </div>
         </div>
       </div>

apps/website/src/components/common/MaskRevealButton.vue

@@ -0,0 +1,82 @@
+<script setup lang="ts">
+import { cn } from '@comfyorg/tailwind-utils'
+
+import type { HTMLAttributes } from 'vue'
+
+import type { MaskRevealButtonVariants } from './maskRevealButton.variants'
+import {
+  maskRevealButtonBadgeVariants,
+  maskRevealButtonVariants,
+  maskRevealLabelVariants
+} from './maskRevealButton.variants'
+
+const {
+  href,
+  target,
+  rel,
+  type = 'button',
+  disabled,
+  ariaLabel,
+  variant,
+  size,
+  iconPosition,
+  hideLabel = true,
+  class: customClass = ''
+} = defineProps<{
+  href?: string
+  target?: string
+  rel?: string
+  type?: 'button' | 'submit' | 'reset'
+  disabled?: boolean
+  ariaLabel?: string
+  variant?: MaskRevealButtonVariants['variant']
+  size?: MaskRevealButtonVariants['size']
+  iconPosition?: MaskRevealButtonVariants['iconPosition']
+  hideLabel?: boolean
+  class?: HTMLAttributes['class']
+}>()
+</script>
+
+<template>
+  <component
+    :is="href ? 'a' : 'button'"
+    :href="href || undefined"
+    :target="href ? target : undefined"
+    :rel="href ? rel : undefined"
+    :type="!href ? type : undefined"
+    :disabled="!href ? disabled : undefined"
+    :aria-label="ariaLabel"
+    :class="
+      cn(maskRevealButtonVariants({ variant, size, iconPosition }), customClass)
+    "
+  >
+    <span
+      :data-icon-position="iconPosition ?? 'right'"
+      :data-hidden="hideLabel ? 'true' : 'false'"
+      :class="maskRevealLabelVariants()"
+    >
+      <slot />
+    </span>
+    <span
+      :class="maskRevealButtonBadgeVariants({ variant, size, iconPosition })"
+      aria-hidden="true"
+    >
+      <span class="inline-flex transition-transform duration-500">
+        <slot name="icon">
+          <svg
+            viewBox="0 0 24 24"
+            fill="none"
+            stroke="currentColor"
+            stroke-width="2"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            class="size-4"
+          >
+            <path d="M7 17 17 7" />
+            <path d="M7 7h10v10" />
+          </svg>
+        </slot>
+      </span>
+    </span>
+  </component>
+</template>

apps/website/src/components/common/MobileMenu.vue

@@ -0,0 +1,186 @@
+<script setup lang="ts">
+import { computed, nextTick, onUnmounted, ref, watch } from 'vue'
+
+import type { Locale } from '../../i18n/translations'
+import { t } from '../../i18n/translations'
+import { lockScroll, unlockScroll } from '../../composables/scrollLock'
+import BrandButton from './BrandButton.vue'
+import type { NavLink } from './NavDesktopLink.vue'
+
+interface CtaLink {
+  label: string
+  href: string
+  primary: boolean
+}
+
+const {
+  open = false,
+  navigating = false,
+  links = [],
+  ctaLinks = [],
+  locale = 'en'
+} = defineProps<{
+  open?: boolean
+  navigating?: boolean
+  links?: NavLink[]
+  ctaLinks?: CtaLink[]
+  locale?: Locale
+}>()
+
+const emit = defineEmits<{
+  close: []
+}>()
+
+const menuRef = ref<HTMLElement | undefined>()
+const activeSection = ref<string | null>(null)
+
+const activeSectionItems = computed(
+  () => links.find((l) => l.label === activeSection.value)?.items
+)
+
+function onNavigate() {
+  activeSection.value = null
+  emit('close')
+}
+
+const FOCUSABLE =
+  'a[href], button:not([disabled]), input:not([disabled]), [tabindex]:not([tabindex="-1"])'
+
+function trapFocus(e: KeyboardEvent) {
+  if (e.key !== 'Tab') return
+  const menu = menuRef.value
+  if (!menu) return
+  const focusable = [...menu.querySelectorAll<HTMLElement>(FOCUSABLE)]
+  if (!focusable.length) return
+  const first = focusable[0]
+  const last = focusable[focusable.length - 1]
+  if (e.shiftKey && document.activeElement === first) {
+    e.preventDefault()
+    last.focus()
+  } else if (!e.shiftKey && document.activeElement === last) {
+    e.preventDefault()
+    first.focus()
+  }
+}
+
+watch(
+  () => open,
+  async (isOpen) => {
+    if (isOpen) {
+      lockScroll()
+      await nextTick()
+      const menu = menuRef.value
+      const firstFocusable = menu?.querySelector<HTMLElement>(FOCUSABLE)
+      firstFocusable?.focus()
+      menu?.addEventListener('keydown', trapFocus)
+    } else {
+      menuRef.value?.removeEventListener('keydown', trapFocus)
+      unlockScroll({ skipRestore: navigating })
+    }
+  }
+)
+
+onUnmounted(() => {
+  menuRef.value?.removeEventListener('keydown', trapFocus)
+  if (open) unlockScroll({ skipRestore: true })
+})
+</script>
+
+<template>
+  <div
+    v-show="open"
+    id="site-mobile-menu"
+    ref="menuRef"
+    role="dialog"
+    aria-modal="true"
+    :inert="!open"
+    :aria-label="t('nav.menu', locale)"
+    class="bg-primary-comfy-ink fixed inset-0 z-40 flex flex-col px-6 pt-24 pb-8 lg:hidden"
+  >
+    <!-- Main list -->
+    <template v-if="!activeSection">
+      <div class="flex flex-1 flex-col gap-8">
+        <template v-for="link in links" :key="link.label">
+          <button
+            v-if="link.items"
+            class="text-primary-comfy-canvas text-left text-3xl font-medium"
+            @click="activeSection = link.label"
+          >
+            {{ link.label }}
+          </button>
+          <a
+            v-else
+            :href="link.href"
+            class="text-primary-comfy-canvas text-3xl font-medium"
+            @click="onNavigate"
+          >
+            {{ link.label }}
+          </a>
+        </template>
+      </div>
+
+      <div class="flex flex-col gap-3">
+        <BrandButton
+          v-for="cta in ctaLinks"
+          :key="cta.href"
+          :href="cta.href"
+          :variant="cta.primary ? 'solid' : 'outline'"
+          size="lg"
+          class="w-full"
+        >
+          {{ cta.label }}
+        </BrandButton>
+      </div>
+    </template>
+
+    <!-- Drill-down sub-menu -->
+    <template v-else>
+      <div class="flex flex-1 flex-col">
+        <button
+          class="text-primary-comfy-yellow mb-6 flex items-center gap-2 text-sm font-bold tracking-wide uppercase"
+          @click="activeSection = null"
+        >
+          <span
+            aria-hidden="true"
+            class="bg-primary-comfy-yellow size-3 -translate-y-px rotate-180"
+            style="
+              mask: url('/icons/arrow-right.svg') center / contain no-repeat;
+            "
+          />
+          {{ t('nav.back', locale) }}
+        </button>
+
+        <p class="text-primary-warm-gray mb-8 text-sm font-bold uppercase">
+          {{ activeSection }}
+        </p>
+
+        <div class="flex flex-col gap-8 pl-2">
+          <a
+            v-for="item in activeSectionItems"
+            :key="item.href"
+            :href="item.href"
+            class="text-primary-comfy-canvas flex items-center gap-3 text-3xl font-medium"
+            @click="onNavigate"
+          >
+            {{ item.label }}
+            <span
+              v-if="item.badge"
+              class="bg-primary-comfy-yellow font-formula-narrow text-primary-comfy-ink -skew-x-12 rounded-sm px-1 py-0.5 text-xs font-semibold"
+            >
+              <span class="ppformula-text-center inline-block skew-x-12">{{
+                item.badge
+              }}</span>
+            </span>
+            <img
+              v-if="item.external"
+              src="/icons/arrow-up-right.svg"
+              alt=""
+              class="size-5"
+              aria-hidden="true"
+            />
+          </a>
+        </div>
+      </div>
+    </template>
+  </div>
+</template>

apps/website/src/components/common/NavDesktopLink.vue

@@ -0,0 +1,129 @@
+<script setup lang="ts">
+import { cn } from '@comfyorg/tailwind-utils'
+
+type NavDropdownItem = {
+  label: string
+  href: string
+  badge?: string
+  external?: boolean
+}
+
+export type NavLink = {
+  label: string
+  href?: string
+  items?: NavDropdownItem[]
+}
+
+const {
+  link,
+  currentPath,
+  isOpen = false
+} = defineProps<{
+  link: NavLink
+  currentPath: string
+  isOpen?: boolean
+}>()
+
+const emit = defineEmits<{
+  (e: 'open', label: string): void
+  (e: 'close'): void
+  (e: 'toggle', label: string): void
+}>()
+</script>
+
+<template>
+  <div
+    class="relative"
+    @mouseenter="link.items?.length && emit('open', link.label)"
+    @mouseleave="emit('close')"
+    @focusin="link.items?.length && emit('open', link.label)"
+    @focusout="emit('close')"
+  >
+    <button
+      v-if="link.items?.length"
+      type="button"
+      :class="
+        cn(
+          'group flex cursor-pointer items-center gap-1.5 py-3 text-sm font-bold tracking-wide uppercase transition-colors',
+          link.items.some((item) => currentPath === item.href)
+            ? 'text-primary-comfy-yellow'
+            : 'text-primary-comfy-canvas hover:text-primary-warm-gray'
+        )
+      "
+      aria-haspopup="true"
+      :aria-expanded="isOpen"
+      @click="emit('toggle', link.label)"
+    >
+      {{ link.label }}
+      <span
+        aria-hidden="true"
+        :class="
+          cn(
+            'text-base leading-none transition-colors',
+            link.items.some((item) => currentPath === item.href)
+              ? 'text-primary-comfy-yellow'
+              : 'text-primary-comfy-canvas group-hover:text-primary-warm-gray'
+          )
+        "
+      >
+        ▾
+      </span>
+    </button>
+
+    <a
+      v-else
+      :href="link.href"
+      :aria-current="currentPath === link.href ? 'page' : undefined"
+      :class="
+        cn(
+          'flex items-center gap-1.5 py-3 text-sm font-bold tracking-wide uppercase transition-colors',
+          currentPath === link.href
+            ? 'text-primary-comfy-yellow'
+            : 'text-primary-comfy-canvas hover:text-primary-warm-gray'
+        )
+      "
+    >
+      {{ link.label }}
+    </a>
+
+    <div
+      v-if="link.items?.length"
+      v-show="isOpen"
+      data-testid="nav-dropdown"
+      class="bg-transparency-ink-t80 absolute top-full left-0 w-max rounded-xl p-2 shadow-lg backdrop-blur-2xl backdrop-saturate-150"
+    >
+      <a
+        v-for="item in link.items"
+        :key="item.href"
+        :href="item.href"
+        :aria-current="currentPath === item.href ? 'page' : undefined"
+        :class="
+          cn(
+            'flex items-center gap-2 rounded-sm p-2 text-xs font-medium tracking-wide transition-colors',
+            currentPath === item.href
+              ? 'text-primary-comfy-yellow'
+              : 'text-primary-comfy-canvas hover:bg-transparency-white-t4 hover:text-white'
+          )
+        "
+        @click="emit('close')"
+      >
+        {{ item.label }}
+        <span
+          v-if="item.badge"
+          class="bg-primary-comfy-yellow font-formula-narrow text-primary-comfy-ink -skew-x-12 rounded-sm px-1 py-0.5 text-[9px]/3 leading-none font-bold"
+        >
+          <span class="ppformula-text-center inline-block skew-x-12">{{
+            item.badge
+          }}</span>
+        </span>
+        <img
+          v-if="item.external"
+          src="/icons/arrow-up-right.svg"
+          alt=""
+          class="ml-auto size-4"
+          aria-hidden="true"
+        />
+      </a>
+    </div>
+  </div>
+</template>

apps/website/src/components/common/PillButton.stories.ts

@@ -1,10 +1,10 @@
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 
-import ButtonPill from './ButtonPill.vue'
+import PillButton from './PillButton.vue'
 
-const meta: Meta<typeof ButtonPill> = {
-  title: 'Website/UI/ButtonPill',
-  component: ButtonPill,
+const meta: Meta<typeof PillButton> = {
+  title: 'Website/Common/PillButton',
+  component: PillButton,
   tags: ['autodocs'],
   decorators: [
     () => ({
@@ -12,19 +12,22 @@ const meta: Meta<typeof ButtonPill> = {
     })
   ],
   argTypes: {
-    as: {
+    href: { control: 'text' },
+    target: { control: 'text' },
+    rel: { control: 'text' },
+    type: {
       control: { type: 'select' },
-      options: ['button', 'a']
+      options: ['button', 'submit', 'reset']
     },
-    asChild: { control: 'boolean' },
     disabled: { control: 'boolean' },
+    ariaLabel: { control: 'text' },
     variant: {
       control: { type: 'select' },
       options: ['solid', 'ghost']
     },
     size: {
       control: { type: 'select' },
-      options: ['default', 'lg', 'icon']
+      options: ['sm', 'md', 'lg']
     },
     iconPosition: {
       control: { type: 'select' },
@@ -38,57 +41,57 @@ export default meta
 type Story = StoryObj<typeof meta>
 
 export const AsAnchor: Story = {
-  args: { as: 'a', href: '#' },
+  args: { href: '#' },
   render: (args) => ({
-    components: { ButtonPill },
+    components: { PillButton },
     setup: () => ({ args }),
-    template: `<ButtonPill v-bind="args">Let's Collaborate</ButtonPill>`
+    template: `<PillButton v-bind="args">Let's Collaborate</PillButton>`
   })
 }
 
 export const AsButton: Story = {
-  args: { as: 'button', type: 'button' },
+  args: { type: 'button' },
   render: (args) => ({
-    components: { ButtonPill },
+    components: { PillButton },
     setup: () => ({ args }),
-    template: '<ButtonPill v-bind="args">Submit</ButtonPill>'
+    template: '<PillButton v-bind="args">Submit</PillButton>'
   })
 }
 
 export const Ghost: Story = {
-  args: { as: 'a', href: '#', variant: 'ghost' },
+  args: { href: '#', variant: 'ghost' },
   render: (args) => ({
-    components: { ButtonPill },
+    components: { PillButton },
     setup: () => ({ args }),
-    template: '<ButtonPill v-bind="args">Read More</ButtonPill>'
+    template: '<PillButton v-bind="args">Read More</PillButton>'
   })
 }
 
-export const DefaultSolid: Story = {
-  args: { as: 'a', href: '#', size: 'default' },
+export const SmallSolid: Story = {
+  args: { href: '#', size: 'sm' },
   render: (args) => ({
-    components: { ButtonPill },
+    components: { PillButton },
     setup: () => ({ args }),
-    template: '<ButtonPill v-bind="args">Try Workflow</ButtonPill>'
+    template: '<PillButton v-bind="args">Try Workflow</PillButton>'
   })
 }
 
 export const LargeSolid: Story = {
-  args: { as: 'a', href: '#', size: 'lg' },
+  args: { href: '#', size: 'lg' },
   render: (args) => ({
-    components: { ButtonPill },
+    components: { PillButton },
     setup: () => ({ args }),
-    template: `<ButtonPill v-bind="args">Let's Collaborate</ButtonPill>`
+    template: `<PillButton v-bind="args">Let's Collaborate</PillButton>`
   })
 }
 
 export const WithCustomIcon: Story = {
-  args: { as: 'a', href: '#' },
+  args: { href: '#' },
   render: (args) => ({
-    components: { ButtonPill },
+    components: { PillButton },
     setup: () => ({ args }),
     template: `
-      <ButtonPill v-bind="args">
+      <PillButton v-bind="args">
         Next Step
         <template #icon>
           <svg
@@ -103,55 +106,57 @@ export const WithCustomIcon: Story = {
             <polyline points="9 6 15 12 9 18" />
           </svg>
         </template>
-      </ButtonPill>
+      </PillButton>
     `
   })
 }
 
 export const IconLeft: Story = {
-  args: { as: 'a', href: '#', iconPosition: 'left' },
+  args: { href: '#', iconPosition: 'left' },
   render: (args) => ({
-    components: { ButtonPill },
+    components: { PillButton },
     setup: () => ({ args }),
-    template: '<ButtonPill v-bind="args">Go Back</ButtonPill>'
+    template: '<PillButton v-bind="args">Go Back</PillButton>'
   })
 }
 
 export const RevealLabelOnHover: Story = {
-  args: { as: 'a', href: '#', hideLabel: true },
+  args: { href: '#', hideLabel: true },
   render: (args) => ({
-    components: { ButtonPill },
+    components: { PillButton },
     setup: () => ({ args }),
-    template: '<ButtonPill v-bind="args">Try Workflow</ButtonPill>'
+    template: '<PillButton v-bind="args">Try Workflow</PillButton>'
   })
 }
 
 export const Disabled: Story = {
   args: { disabled: true },
   render: (args) => ({
-    components: { ButtonPill },
+    components: { PillButton },
     setup: () => ({ args }),
-    template: '<ButtonPill v-bind="args">Unavailable</ButtonPill>'
+    template: '<PillButton v-bind="args">Unavailable</PillButton>'
   })
 }
 
 export const AllVariants: Story = {
   render: () => ({
-    components: { ButtonPill },
+    components: { PillButton },
     template: `
       <div class="flex flex-col gap-8">
         <div class="flex flex-col gap-3">
           <span class="text-primary-comfy-canvas text-xs uppercase tracking-wider">Solid</span>
           <div class="flex flex-wrap items-center gap-4">
-            <ButtonPill as="a" href="#" variant="solid" size="default">Default</ButtonPill>
-            <ButtonPill as="a" href="#" variant="solid" size="lg">Large</ButtonPill>
+            <PillButton href="#" variant="solid" size="sm">Small</PillButton>
+            <PillButton href="#" variant="solid" size="md">Medium</PillButton>
+            <PillButton href="#" variant="solid" size="lg">Large</PillButton>
           </div>
         </div>
         <div class="flex flex-col gap-3">
           <span class="text-primary-comfy-canvas text-xs uppercase tracking-wider">Ghost</span>
           <div class="flex flex-wrap items-center gap-4">
-            <ButtonPill as="a" href="#" variant="ghost" size="default">Default</ButtonPill>
-            <ButtonPill as="a" href="#" variant="ghost" size="lg">Large</ButtonPill>
+            <PillButton href="#" variant="ghost" size="sm">Small</PillButton>
+            <PillButton href="#" variant="ghost" size="md">Medium</PillButton>
+            <PillButton href="#" variant="ghost" size="lg">Large</PillButton>
           </div>
         </div>
       </div>

apps/website/src/components/common/PillButton.vue

@@ -0,0 +1,84 @@
+<script setup lang="ts">
+import { cn } from '@comfyorg/tailwind-utils'
+
+import type { HTMLAttributes } from 'vue'
+
+import type { PillButtonVariants } from './pillButton.variants'
+import {
+  pillButtonBadgeVariants,
+  pillButtonVariants
+} from './pillButton.variants'
+
+const {
+  href,
+  target,
+  rel,
+  type = 'button',
+  disabled,
+  ariaLabel,
+  variant,
+  size,
+  iconPosition,
+  hideLabel = false,
+  class: customClass = ''
+} = defineProps<{
+  href?: string
+  target?: string
+  rel?: string
+  type?: 'button' | 'submit' | 'reset'
+  disabled?: boolean
+  ariaLabel?: string
+  variant?: PillButtonVariants['variant']
+  size?: PillButtonVariants['size']
+  iconPosition?: PillButtonVariants['iconPosition']
+  hideLabel?: boolean
+  class?: HTMLAttributes['class']
+}>()
+</script>
+
+<template>
+  <component
+    :is="href ? 'a' : 'button'"
+    :href="href || undefined"
+    :target="href ? target : undefined"
+    :rel="href ? rel : undefined"
+    :type="!href ? type : undefined"
+    :disabled="!href ? disabled : undefined"
+    :aria-label="ariaLabel"
+    :class="
+      cn(pillButtonVariants({ variant, size, iconPosition }), customClass)
+    "
+  >
+    <span
+      :class="
+        cn(
+          'relative leading-none transition-all duration-500',
+          hideLabel && 'opacity-0 group-hover:opacity-100'
+        )
+      "
+    >
+      <slot />
+    </span>
+    <span
+      :class="pillButtonBadgeVariants({ variant, size, iconPosition })"
+      aria-hidden="true"
+    >
+      <span class="inline-flex transition-transform duration-500">
+        <slot name="icon">
+          <svg
+            viewBox="0 0 24 24"
+            fill="none"
+            stroke="currentColor"
+            stroke-width="2"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            class="size-4"
+          >
+            <path d="M7 17 17 7" />
+            <path d="M7 7h10v10" />
+          </svg>
+        </slot>
+      </span>
+    </span>
+  </component>
+</template>

apps/website/src/components/common/SectionHeader.vue

@@ -7,14 +7,12 @@ const {
   label,
   headingTag = 'h2',
   maxWidth = 'lg',
-  headingSize = 'section',
-  align = 'center'
+  headingSize = 'section'
 } = defineProps<{
   label?: string
   headingTag?: 'h1' | 'h2' | 'h3'
   maxWidth?: 'md' | 'lg' | 'xl'
   headingSize?: 'section' | 'hero'
-  align?: 'center' | 'start'
 }>()
 
 const maxWidthClass = {
@@ -30,14 +28,7 @@ const headingSizeClass = {
 </script>
 
 <template>
-  <div
-    :class="
-      cn(
-        maxWidthClass[maxWidth],
-        align === 'center' ? 'mx-auto text-center' : 'text-left'
-      )
-    "
-  >
+  <div :class="cn('mx-auto text-center', maxWidthClass[maxWidth])">
     <SectionLabel v-if="label">{{ label }}</SectionLabel>
     <component
       :is="headingTag"

apps/website/src/components/common/SiteFooter.vue

@@ -37,15 +37,13 @@ const topColumns: { title: string; links: FooterLink[] }[] = [
       { label: t('nav.comfyLocal', locale), href: routes.download },
       { label: t('nav.comfyCloud', locale), href: routes.cloud },
       { label: t('nav.comfyApi', locale), href: routes.api },
-      { label: t('nav.comfyEnterprise', locale), href: routes.cloudEnterprise },
-      { label: t('nav.mcpServer', locale), href: routes.mcp }
+      { label: t('nav.comfyEnterprise', locale), href: routes.cloudEnterprise }
     ]
   },
   {
     title: t('footer.resources', locale),
     links: [
       { label: t('nav.learning', locale), href: routes.learning },
-      { label: t('nav.launches', locale), href: routes.launches },
       {
         label: t('footer.blog', locale),
         href: externalLinks.blog,
@@ -111,7 +109,7 @@ const contactColumn: { title: string; links: FooterLink[] } = {
 <template>
   <footer
     ref="footerRef"
-    class="bg-primary-comfy-ink px-6 py-8 text-primary-comfy-canvas lg:px-20"
+    class="bg-primary-comfy-ink text-primary-comfy-canvas px-6 py-8 lg:px-20"
   >
     <div
       class="border-primary-warm-gray grid gap-12 border-t pt-16 lg:grid-cols-2 lg:gap-4"

apps/website/src/components/common/SiteNav.vue

@@ -0,0 +1,262 @@
+<script setup lang="ts">
+import { cn } from '@comfyorg/tailwind-utils'
+import {
+  breakpointsTailwind,
+  useBreakpoints,
+  useEventListener,
+  whenever
+} from '@vueuse/core'
+import { nextTick, onMounted, ref } from 'vue'
+
+import type { Locale } from '../../i18n/translations'
+import { t } from '../../i18n/translations'
+import { externalLinks, getRoutes } from '../../config/routes'
+import BrandButton from './BrandButton.vue'
+import GitHubStarBadge from './GitHubStarBadge.vue'
+import MobileMenu from './MobileMenu.vue'
+import NavDesktopLink from './NavDesktopLink.vue'
+import type { NavLink } from './NavDesktopLink.vue'
+
+const { locale = 'en', githubStars = '' } = defineProps<{
+  locale?: Locale
+  githubStars?: string
+}>()
+const routes = getRoutes(locale)
+
+const navLinks: NavLink[] = [
+  {
+    label: t('nav.products', locale),
+    items: [
+      { label: t('nav.comfyLocal', locale), href: routes.download },
+      { label: t('nav.comfyCloud', locale), href: routes.cloud },
+      {
+        label: t('nav.comfyApi', locale),
+        href: routes.api,
+        badge: t('nav.badgeNew', locale)
+      },
+      { label: t('nav.comfyEnterprise', locale), href: routes.cloudEnterprise }
+    ]
+  },
+  { label: t('nav.pricing', locale), href: routes.cloudPricing },
+  {
+    label: t('nav.community', locale),
+    items: [
+      {
+        label: t('nav.comfyHub', locale),
+        href: externalLinks.workflows,
+        badge: t('nav.badgeNew', locale)
+      },
+      { label: t('nav.gallery', locale), href: routes.gallery }
+    ]
+  },
+  {
+    label: t('nav.resources', locale),
+    items: [
+      { label: t('nav.learning', locale), href: routes.learning },
+      {
+        label: t('nav.blogs', locale),
+        href: externalLinks.blog,
+        external: true
+      },
+      {
+        label: t('nav.github', locale),
+        href: externalLinks.github,
+        external: true
+      },
+      {
+        label: t('nav.discord', locale),
+        href: externalLinks.discord,
+        external: true
+      },
+      {
+        label: t('nav.docs', locale),
+        href: externalLinks.docs,
+        external: true
+      },
+      {
+        label: t('nav.youtube', locale),
+        href: externalLinks.youtube,
+        external: true
+      }
+    ]
+  },
+  {
+    label: t('nav.company', locale),
+    items: [
+      { label: t('nav.aboutUs', locale), href: routes.about },
+      { label: t('nav.careers', locale), href: routes.careers },
+      { label: t('nav.customerStories', locale), href: routes.customers }
+    ]
+  }
+]
+
+const ctaButtons = [
+  {
+    label: t('nav.downloadLocal', locale),
+    prefix: 'DOWNLOAD',
+    core: 'DESKTOP',
+    href: routes.download,
+    primary: false
+  },
+  {
+    label: t('nav.launchCloud', locale),
+    prefix: 'LAUNCH',
+    core: 'CLOUD',
+    href: externalLinks.cloud,
+    primary: true
+  }
+]
+
+const currentPath = ref('')
+const openDesktopDropdown = ref<string | null>(null)
+const mobileMenuOpen = ref(false)
+const isNavigating = ref(false)
+const hamburgerRef = ref<HTMLButtonElement | undefined>()
+
+function closeMobileMenu() {
+  mobileMenuOpen.value = false
+  hamburgerRef.value?.focus()
+}
+
+function toggleDesktopDropdown(label: string) {
+  openDesktopDropdown.value = openDesktopDropdown.value === label ? null : label
+}
+
+function onKeydown(e: KeyboardEvent) {
+  if (e.key === 'Escape') {
+    closeMobileMenu()
+    openDesktopDropdown.value = null
+  }
+}
+
+async function onNavigate() {
+  isNavigating.value = true
+  closeMobileMenu()
+  openDesktopDropdown.value = null
+  currentPath.value = window.location.pathname
+  await nextTick()
+  isNavigating.value = false
+}
+
+const breakpoints = useBreakpoints(breakpointsTailwind)
+const isDesktop = breakpoints.greaterOrEqual('lg')
+
+whenever(isDesktop, () => {
+  mobileMenuOpen.value = false
+  // Don't focus hamburger when transitioning to desktop — it's hidden
+})
+
+onMounted(() => {
+  currentPath.value = window.location.pathname
+  useEventListener(document, 'keydown', onKeydown)
+  useEventListener(document, 'astro:after-swap', onNavigate)
+})
+</script>
+
+<template>
+  <MobileMenu
+    :open="mobileMenuOpen"
+    :navigating="isNavigating"
+    :links="navLinks"
+    :cta-links="ctaButtons"
+    :locale="locale"
+    @close="closeMobileMenu"
+  />
+
+  <nav
+    class="fixed inset-x-0 top-0 z-50 flex items-center justify-between gap-4 bg-primary-comfy-ink px-6 py-5 lg:gap-4 lg:px-[clamp(0.25rem,4vw,5rem)] lg:py-8"
+    aria-label="Main navigation"
+  >
+    <a
+      :href="routes.home"
+      class="inline-grid h-10 shrink-0 grid-cols-1 grid-rows-1 transition-[width]"
+      aria-label="Comfy home"
+    >
+      <img
+        src="/icons/logomark.svg"
+        alt="Comfy"
+        class="col-span-full row-span-full h-8"
+      />
+      <div
+        class="relative col-span-full row-span-full h-10 w-0 overflow-clip transition-[width] xl:w-36"
+      >
+        <img
+          src="/icons/logo.svg"
+          alt="Comfy"
+          class="absolute top-0 left-0 h-10 w-36 max-w-none object-contain object-left"
+        />
+      </div>
+    </a>
+
+    <!-- Desktop nav links -->
+    <div
+      data-testid="desktop-nav-links"
+      class="hidden items-center gap-[clamp(1rem,2.5vw,2.5rem)] lg:flex"
+    >
+      <NavDesktopLink
+        v-for="link in navLinks"
+        :key="link.label"
+        :link="link"
+        :current-path="currentPath"
+        :is-open="openDesktopDropdown === link.label"
+        @open="openDesktopDropdown = $event"
+        @close="openDesktopDropdown = null"
+        @toggle="toggleDesktopDropdown"
+      />
+    </div>
+
+    <!-- Desktop CTA buttons -->
+    <div
+      data-testid="desktop-nav-cta"
+      class="hidden shrink-0 items-center gap-2 lg:flex"
+    >
+      <GitHubStarBadge v-if="githubStars" :stars="githubStars" />
+      <BrandButton
+        v-for="cta in ctaButtons"
+        :key="cta.href"
+        :href="cta.href"
+        :variant="cta.primary ? 'solid' : 'outline'"
+        size="nav"
+        :aria-label="cta.label"
+      >
+        <span
+          class="inline-block max-w-0 overflow-hidden align-bottom transition-[max-width] duration-300 ease-in-out xl:max-w-28"
+          aria-hidden="true"
+          >{{ cta.prefix }}&nbsp;</span
+        >{{ cta.core }}
+      </BrandButton>
+    </div>
+
+    <!-- Mobile hamburger -->
+    <button
+      ref="hamburgerRef"
+      :class="
+        cn(
+          'flex size-10 items-center justify-center rounded-xl lg:hidden',
+          mobileMenuOpen
+            ? 'border-primary-comfy-yellow border-2 bg-transparent'
+            : 'bg-primary-comfy-yellow'
+        )
+      "
+      :aria-label="t('nav.toggleMenu', locale)"
+      aria-controls="site-mobile-menu"
+      :aria-expanded="mobileMenuOpen"
+      @click="mobileMenuOpen = !mobileMenuOpen"
+    >
+      <img
+        v-if="!mobileMenuOpen"
+        src="/icons/breadthumb.svg"
+        alt=""
+        class="h-3"
+        aria-hidden="true"
+      />
+      <img
+        v-else
+        src="/icons/close.svg"
+        alt=""
+        class="size-5"
+        aria-hidden="true"
+      />
+    </button>
+  </nav>
+</template>

apps/website/src/components/common/VideoPlayer.vue

@@ -15,7 +15,7 @@ import { t } from '../../i18n/translations'
 import type { Locale } from '../../i18n/translations'
 import PlayPauseButton from './PlayPauseButton.vue'
 
-export type VideoTrack = {
+type VideoTrack = {
   src: string
   kind: 'subtitles' | 'captions' | 'descriptions'
   srclang: string
@@ -35,7 +35,7 @@ const {
   locale?: Locale
   src?: string
   poster?: string
-  tracks?: readonly VideoTrack[]
+  tracks?: VideoTrack[]
   autoplay?: boolean
   loop?: boolean
   minimal?: boolean

apps/website/src/components/common/badge.variants.ts

@@ -0,0 +1,17 @@
+import type { VariantProps } from 'cva'
+import { cva } from 'cva'
+
+export const badgeVariants = cva({
+  base: 'text-primary-warm-gray focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 inline-flex w-fit shrink-0 items-center justify-center gap-1 overflow-hidden rounded-full border border-transparent px-4 py-1 text-xs font-medium whitespace-nowrap transition-[color,box-shadow] focus-visible:ring-[3px] [&>svg]:pointer-events-none [&>svg]:size-3',
+  variants: {
+    variant: {
+      default: 'bg-transparency-ink-t80',
+      subtle: 'bg-transparency-white-t4 text-primary-comfy-canvas'
+    }
+  },
+  defaultVariants: {
+    variant: 'default'
+  }
+})
+
+export type BadgeVariants = VariantProps<typeof badgeVariants>

apps/website/src/components/common/maskRevealButton.variants.ts

@@ -0,0 +1,110 @@
+import type { VariantProps } from 'cva'
+import { cva } from 'cva'
+
+export const maskRevealButtonVariants = cva({
+  base: 'group relative uppercase inline-flex w-fit cursor-pointer items-center overflow-hidden rounded-lg p-1 font-bold text-nowrap transition-all duration-500 disabled:cursor-not-allowed disabled:opacity-50',
+  variants: {
+    variant: {
+      solid: 'bg-primary-comfy-yellow text-primary-comfy-ink',
+      ghost: 'text-primary-comfy-yellow bg-transparent'
+    },
+    size: {
+      sm: 'h-10 text-xs',
+      md: 'h-12 text-sm',
+      lg: 'h-14 text-base'
+    },
+    iconPosition: {
+      right: '',
+      left: ''
+    }
+  },
+  compoundVariants: [
+    { size: 'sm', iconPosition: 'right', class: 'ps-12 pe-4' },
+    { size: 'md', iconPosition: 'right', class: 'ps-14 pe-6' },
+    { size: 'lg', iconPosition: 'right', class: 'ps-16 pe-8' },
+    { size: 'sm', iconPosition: 'left', class: 'ps-4 pe-12' },
+    { size: 'md', iconPosition: 'left', class: 'ps-6 pe-14' },
+    { size: 'lg', iconPosition: 'left', class: 'ps-8 pe-16' }
+  ],
+  defaultVariants: {
+    variant: 'solid',
+    size: 'md',
+    iconPosition: 'right'
+  }
+})
+
+export const maskRevealButtonBadgeVariants = cva({
+  base: 'absolute z-10 flex items-center justify-center rounded-lg transition-all duration-500',
+  variants: {
+    variant: {
+      solid: 'bg-primary-comfy-ink text-primary-comfy-yellow',
+      ghost: 'bg-primary-comfy-yellow text-primary-comfy-ink'
+    },
+    size: {
+      sm: 'size-8',
+      md: 'size-10',
+      lg: 'size-12'
+    },
+    iconPosition: {
+      right: '',
+      left: ''
+    }
+  },
+  compoundVariants: [
+    {
+      size: 'sm',
+      iconPosition: 'right',
+      class: 'right-1 group-hover:right-[calc(100%-36px)]'
+    },
+    {
+      size: 'md',
+      iconPosition: 'right',
+      class: 'right-1 group-hover:right-[calc(100%-44px)]'
+    },
+    {
+      size: 'lg',
+      iconPosition: 'right',
+      class: 'right-1 group-hover:right-[calc(100%-52px)]'
+    },
+    {
+      size: 'sm',
+      iconPosition: 'left',
+      class: 'left-1 group-hover:left-[calc(100%-36px)]'
+    },
+    {
+      size: 'md',
+      iconPosition: 'left',
+      class: 'left-1 group-hover:left-[calc(100%-44px)]'
+    },
+    {
+      size: 'lg',
+      iconPosition: 'left',
+      class: 'left-1 group-hover:left-[calc(100%-52px)]'
+    }
+  ],
+  defaultVariants: {
+    variant: 'solid',
+    size: 'md',
+    iconPosition: 'right'
+  }
+})
+
+export const maskRevealLabelVariants = cva({
+  base: [
+    'relative inline-block align-baseline',
+    '[will-change:mask-size,-webkit-mask-size]',
+    '[mask-image:linear-gradient(black,black)] [-webkit-mask-image:linear-gradient(black,black)]',
+    'mask-no-repeat [-webkit-mask-repeat:no-repeat]',
+    'transition-[mask-size,-webkit-mask-size] duration-500 ease-in-out',
+    'data-[icon-position=right]:[mask-position:100%_0] data-[icon-position=right]:[-webkit-mask-position:100%_0]',
+    'data-[icon-position=left]:[mask-position:0_0] data-[icon-position=left]:[-webkit-mask-position:0_0]',
+    'data-[hidden=true]:[mask-size:0%_100%] data-[hidden=true]:[-webkit-mask-size:0%_100%]',
+    'data-[hidden=false]:[mask-size:100%_100%] data-[hidden=false]:[-webkit-mask-size:100%_100%]',
+    'group-hover:data-[hidden=true]:[mask-size:calc(100%_+_1px)_100%] group-hover:data-[hidden=true]:[-webkit-mask-size:calc(100%_+_1px)_100%]',
+    'group-focus-visible:data-[hidden=true]:[mask-size:calc(100%_+_1px)_100%] group-focus-visible:data-[hidden=true]:[-webkit-mask-size:calc(100%_+_1px)_100%]'
+  ].join(' ')
+})
+
+export type MaskRevealButtonVariants = VariantProps<
+  typeof maskRevealButtonVariants
+>

apps/website/src/components/common/pillButton.variants.ts

@@ -0,0 +1,116 @@
+import type { VariantProps } from 'cva'
+import { cva } from 'cva'
+
+export const pillButtonVariants = cva({
+  base: 'group relative inline-flex w-fit cursor-pointer items-center overflow-hidden rounded-lg p-1 font-bold text-nowrap transition-all duration-500 disabled:cursor-not-allowed disabled:opacity-50',
+  variants: {
+    variant: {
+      solid: 'bg-primary-comfy-yellow text-primary-comfy-ink',
+      ghost: 'text-primary-comfy-yellow bg-transparent'
+    },
+    size: {
+      sm: 'h-10 text-xs',
+      md: 'h-12 text-sm',
+      lg: 'h-14 text-base'
+    },
+    iconPosition: {
+      right: '',
+      left: ''
+    }
+  },
+  compoundVariants: [
+    {
+      size: 'sm',
+      iconPosition: 'right',
+      class: 'ps-4 pe-12 hover:ps-12 hover:pe-4'
+    },
+    {
+      size: 'md',
+      iconPosition: 'right',
+      class: 'ps-6 pe-14 hover:ps-14 hover:pe-6'
+    },
+    {
+      size: 'lg',
+      iconPosition: 'right',
+      class: 'ps-8 pe-16 hover:ps-16 hover:pe-8'
+    },
+    {
+      size: 'sm',
+      iconPosition: 'left',
+      class: 'ps-12 pe-4 hover:ps-4 hover:pe-12'
+    },
+    {
+      size: 'md',
+      iconPosition: 'left',
+      class: 'ps-14 pe-6 hover:ps-6 hover:pe-14'
+    },
+    {
+      size: 'lg',
+      iconPosition: 'left',
+      class: 'ps-16 pe-8 hover:ps-8 hover:pe-16'
+    }
+  ],
+  defaultVariants: {
+    variant: 'solid',
+    size: 'md',
+    iconPosition: 'right'
+  }
+})
+
+export const pillButtonBadgeVariants = cva({
+  base: 'absolute z-10 flex items-center justify-center rounded-lg transition-all duration-500',
+  variants: {
+    variant: {
+      solid: 'bg-primary-comfy-ink text-primary-comfy-yellow',
+      ghost: 'bg-primary-comfy-yellow text-primary-comfy-ink'
+    },
+    size: {
+      sm: 'size-8',
+      md: 'size-10',
+      lg: 'size-12'
+    },
+    iconPosition: {
+      right: '',
+      left: ''
+    }
+  },
+  compoundVariants: [
+    {
+      size: 'sm',
+      iconPosition: 'right',
+      class: 'right-1 group-hover:right-[calc(100%-36px)]'
+    },
+    {
+      size: 'md',
+      iconPosition: 'right',
+      class: 'right-1 group-hover:right-[calc(100%-44px)]'
+    },
+    {
+      size: 'lg',
+      iconPosition: 'right',
+      class: 'right-1 group-hover:right-[calc(100%-52px)]'
+    },
+    {
+      size: 'sm',
+      iconPosition: 'left',
+      class: 'left-1 group-hover:left-[calc(100%-36px)]'
+    },
+    {
+      size: 'md',
+      iconPosition: 'left',
+      class: 'left-1 group-hover:left-[calc(100%-44px)]'
+    },
+    {
+      size: 'lg',
+      iconPosition: 'left',
+      class: 'left-1 group-hover:left-[calc(100%-52px)]'
+    }
+  ],
+  defaultVariants: {
+    variant: 'solid',
+    size: 'md',
+    iconPosition: 'right'
+  }
+})
+
+export type PillButtonVariants = VariantProps<typeof pillButtonVariants>

apps/website/src/components/customers/ArticleNav.vue

@@ -1,100 +0,0 @@
-<script setup lang="ts">
-import { useEventListener, useIntersectionObserver } from '@vueuse/core'
-import { onMounted, ref } from 'vue'
-import type { ComponentProps } from 'vue-component-type-helpers'
-
-import { prefersReducedMotion } from '../../composables/useReducedMotion'
-import { scrollTo } from '../../scripts/smoothScroll'
-import CategoryNav from '../common/CategoryNav.vue'
-
-type Category = ComponentProps<typeof CategoryNav>['categories'][number]
-
-const { categories } = defineProps<{
-  categories: Category[]
-}>()
-
-const activeSection = ref(categories[0]?.value ?? '')
-
-const HEADER_OFFSET_PX = -144
-const BOTTOM_THRESHOLD_PX = 4
-const SCROLL_SAFETY_MS = 1500
-
-let isScrolling = false
-let scrollSafetyTimer: ReturnType<typeof setTimeout> | undefined
-
-function clearScrollLock() {
-  isScrolling = false
-  if (scrollSafetyTimer !== undefined) {
-    clearTimeout(scrollSafetyTimer)
-    scrollSafetyTimer = undefined
-  }
-}
-
-function isAtBottom(): boolean {
-  const scrollBottom = window.scrollY + window.innerHeight
-  return (
-    scrollBottom >= document.documentElement.scrollHeight - BOTTOM_THRESHOLD_PX
-  )
-}
-
-function activateLastIfAtBottom() {
-  if (isScrolling) return
-  if (!isAtBottom()) return
-  const lastId = categories[categories.length - 1]?.value
-  if (lastId) activeSection.value = lastId
-}
-
-function scrollToSection(id: string) {
-  activeSection.value = id
-  clearScrollLock()
-  isScrolling = true
-  scrollSafetyTimer = setTimeout(clearScrollLock, SCROLL_SAFETY_MS)
-  const el = document.getElementById(id)
-  if (el) {
-    scrollTo(el, {
-      offset: HEADER_OFFSET_PX,
-      duration: 0.8,
-      immediate: prefersReducedMotion(),
-      onComplete: clearScrollLock
-    })
-    return
-  }
-  clearScrollLock()
-}
-
-onMounted(() => {
-  // The section anchors live in the statically rendered article body, so the
-  // observer targets are resolved from the DOM by id rather than template refs.
-  const elements = categories
-    .map((category) => document.getElementById(category.value))
-    .filter((el): el is HTMLElement => el !== null)
-
-  useIntersectionObserver(
-    elements,
-    (entries) => {
-      if (isScrolling) return
-      if (isAtBottom()) return
-      let best: IntersectionObserverEntry | null = null
-      for (const entry of entries) {
-        if (!entry.isIntersecting) continue
-        if (!best || entry.boundingClientRect.top < best.boundingClientRect.top)
-          best = entry
-      }
-      if (best) activeSection.value = best.target.id
-    },
-    { rootMargin: '-20% 0px -60% 0px' }
-  )
-
-  activateLastIfAtBottom()
-})
-
-useEventListener('scroll', activateLastIfAtBottom, { passive: true })
-</script>
-
-<template>
-  <CategoryNav
-    :categories
-    :model-value="activeSection"
-    @update:model-value="scrollToSection"
-  />
-</template>

apps/website/src/components/customers/CustomerArticle.astro

@@ -1,68 +0,0 @@
----
-import { render } from 'astro:content'
-
-import type { Locale } from '../../i18n/translations'
-import type { CustomerStoryEntry } from '../../utils/customers'
-import ArticleNav from './ArticleNav.vue'
-import BulletList from './content/BulletList.astro'
-import Contributors from './content/Contributors.astro'
-import Figure from './content/Figure.astro'
-import Heading from './content/Heading.astro'
-import ListItem from './content/ListItem.astro'
-import Paragraph from './content/Paragraph.astro'
-import Quote from './content/Quote.astro'
-import ReadMore from './content/ReadMore.vue'
-import Section from './content/Section.astro'
-import Steps from './content/Steps.astro'
-
-interface Props {
-  entry: CustomerStoryEntry
-  locale?: Locale
-}
-
-const { entry, locale = 'en' } = Astro.props
-const { Content } = await render(entry)
-
-// The sidebar nav mirrors the section outline declared in frontmatter so it is
-// server-rendered, exactly like the previous ContentSection sidebar.
-const categories = entry.data.sections.map((section) => ({
-  label: section.label,
-  value: section.id
-}))
-
-// Markdown elements are mapped to the ported block styles; the named
-// components (Section, Figure, ...) are used directly inside the MDX body.
-const contentComponents = {
-  p: Paragraph,
-  h3: Heading,
-  ul: BulletList,
-  li: ListItem,
-  Section,
-  Figure,
-  Quote,
-  Contributors,
-  Steps
-}
----
-
-<section class="px-4 pt-8 pb-24 lg:px-20 lg:pt-24 lg:pb-40">
-  <div class="lg:flex lg:gap-16">
-    <aside class="hidden scrollbar-none lg:block lg:w-48 lg:shrink-0">
-      <div class="sticky top-32">
-        <ArticleNav
-          categories={categories}
-          client:media="(min-width: 1024px)"
-        />
-      </div>
-    </aside>
-
-    <div class="flex-1">
-      <Content components={contentComponents} />
-      {
-        entry.data.readMore && (
-          <ReadMore href={entry.data.readMore} locale={locale} />
-        )
-      }
-    </div>
-  </div>
-</section>

apps/website/src/components/customers/HeroSection.vue

@@ -58,13 +58,13 @@ function handleLogoLoad() {
         </SectionLabel>
         <h1
           ref="headingRef"
-          class="mt-4 text-4xl/tight font-light text-primary-comfy-canvas lg:text-6xl"
+          class="text-primary-comfy-canvas mt-4 text-4xl/tight font-light lg:text-6xl"
         >
           {{ t('customers.hero.heading', locale) }}
         </h1>
         <p
           ref="bodyRef"
-          class="mt-6 max-w-lg text-base text-primary-comfy-canvas"
+          class="text-primary-comfy-canvas mt-6 max-w-lg text-base"
         >
           {{ t('customers.hero.body', locale) }}
         </p>
@@ -72,12 +72,7 @@ function handleLogoLoad() {
     </div>
 
     <!-- Video -->
-
-    <div
-      id="hero-video"
-      ref="videoRef"
-      class="max-w-9xl mx-auto scroll-mt-24 px-4 pb-20 lg:scroll-mt-36 lg:px-20 lg:pb-40"
-    >
+    <div ref="videoRef" class="max-w-9xl mx-auto px-4 pb-20 lg:px-20 lg:pb-40">
       <VideoPlayer
         src="https://media.comfy.org/website/customers/blackmath/video.webm"
         poster="https://media.comfy.org/website/customers/blackmath/poster.webp"

apps/website/src/components/customers/StorySection.vue

@@ -1,12 +1,9 @@
 <script setup lang="ts">
+import { customerStories } from '../../config/customerStories'
 import type { Locale } from '../../i18n/translations'
 import { t } from '../../i18n/translations'
-import type { StoryCard } from '../../utils/customers'
 
-const { stories, locale = 'en' } = defineProps<{
-  stories: StoryCard[]
-  locale?: Locale
-}>()
+const { locale = 'en' } = defineProps<{ locale?: Locale }>()
 
 const prefix = locale === 'zh-CN' ? '/zh-CN' : ''
 </script>
@@ -16,7 +13,7 @@ const prefix = locale === 'zh-CN' ? '/zh-CN' : ''
     class="max-w-9xl mx-auto grid grid-cols-1 gap-6 px-6 py-16 lg:grid-cols-2 lg:px-16 lg:py-24"
   >
     <a
-      v-for="story in stories"
+      v-for="story in customerStories"
       :key="story.slug"
       :href="`${prefix}/customers/${story.slug}`"
       class="bg-transparency-white-t4 group flex flex-col overflow-hidden rounded-3xl transition-colors hover:bg-white/8"
@@ -25,7 +22,7 @@ const prefix = locale === 'zh-CN' ? '/zh-CN' : ''
       <div class="m-2 aspect-video overflow-hidden rounded-2xl">
         <div
           class="size-full rounded-2xl bg-white/5 bg-cover bg-center"
-          :style="{ backgroundImage: `url(${story.cover})` }"
+          :style="{ backgroundImage: `url(${story.image})` }"
         />
       </div>
 
@@ -35,12 +32,12 @@ const prefix = locale === 'zh-CN' ? '/zh-CN' : ''
           <span
             class="text-primary-comfy-yellow text-[10px] font-semibold tracking-widest uppercase"
           >
-            {{ story.category }}
+            {{ t(story.category, locale) }}
           </span>
           <h3
-            class="mt-2 text-lg/snug font-light text-primary-comfy-canvas lg:text-xl/snug"
+            class="text-primary-comfy-canvas mt-2 text-lg/snug font-light lg:text-xl/snug"
           >
-            {{ story.title }}
+            {{ t(story.title, locale) }}
           </h3>
         </div>
 

apps/website/src/components/customers/WhatsNextSection.vue

@@ -19,7 +19,7 @@ const {
 
 <template>
   <section class="px-4 py-16 lg:px-20 lg:py-24">
-    <h2 class="mb-10 text-2xl font-light text-primary-comfy-canvas lg:text-3xl">
+    <h2 class="text-primary-comfy-canvas mb-10 text-2xl font-light lg:text-3xl">
       {{ t('customers.story.whatsNext' as TranslationKey, locale) }}
     </h2>
 
@@ -35,18 +35,18 @@ const {
       </a>
 
       <div class="flex flex-col gap-6">
-        <h3 class="text-xl font-light text-primary-comfy-canvas lg:text-2xl">
+        <h3 class="text-primary-comfy-canvas text-xl font-light lg:text-2xl">
           {{ title }}
         </h3>
 
         <a :href="href" class="flex items-center gap-3">
           <span
-            class="bg-primary-comfy-yellow flex size-10 items-center justify-center rounded-full text-primary-comfy-ink"
+            class="bg-primary-comfy-yellow text-primary-comfy-ink flex size-10 items-center justify-center rounded-full"
           >
             <span class="text-lg font-bold">›</span>
           </span>
           <span
-            class="ppformula-text-center text-sm font-semibold tracking-wider text-primary-comfy-canvas uppercase"
+            class="text-primary-comfy-canvas ppformula-text-center text-sm font-semibold tracking-wider uppercase"
           >
             {{ t('customers.story.viewArticle' as TranslationKey, locale) }}
           </span>

apps/website/src/components/customers/content/BulletList.astro

@@ -1 +0,0 @@
-<ul class="mt-4 space-y-1 pl-5 text-sm"><slot /></ul>

apps/website/src/components/customers/content/Contributors.astro

@@ -1,38 +0,0 @@
----
-import { cn } from '@comfyorg/tailwind-utils'
-
-interface Person {
-  name: string
-  role: string
-}
-
-interface Props {
-  label: string
-  people: Person[]
-}
-
-const { label, people } = Astro.props
----
-
-<div class="mt-8 rounded-2xl bg-(--site-bg-soft) p-6">
-  <span
-    class="text-primary-comfy-yellow text-xs font-bold tracking-widest uppercase"
-  >
-    {label}
-  </span>
-  {
-    people.map((person, i) => (
-      <>
-        <p
-          class={cn(
-            'text-sm font-semibold text-primary-comfy-canvas',
-            i === 0 ? 'mt-2' : 'mt-4'
-          )}
-        >
-          {person.name}
-        </p>
-        <p class="text-xs text-primary-comfy-canvas">{person.role}</p>
-      </>
-    ))
-  }
-</div>

apps/website/src/components/customers/content/Figure.astro

@@ -1,20 +0,0 @@
----
-interface Props {
-  src: string
-  alt: string
-  caption?: string
-}
-
-const { src, alt, caption } = Astro.props
----
-
-<figure class="my-8">
-  <img src={src} alt={alt} class="w-full rounded-2xl object-cover" />
-  {
-    caption && (
-      <figcaption class="mt-3 text-xs text-primary-comfy-canvas">
-        {caption}
-      </figcaption>
-    )
-  }
-</figure>

apps/website/src/components/customers/content/Heading.astro

@@ -1,3 +0,0 @@
-<h3 class="text-primary-comfy-yellow mt-6 mb-2 text-lg font-semibold italic">
-  <slot />
-</h3>

apps/website/src/components/customers/content/ListItem.astro

@@ -1,5 +0,0 @@
-<li
-  class="flex items-start gap-2 text-primary-comfy-canvas before:mt-1.5 before:size-1.5 before:shrink-0 before:rounded-full before:bg-primary-comfy-yellow"
->
-  <slot />
-</li>

apps/website/src/components/customers/content/Paragraph.astro

@@ -1 +0,0 @@
-<p class="mt-4 text-sm/relaxed text-primary-comfy-canvas"><slot /></p>

apps/website/src/components/customers/content/Quote.astro

@@ -1,16 +0,0 @@
----
-interface Props {
-  name: string
-}
-
-const { name } = Astro.props
----
-
-<blockquote
-  class="border-primary-comfy-yellow my-8 rounded-2xl border-l-4 bg-(--site-bg-soft) p-8"
->
-  <p class="text-lg/relaxed font-light text-primary-comfy-canvas italic">
-    "<slot />"
-  </p>
-  <p class="text-primary-comfy-yellow mt-4 text-sm font-semibold">{name}</p>
-</blockquote>

apps/website/src/components/customers/content/ReadMore.vue

@@ -1,21 +0,0 @@
-<script setup lang="ts">
-import type { Locale } from '../../../i18n/translations'
-import { t } from '../../../i18n/translations'
-import Button from '../../ui/button/Button.vue'
-
-const { href, locale = 'en' } = defineProps<{
-  href: string
-  locale?: Locale
-}>()
-</script>
-
-<template>
-  <div class="mt-8 flex justify-center">
-    <Button as="a" :href variant="default" size="lg">
-      {{ t('customers.story.readMore', locale) }}
-      <template #append>
-        <span class="text-base" aria-hidden="true">↗</span>
-      </template>
-    </Button>
-  </div>
-</template>

apps/website/src/components/customers/content/Section.astro

@@ -1,17 +0,0 @@
----
-interface Props {
-  id: string
-  title?: string
-}
-
-const { id, title } = Astro.props
----
-
-<div id={id} class="mb-16 scroll-mt-24 lg:scroll-mt-36">
-  {
-    title && (
-      <h2 class="mb-6 text-2xl font-light text-primary-comfy-canvas">{title}</h2>
-    )
-  }
-  <slot />
-</div>

apps/website/src/components/customers/content/Steps.astro

@@ -1,17 +0,0 @@
----
-interface Props {
-  items: string[]
-}
-
-const { items } = Astro.props
----
-
-<ol class="mt-4 space-y-1 pl-1 text-sm [counter-reset:step]">
-  {
-    items.map((item) => (
-      <li class="flex items-start gap-3 text-primary-comfy-canvas [counter-increment:step] before:shrink-0 before:font-semibold before:tabular-nums before:text-primary-comfy-yellow before:content-[counter(step,_decimal-leading-zero)]">
-        {item}
-      </li>
-    ))
-  }
-</ol>

apps/website/src/components/demos/DemoNavSection.vue

@@ -21,7 +21,7 @@ const nextHref = `${localePrefix}/demos/${nextSlug}`
 
 <template>
   <section class="px-4 py-16 lg:px-20 lg:py-24">
-    <h2 class="mb-10 text-2xl font-light text-primary-comfy-canvas lg:text-3xl">
+    <h2 class="text-primary-comfy-canvas mb-10 text-2xl font-light lg:text-3xl">
       {{ t('demos.nav.nextDemo' as TranslationKey, locale) }}
     </h2>
 
@@ -37,18 +37,18 @@ const nextHref = `${localePrefix}/demos/${nextSlug}`
       </a>
 
       <div class="flex flex-col gap-6">
-        <h3 class="text-xl font-light text-primary-comfy-canvas lg:text-2xl">
+        <h3 class="text-primary-comfy-canvas text-xl font-light lg:text-2xl">
           {{ nextTitle }}
         </h3>
 
         <a :href="nextHref" class="flex items-center gap-3">
           <span
-            class="bg-primary-comfy-yellow flex size-10 items-center justify-center rounded-full text-primary-comfy-ink"
+            class="bg-primary-comfy-yellow text-primary-comfy-ink flex size-10 items-center justify-center rounded-full"
           >
             <span class="text-lg font-bold">›</span>
           </span>
           <span
-            class="ppformula-text-center text-sm font-semibold tracking-wider text-primary-comfy-canvas uppercase"
+            class="text-primary-comfy-canvas ppformula-text-center text-sm font-semibold tracking-wider uppercase"
           >
             {{ t('demos.nav.viewDemo' as TranslationKey, locale) }}
           </span>

apps/website/src/components/gallery/GalleryCard.vue

@@ -53,7 +53,7 @@ defineEmits<{ click: [] }>()
         <div class="flex w-full items-end justify-between p-4">
           <div class="gap-2">
             <p class="text-sm font-bold text-white">{{ item.title }}</p>
-            <p class="text-xs text-primary-comfy-canvas">
+            <p class="text-primary-comfy-canvas text-xs">
               <GalleryItemAttribution :item :locale />
             </p>
           </div>
@@ -82,7 +82,7 @@ defineEmits<{ click: [] }>()
     <!-- Mobile metadata -->
     <div v-if="mobile" class="mt-2 gap-2">
       <p class="text-sm font-bold text-white">{{ item.title }}</p>
-      <p class="text-xs text-primary-comfy-canvas">
+      <p class="text-primary-comfy-canvas text-xs">
         <GalleryItemAttribution :item :locale />
       </p>
     </div>

apps/website/src/components/icons/BreadthumbIcon.vue

@@ -1,20 +0,0 @@
-<script setup lang="ts">
-import type { HTMLAttributes } from 'vue'
-
-defineProps<{ class?: HTMLAttributes['class'] }>()
-</script>
-
-<template>
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    viewBox="0 0 20 12"
-    fill="none"
-    aria-hidden="true"
-    :class="$props.class"
-  >
-    <path
-      d="M20 1C20 1.55228 19.5523 2 19 2H17.5C16.6716 2 16 2.67157 16 3.5C16 4.32843 16.6716 5 17.5 5H19C19.5523 5 20 5.44772 20 6C20 6.55228 19.5523 7 19 7H7.5C6.67157 7 6 7.67157 6 8.5C6 9.32843 6.67157 10 7.5 10H19C19.5523 10 20 10.4477 20 11C20 11.5523 19.5523 12 19 12H1C0.447715 12 0 11.5523 0 11C0 10.4477 0.447715 10 1 10H2.5C3.32843 10 4 9.32843 4 8.5C4 7.67157 3.32843 7 2.5 7H1C0.447715 7 0 6.55228 0 6C0 5.44772 0.447715 5 1 5H12.5C13.3284 5 14 4.32843 14 3.5C14 2.67157 13.3284 2 12.5 2H1C0.447716 2 0 1.55228 0 1C0 0.447715 0.447715 0 1 0H19C19.5523 0 20 0.447715 20 1Z"
-      fill="currentColor"
-    />
-  </svg>
-</template>

apps/website/src/components/learning/FeaturedWorkflowSection.vue

@@ -2,7 +2,7 @@
 import type { Locale } from '../../i18n/translations'
 
 import { t } from '../../i18n/translations'
-import Badge from '../ui/badge/Badge.vue'
+import Badge from '../common/Badge.vue'
 import BrandButton from '../common/BrandButton.vue'
 import VideoPlayer from '../common/VideoPlayer.vue'
 

apps/website/src/components/learning/HeroSection.vue

@@ -11,7 +11,7 @@ const { locale = 'en' } = defineProps<{ locale?: Locale }>()
     class="max-w-9xl mx-auto flex flex-col items-center px-6 pt-24 pb-12 text-center"
   >
     <h1
-      class="max-w-4xl text-3xl leading-[110%] font-light tracking-tight text-primary-comfy-canvas lg:text-5xl"
+      class="text-primary-comfy-canvas max-w-4xl text-3xl leading-[110%] font-light tracking-tight lg:text-5xl"
     >
       {{ t('learning.heroTitle.before', locale) }}
       <span class="text-primary-comfy-yellow">ComfyUI</span

apps/website/src/components/learning/TutorialDetailDialog.vue

@@ -64,7 +64,6 @@ onUnmounted(() => {
           :locale
           :src="tutorial.videoSrc"
           :poster="tutorial.poster"
-          :tracks="tutorial.caption"
           autoplay
           class="w-full"
         />

apps/website/src/components/learning/TutorialsSection.vue

@@ -8,8 +8,8 @@ import {
   learningTutorials
 } from '../../data/learningTutorials'
 import { t } from '../../i18n/translations'
-import Badge from '../ui/badge/Badge.vue'
-import { ButtonMask } from '../ui/button-mask'
+import Badge from '../common/Badge.vue'
+import MaskRevealButton from '../common/MaskRevealButton.vue'
 import TutorialDetailDialog from './TutorialDetailDialog.vue'
 
 const { locale = 'en' } = defineProps<{ locale?: Locale }>()
@@ -76,14 +76,13 @@ const activeTutorial = () =>
               {{ t('learning.tutorials.titlePrefix', locale) }}<br />
               {{ tutorial.title[locale] }}
             </h3>
-            <ButtonMask
+            <MaskRevealButton
               v-if="tutorial.href"
-              as="a"
               :href="tutorial.href"
               icon-position="right"
               class="shrink-0"
               variant="ghost"
-              size="default"
+              size="sm"
             >
               {{ t('cta.tryWorkflow', locale) }}
               <template #icon>
@@ -99,7 +98,7 @@ const activeTutorial = () =>
                   <polyline points="9 6 15 12 9 18" />
                 </svg>
               </template>
-            </ButtonMask>
+            </MaskRevealButton>
           </div>
 
           <ul class="flex flex-wrap gap-2">

apps/website/src/components/pricing/PriceSection.vue

@@ -68,8 +68,7 @@ const plans: PricingPlan[] = [
       : undefined,
     features: [
       { text: 'pricing.plan.standard.feature1' },
-      { text: 'pricing.plan.standard.feature2' },
-      { text: 'pricing.plan.standard.feature3' }
+      { text: 'pricing.plan.standard.feature2' }
     ]
   },
   {
@@ -123,11 +122,11 @@ const enterprisePlan = plans.find((p) => p.isEnterprise)!
     <!-- Header -->
     <div class="mx-auto mb-8 max-w-3xl text-center lg:mb-10">
       <h1
-        class="font-formula text-4xl font-light text-primary-comfy-canvas lg:text-5xl"
+        class="text-primary-comfy-canvas font-formula text-4xl font-light lg:text-5xl"
       >
         {{ t('pricing.title', locale) }}
       </h1>
-      <p class="mt-3 text-base text-primary-comfy-canvas">
+      <p class="text-primary-comfy-canvas mt-3 text-base">
         {{ t('pricing.subtitle', locale) }}
       </p>
     </div>
@@ -157,7 +156,7 @@ const enterprisePlan = plans.find((p) => p.isEnterprise)!
               aria-hidden="true"
             />
             <span
-              class="bg-primary-comfy-yellow font-formula-narrow flex items-center px-2 text-sm font-bold tracking-wider text-primary-comfy-ink"
+              class="bg-primary-comfy-yellow font-formula-narrow text-primary-comfy-ink flex items-center px-2 text-sm font-bold tracking-wider"
             >
               <span class="ppformula-text-center">
                 {{ t('pricing.badge.popular', locale) }}
@@ -173,18 +172,18 @@ const enterprisePlan = plans.find((p) => p.isEnterprise)!
         </div>
 
         <!-- Summary -->
-        <p class="px-6 text-sm text-primary-comfy-canvas">
+        <p class="text-primary-comfy-canvas px-6 text-sm">
           {{ t(plan.summaryKey, locale) }}
         </p>
 
         <!-- Price -->
         <div v-if="plan.priceKey" class="flex items-baseline gap-1 px-6 pt-2">
           <span
-            class="font-formula text-5xl font-light text-primary-comfy-canvas"
+            class="text-primary-comfy-canvas font-formula text-5xl font-light"
           >
             {{ t(plan.priceKey, locale) }}
           </span>
-          <span class="text-sm text-primary-comfy-canvas">
+          <span class="text-primary-comfy-canvas text-sm">
             {{ t('pricing.plan.period', locale) }}
           </span>
         </div>
@@ -193,7 +192,7 @@ const enterprisePlan = plans.find((p) => p.isEnterprise)!
         <!-- Credits -->
         <p
           v-if="plan.creditsKey"
-          class="px-6 text-sm text-primary-comfy-canvas"
+          class="text-primary-comfy-canvas px-6 text-sm"
         >
           {{ t(plan.creditsKey, locale) }}
         </p>
@@ -202,7 +201,7 @@ const enterprisePlan = plans.find((p) => p.isEnterprise)!
         <!-- Estimate -->
         <p
           v-if="plan.estimateKey"
-          class="px-6 text-xs text-primary-comfy-canvas/80"
+          class="text-primary-comfy-canvas/80 px-6 text-xs"
         >
           {{ t(plan.estimateKey, locale) }}
         </p>
@@ -212,10 +211,17 @@ const enterprisePlan = plans.find((p) => p.isEnterprise)!
         <div v-if="plan.features.length" class="px-6 py-3">
           <p
             v-if="plan.featureIntroKey"
-            class="mb-2 text-sm font-semibold text-primary-comfy-canvas"
+            class="text-primary-comfy-canvas mb-2 text-sm font-semibold"
           >
             {{ t(plan.featureIntroKey, locale) }}
           </p>
+          <p
+            v-else
+            class="text-primary-comfy-canvas mb-2 text-sm font-semibold"
+            aria-hidden="true"
+          >
+            &nbsp;
+          </p>
           <ul class="space-y-2">
             <li
               v-for="feature in plan.features"
@@ -223,7 +229,7 @@ const enterprisePlan = plans.find((p) => p.isEnterprise)!
               class="flex items-start gap-2"
             >
               <span class="text-primary-comfy-yellow mt-0.5 text-sm">✓</span>
-              <span class="text-sm text-primary-comfy-canvas">
+              <span class="text-primary-comfy-canvas text-sm">
                 {{ t(feature.text, locale) }}
               </span>
             </li>
@@ -263,7 +269,7 @@ const enterprisePlan = plans.find((p) => p.isEnterprise)!
                 aria-hidden="true"
               />
               <span
-                class="bg-primary-comfy-yellow flex items-center px-2 text-[10px] font-bold tracking-wider text-primary-comfy-ink"
+                class="bg-primary-comfy-yellow text-primary-comfy-ink flex items-center px-2 text-[10px] font-bold tracking-wider"
               >
                 <span class="ppformula-text-center">
                   {{ t('pricing.badge.popular', locale) }}
@@ -281,13 +287,13 @@ const enterprisePlan = plans.find((p) => p.isEnterprise)!
           <!-- Enterprise heading -->
           <h2
             v-if="plan.isEnterprise"
-            class="mt-3 text-2xl font-light text-primary-comfy-canvas"
+            class="text-primary-comfy-canvas mt-3 text-2xl font-light"
           >
             {{ t('pricing.enterprise.heading', locale) }}
           </h2>
 
           <!-- Summary -->
-          <p class="mt-2 text-sm text-primary-comfy-canvas">
+          <p class="text-primary-comfy-canvas mt-2 text-sm">
             {{ t(plan.summaryKey, locale) }}
           </p>
 
@@ -295,25 +301,25 @@ const enterprisePlan = plans.find((p) => p.isEnterprise)!
           <template v-if="plan.priceKey">
             <div class="mt-6 flex items-baseline gap-1">
               <span
-                class="font-formula text-5xl font-light text-primary-comfy-canvas"
+                class="text-primary-comfy-canvas font-formula text-5xl font-light"
               >
                 {{ t(plan.priceKey, locale) }}
               </span>
-              <span class="text-sm text-primary-comfy-canvas/55">
+              <span class="text-primary-comfy-canvas/55 text-sm">
                 {{ t('pricing.plan.period', locale) }}
               </span>
             </div>
 
             <p
               v-if="plan.creditsKey"
-              class="mt-4 text-xs font-medium text-primary-comfy-canvas"
+              class="text-primary-comfy-canvas mt-4 text-xs font-medium"
             >
               {{ t(plan.creditsKey, locale) }}
             </p>
 
             <p
               v-if="plan.estimateKey"
-              class="mt-2 text-xs text-primary-comfy-canvas"
+              class="text-primary-comfy-canvas mt-2 text-xs"
             >
               {{ t(plan.estimateKey, locale) }}
             </p>
@@ -362,7 +368,7 @@ const enterprisePlan = plans.find((p) => p.isEnterprise)!
     >
       <!-- Left side -->
       <div
-        class="rounded-4.5xl flex w-full flex-col items-start justify-between gap-8 bg-primary-comfy-ink p-8"
+        class="bg-primary-comfy-ink rounded-4.5xl flex w-full flex-col items-start justify-between gap-8 p-8"
       >
         <div>
           <span
@@ -371,11 +377,11 @@ const enterprisePlan = plans.find((p) => p.isEnterprise)!
             {{ t(enterprisePlan.labelKey, locale) }}
           </span>
           <h2
-            class="mt-3 text-2xl font-light text-primary-comfy-canvas lg:text-3xl"
+            class="text-primary-comfy-canvas mt-3 text-2xl font-light lg:text-3xl"
           >
             {{ t('pricing.enterprise.heading', locale) }}
           </h2>
-          <p class="mt-3 text-sm text-primary-comfy-canvas">
+          <p class="text-primary-comfy-canvas mt-3 text-sm">
             {{ t(enterprisePlan.summaryKey, locale) }}
           </p>
         </div>
@@ -386,7 +392,7 @@ const enterprisePlan = plans.find((p) => p.isEnterprise)!
     </div>
 
     <!-- Footnote -->
-    <p class="mt-12 text-xs text-primary-comfy-canvas/70">
+    <p class="text-primary-comfy-canvas/70 mt-12 text-xs">
       {{ t('pricing.footnote', locale) }}
     </p>
   </section>

apps/website/src/components/pricing/WhatsIncludedSection.vue

@@ -54,11 +54,7 @@ const features: IncludedFeature[] = [
   },
   {
     titleKey: 'pricing.included.feature11.title',
-    descriptionKey: 'pricing.included.feature11.description'
-  },
-  {
-    titleKey: 'pricing.included.feature12.title',
-    descriptionKey: 'pricing.included.feature12.description',
+    descriptionKey: 'pricing.included.feature11.description',
     isComingSoon: true
   }
 ]
@@ -69,10 +65,10 @@ const features: IncludedFeature[] = [
     <div class="mx-auto w-full lg:grid lg:grid-cols-[280px_1fr] lg:gap-x-16">
       <!-- Heading -->
       <div
-        class="sticky top-20 mb-10 bg-primary-comfy-ink py-2 lg:top-28 lg:mb-0 lg:self-start"
+        class="bg-primary-comfy-ink sticky top-20 mb-10 py-2 lg:top-28 lg:mb-0 lg:self-start"
       >
         <h2
-          class="text-3xl/tight font-light whitespace-pre-line text-primary-comfy-canvas"
+          class="text-primary-comfy-canvas text-3xl/tight font-light whitespace-pre-line"
         >
           {{ t('pricing.included.heading', locale) }}
         </h2>
@@ -85,7 +81,7 @@ const features: IncludedFeature[] = [
           :key="feature.titleKey"
           :class="
             index < features.length - 1
-              ? 'border-b border-solid border-primary-comfy-canvas/15'
+              ? 'border-primary-comfy-canvas/15 border-b border-solid'
               : ''
           "
           class="py-8 first:pt-0 lg:grid lg:grid-cols-[200px_1fr] lg:gap-x-10"
@@ -103,14 +99,14 @@ const features: IncludedFeature[] = [
               v-else
               class="text-primary-comfy-yellow mt-0.5 size-4 shrink-0"
             />
-            <p class="text-sm font-medium text-primary-comfy-canvas">
+            <p class="text-primary-comfy-canvas text-sm font-medium">
               {{ t(feature.titleKey, locale) }}
             </p>
           </div>
 
           <!-- Description -->
           <p
-            class="mt-3 text-sm/relaxed text-primary-comfy-canvas/55 lg:mt-0"
+            class="text-primary-comfy-canvas/55 mt-3 text-sm/relaxed lg:mt-0"
             v-html="t(feature.descriptionKey, locale)"
           />
         </div>

apps/website/src/components/product/local/DownloadLocalButton.vue

@@ -72,7 +72,6 @@ const buttons = computed<ButtonSpec[]>(() => {
     size="lg"
     :class="customClass"
     :aria-label="btn.ariaLabel"
-    :data-astro-prefetch="btn.key === 'windows' ? 'false' : undefined"
     @click="captureDownloadClick(btn.key)"
   >
     <span class="inline-flex items-center gap-2">

apps/website/src/components/ui/badge/Badge.vue

@@ -1,40 +0,0 @@
-<script setup lang="ts">
-import type { Component } from 'vue'
-import { cn } from '@comfyorg/tailwind-utils'
-
-import type { BadgeVariants } from '.'
-import { badgeVariants } from '.'
-
-const {
-  variant,
-  size,
-  class: className,
-  prependIcon,
-  appendIcon
-} = defineProps<{
-  variant?: BadgeVariants['variant']
-  size?: BadgeVariants['size']
-  class?: string
-  prependIcon?: Component
-  appendIcon?: Component
-}>()
-</script>
-
-<template>
-  <span
-    data-slot="badge"
-    :data-variant="variant"
-    :data-size="size"
-    :class="cn(badgeVariants({ size, variant }), className)"
-  >
-    <slot name="prepend">
-      <component :is="prependIcon" v-if="prependIcon" />
-    </slot>
-    <span class="ppformula-text-center">
-      <slot />
-    </span>
-    <slot name="append">
-      <component :is="appendIcon" v-if="appendIcon" />
-    </slot>
-  </span>
-</template>

apps/website/src/components/ui/badge/index.ts

@@ -1,25 +0,0 @@
-import type { VariantProps } from 'cva'
-import { cva } from 'cva'
-
-export const badgeVariants = cva({
-  base: 'text-primary-warm-gray font-formula leading-none focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 inline-flex w-fit shrink-0 items-center justify-center gap-1 overflow-hidden rounded-full border border-transparent font-medium whitespace-nowrap transition-[color,box-shadow] focus-visible:ring-[3px] [&>svg]:pointer-events-none [&>svg]:size-3',
-  variants: {
-    size: {
-      md: 'px-4 py-1 text-xs',
-      xs: 'px-2 py-0.5 text-[9px]'
-    },
-    variant: {
-      default: 'bg-transparency-ink-t80',
-      subtle: 'bg-transparency-white-t4 text-primary-comfy-canvas',
-      category: 'text-primary-comfy-yellow px-0 font-semibold uppercase',
-      accent:
-        'before:bg-primary-comfy-yellow relative isolate overflow-visible rounded-none bg-transparent px-2 py-0.5 text-[9px] font-bold tracking-wide text-primary-comfy-ink uppercase before:absolute before:inset-0 before:-z-10 before:-skew-x-12 before:rounded-sm'
-    }
-  },
-  defaultVariants: {
-    size: 'md',
-    variant: 'default'
-  }
-})
-
-export type BadgeVariants = VariantProps<typeof badgeVariants>

apps/website/src/components/ui/button-mask/ButtonMask.vue

@@ -1,65 +0,0 @@
-<script setup lang="ts">
-import { cn } from '@comfyorg/tailwind-utils'
-import { ChevronRight } from '@lucide/vue'
-import { Primitive } from 'reka-ui'
-import type { PrimitiveProps } from 'reka-ui'
-
-import type { HTMLAttributes } from 'vue'
-
-import type { ButtonMaskVariants } from '.'
-import {
-  BUTTON_MASK_LABEL_CLASS,
-  buttonMaskBadgeVariants,
-  buttonMaskVariants
-} from '.'
-
-interface Props extends PrimitiveProps {
-  variant?: ButtonMaskVariants['variant']
-  size?: ButtonMaskVariants['size']
-  iconPosition?: ButtonMaskVariants['iconPosition']
-  hideLabel?: boolean
-  class?: HTMLAttributes['class']
-  disabled?: boolean
-}
-
-const {
-  as = 'button',
-  asChild,
-  variant,
-  size,
-  iconPosition,
-  hideLabel = true,
-  class: className,
-  disabled
-} = defineProps<Props>()
-</script>
-
-<template>
-  <Primitive
-    data-slot="button-mask"
-    :data-variant="variant"
-    :data-size="size"
-    :as
-    :as-child
-    :disabled
-    :class="cn(buttonMaskVariants({ variant, size, iconPosition }), className)"
-  >
-    <span
-      :data-icon-position="iconPosition ?? 'right'"
-      :data-hidden="hideLabel ? 'true' : 'false'"
-      :class="BUTTON_MASK_LABEL_CLASS"
-    >
-      <slot />
-    </span>
-    <span
-      :class="buttonMaskBadgeVariants({ variant, size, iconPosition })"
-      aria-hidden="true"
-    >
-      <span class="inline-flex transition-transform duration-500">
-        <slot name="icon">
-          <ChevronRight class="size-4" :stroke-width="2" />
-        </slot>
-      </span>
-    </span>
-  </Primitive>
-</template>