Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const forwarded = useForwardPropsEmits(reactiveOmit(props, 'class'), emits)
data-slot="checkbox"
:class="
cn(
'inline-flex size-4 shrink-0 cursor-pointer items-center justify-center rounded-sm border bg-transparent text-background transition-colors outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:border-primary data-[state=checked]:bg-primary data-[state=indeterminate]:border-primary data-[state=indeterminate]:bg-primary',
'inline-flex size-4 shrink-0 cursor-pointer items-center justify-center rounded-sm border bg-transparent text-background transition-colors outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:border-foreground data-[state=checked]:bg-foreground data-[state=indeterminate]:border-foreground data-[state=indeterminate]:bg-foreground',
props.class
)
"
Expand Down
2 changes: 1 addition & 1 deletion packages/design-system/src/components/field/FieldLabel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const { class: className } = defineProps<{
cn(
'group/field-label peer/field-label flex w-fit gap-2 leading-snug group-data-[disabled=true]/field:opacity-50',
'has-[>[data-slot=field]]:w-full has-[>[data-slot=field]]:flex-col has-[>[data-slot=field]]:rounded-md has-[>[data-slot=field]]:border *:data-[slot=field]:p-4',
'has-data-[state=checked]:border-primary has-data-[state=checked]:bg-primary/10',
'has-data-[state=checked]:border-foreground has-data-[state=checked]:bg-foreground/10',
className
)
"
Expand Down
2 changes: 1 addition & 1 deletion packages/design-system/src/components/knob/Knob.vue
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ function onKeydown(event: KeyboardEvent) {
stroke-linecap="round"
stroke-dasharray="75 100"
:stroke-dashoffset="dashOffset"
class="text-primary"
class="text-foreground"
/>
</svg>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@
:class="cn('group', selectItemVariants({ layout: 'multi' }))"
>
<div
class="flex size-4 shrink-0 items-center justify-center rounded-sm transition-all duration-200 group-data-[state=checked]:bg-primary group-data-[state=unchecked]:bg-secondary [&>span]:flex"
class="flex size-4 shrink-0 items-center justify-center rounded-sm transition-all duration-200 group-data-[state=checked]:bg-foreground group-data-[state=unchecked]:bg-secondary [&>span]:flex"
>
<ComboboxItemIndicator>
<i
class="icon-[lucide--check] text-xs font-bold text-foreground"
class="icon-[lucide--check] text-xs font-bold text-background"
/>
</ComboboxItemIndicator>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ const forwarded = useForwardPropsEmits(reactiveOmit(props, 'class'), emits)
data-slot="radio-group-item"
:class="
cn(
'inline-flex size-4 shrink-0 cursor-pointer items-center justify-center rounded-full border bg-transparent outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:border-primary',
'inline-flex size-4 shrink-0 cursor-pointer items-center justify-center rounded-full border bg-transparent outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:border-foreground',
props.class
)
"
>
<slot>
<RadioGroupIndicator class="size-2 rounded-full bg-primary" />
<RadioGroupIndicator class="size-2 rounded-full bg-foreground" />
</slot>
</RadioGroupItem>
</template>
4 changes: 2 additions & 2 deletions packages/design-system/src/components/slider/Slider.vue
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits)
data-slot="slider-range"
:class="
cn(
'absolute bg-muted-foreground data-[orientation=horizontal]:h-full data-[orientation=vertical]:w-full',
'absolute bg-foreground data-[orientation=horizontal]:h-full data-[orientation=vertical]:w-full',
props.rangeClass
)
"
Expand All @@ -78,7 +78,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits)
data-slot="slider-thumb"
:class="
cn(
'block size-3.5 shrink-0 rounded-full bg-muted-foreground shadow-sm ring-foreground transition-[color,box-shadow]',
'block size-3.5 shrink-0 rounded-full bg-foreground shadow-sm ring-foreground transition-[color,box-shadow]',
'cursor-grab',
'before:absolute before:-inset-1 before:block before:rounded-full before:bg-transparent',
'hover:ring-2 focus-visible:ring-2 focus-visible:outline-hidden disabled:pointer-events-none disabled:opacity-50',
Expand Down
2 changes: 1 addition & 1 deletion packages/design-system/src/components/switch/Switch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function updateModelValue(value: boolean) {
@update:model-value="updateModelValue"
>
<span
class="pointer-events-none inline-flex h-5 w-9 items-center rounded-full border border-transparent bg-border px-0.5 transition-colors group-data-[state=checked]:bg-primary"
class="pointer-events-none inline-flex h-5 w-9 items-center rounded-full border border-transparent bg-border px-0.5 transition-colors group-data-[state=checked]:bg-foreground"
>
<SwitchThumb
class="pointer-events-none block size-4 rounded-full bg-background shadow-sm transition-transform data-[state=checked]:translate-x-3.5 data-[state=unchecked]:translate-x-0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export const toggleGroupItemVariants = cva({
'transition-all duration-150 ease-in-out',
'focus-visible:ring-1 focus-visible:ring-ring focus-visible:outline-none',
'disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50',
'data-[state=on]:bg-secondary data-[state=on]:text-foreground'
'data-[state=on]:bg-foreground/10 data-[state=on]:text-foreground'
],
variants: {
variant: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ const textMap: Record<ControlOptions, string | null> = {
:aria-label="t('widgets.valueControl.' + mode)"
:class="
cn(
'flex shrink-0 cursor-pointer items-center justify-center border-none focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-offset-1 focus-visible:outline-none',
'flex shrink-0 cursor-pointer items-center justify-center border-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:outline-none',
'h-5 w-9 rounded-full',
mode !== 'fixed'
? 'bg-primary/30 hover:bg-primary/27'
? 'bg-foreground/10 hover:bg-foreground/20'
: 'bg-transparent'
)
"
Expand All @@ -47,11 +47,11 @@ const textMap: Record<ControlOptions, string | null> = {
cn(
iconMap[mode] ?? '',
'size-3.5',
mode === 'fixed' ? 'text-muted-foreground' : 'text-primary'
mode === 'fixed' ? 'text-muted-foreground' : 'text-foreground'
)
"
/>
<span v-else-if="textMap[mode]" class="text-xs font-normal text-primary">
<span v-else-if="textMap[mode]" class="text-xs font-normal text-foreground">
{{ textMap[mode] }}
</span>
</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ const inputAttrs = computed(() => ({
class="pointer-events-none absolute inset-0 -z-10 overflow-clip rounded-md"
>
<div
class="size-full bg-primary/15"
class="size-full bg-foreground/10"
:style="{ width: `${sliderWidth}%` }"
/>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<div
v-if="isFilterable"
ref="searchInputContainerRef"
class="m-1 flex items-center gap-2 rounded-md border px-2 py-1.5 transition-colors focus-within:border-primary"
class="m-1 flex items-center gap-2 rounded-md border px-2 py-1.5 transition-colors focus-within:border-ring"
>
<i
class="icon-[lucide--search] text-sm text-muted-foreground"
Expand Down Expand Up @@ -144,7 +144,7 @@
cn(
'flex h-8 w-full cursor-pointer items-center justify-between gap-3 rounded-sm p-2 outline-none select-none',
'hover:bg-secondary data-highlighted:bg-secondary',
'data-[state=checked]:bg-primary/20 data-[state=checked]:hover:bg-primary/20 data-[state=checked]:data-highlighted:bg-primary/30'
'data-[state=checked]:bg-foreground/10 data-[state=checked]:hover:bg-foreground/10 data-[state=checked]:data-highlighted:bg-foreground/20'
)
"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,10 @@ function handleVideoLoad(event: Event) {
v-if="selected"
:aria-label="t('g.selected')"
role="img"
class="absolute top-1 left-1 size-4 rounded-full border border-foreground bg-primary"
class="absolute top-1 left-1 size-4 rounded-full border border-foreground bg-foreground"
>
<i
class="bold icon-[lucide--check] size-3 translate-y-[-0.5px] text-foreground"
class="bold icon-[lucide--check] size-3 translate-y-[-0.5px] text-background"
aria-hidden="true"
/>
</div>
Expand Down
Loading