Skip to content

Commit 4bf7b3a

Browse files
committed
Merge remote-tracking branch 'upstream/main' into fix-a11y-extract-btn-component
2 parents cd95139 + 3cf7fef commit 4bf7b3a

File tree

12 files changed

+293
-151
lines changed

12 files changed

+293
-151
lines changed

app/components/Button/Base.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ defineExpose({
3535
:class="{
3636
'text-sm px-4 py-2': size === 'medium',
3737
'text-xs px-2 py-0.5': size === 'small',
38-
'bg-transparent text-fg hover:enabled:(bg-fg/30) focus-visible:enabled:(bg-fg/30)':
38+
'bg-transparent text-fg hover:enabled:(bg-fg/10) focus-visible:enabled:(bg-fg/10)':
3939
variant === 'secondary',
4040
'text-bg bg-fg hover:enabled:(bg-fg/50) focus-visible:enabled:(bg-fg/50)':
4141
variant === 'primary',

app/components/Modal.client.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ defineExpose({
4343
<dialog
4444
ref="dialogRef"
4545
closedby="any"
46-
class="w-full bg-bg border border-border rounded-lg shadow-xl max-h-[90vh] overflow-y-auto overscroll-contain m-0 m-auto p-6 text-fg focus-visible:outline focus-visible:outline-accent/70"
46+
class="w-[calc(100%-2rem)] bg-bg border border-border rounded-lg shadow-xl max-h-[90vh] overflow-y-auto overscroll-contain m-0 m-auto p-6 text-fg focus-visible:outline focus-visible:outline-accent/70"
4747
:aria-labelledby="modalTitleId"
4848
v-bind="$attrs"
4949
@transitionend="onDialogTransitionEnd"

0 commit comments

Comments
 (0)