Skip to content

Commit 7744bc6

Browse files
Merge remote-tracking branch 'origin/main' into feat/website-brand-portal
2 parents 9165731 + 0103899 commit 7744bc6

35 files changed

Lines changed: 2537 additions & 179 deletions

.github/workflows/pr-cursor-review.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
# SHA-pinned per zizmor `unpinned-uses: hash-pin`. Bump this SHA to pick up
3030
# upstream changes; keep `workflows_ref` matching so prompts/scripts load
3131
# from the same commit as the workflow definition.
32-
uses: Comfy-Org/github-workflows/.github/workflows/cursor-review.yml@047ca48febe3a6647608ed2e0c4331b491cb9d6a # github-workflows#9
32+
uses: Comfy-Org/github-workflows/.github/workflows/cursor-review.yml@df507e6bae179c567ad3849370f99dae588985dc # github-workflows main (df507e6)
3333
with:
3434
# Overriding diff_excludes replaces the reusable default wholesale, so
3535
# this restates the generated/vendored defaults and adds this repo's heavy
@@ -48,7 +48,7 @@ jobs:
4848
:!**/*-snapshots/**
4949
:!src/workbench/extensions/manager/types/generatedManagerTypes.ts
5050
# Load the prompts/scripts from the same ref as `uses:`.
51-
workflows_ref: 047ca48febe3a6647608ed2e0c4331b491cb9d6a
51+
workflows_ref: df507e6bae179c567ad3849370f99dae588985dc
5252
secrets:
5353
CURSOR_API_KEY: ${{ secrets.CURSOR_API_KEY }}
5454
# Optional — enables start/complete Slack DMs to the triggerer.

apps/website/e2e/cloud.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ test.describe('Cloud page @smoke', () => {
4040
}
4141
})
4242

43-
test('AIModelsSection heading and 5 model cards are visible', async ({
43+
test('AIModelsSection heading and 6 model cards are visible', async ({
4444
page
4545
}) => {
4646
const heading = page.getByRole('heading', { name: /leading AI models/i })
@@ -49,7 +49,7 @@ test.describe('Cloud page @smoke', () => {
4949
const section = heading.locator('xpath=ancestor::section')
5050
const grid = section.locator('.grid')
5151
const modelCards = grid.locator('a[href="https://comfy.org/workflows"]')
52-
await expect(modelCards).toHaveCount(5)
52+
await expect(modelCards).toHaveCount(6)
5353
})
5454

5555
test('AIModelsSection CTA links to workflows', async ({ page }) => {
4 Bytes
Loading
-224 Bytes
Loading
1.07 KB
Loading
833 Bytes
Loading

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const ctaButtons = [
3333

3434
<template>
3535
<nav
36-
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"
36+
class="sticky 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"
3737
aria-label="Main navigation"
3838
>
3939
<a

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,12 @@ const { title, description, cta, href, bg } = defineProps<{
3030
<p class="text-sm text-white/70">
3131
{{ description }}
3232
</p>
33-
<Button as="span" variant="default" size="sm" class="mt-4">
33+
<Button
34+
as="span"
35+
variant="default"
36+
size="sm"
37+
class="mt-4 h-auto whitespace-normal"
38+
>
3439
{{ cta }}
3540
</Button>
3641
</div>
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<script setup lang="ts">
2+
import type { PrimitiveProps } from 'reka-ui'
3+
import type { HTMLAttributes } from 'vue'
4+
import type { IconButtonVariants } from '.'
5+
import { Primitive } from 'reka-ui'
6+
import { cn } from '@comfyorg/tailwind-utils'
7+
import { iconButtonVariants } from '.'
8+
9+
interface Props extends PrimitiveProps {
10+
variant?: IconButtonVariants['variant']
11+
size?: IconButtonVariants['size']
12+
class?: HTMLAttributes['class']
13+
disabled?: boolean
14+
}
15+
16+
const {
17+
as = 'button',
18+
asChild,
19+
variant,
20+
size,
21+
class: className,
22+
disabled
23+
} = defineProps<Props>()
24+
</script>
25+
26+
<template>
27+
<Primitive
28+
data-slot="icon-button"
29+
:data-variant="variant"
30+
:data-size="size"
31+
:as
32+
:as-child
33+
:disabled
34+
:class="cn(iconButtonVariants({ variant, size }), className)"
35+
>
36+
<slot />
37+
</Primitive>
38+
</template>
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import type { VariantProps } from 'class-variance-authority'
2+
import { cva } from 'class-variance-authority'
3+
4+
export const iconButtonVariants = cva(
5+
[
6+
'focus-visible:border-primary-comfy-yellow focus-visible:ring-primary-comfy-yellow/50 inline-flex shrink-0 cursor-pointer items-center justify-center rounded-2xl transition-all duration-200 outline-none focus-visible:ring-3 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0'
7+
],
8+
{
9+
variants: {
10+
variant: {
11+
ghost:
12+
'text-primary-warm-white hover:text-primary-comfy-yellow bg-transparent',
13+
outline:
14+
'text-primary-comfy-yellow hover:bg-primary-comfy-yellow border-primary-comfy-yellow border-2 bg-primary-comfy-ink hover:text-primary-comfy-ink'
15+
},
16+
size: {
17+
sm: 'size-8',
18+
default: 'size-10',
19+
lg: 'size-14'
20+
}
21+
},
22+
defaultVariants: {
23+
variant: 'ghost',
24+
size: 'default'
25+
}
26+
}
27+
)
28+
export type IconButtonVariants = VariantProps<typeof iconButtonVariants>

0 commit comments

Comments
 (0)