Skip to content

Modern Docker Management, Designed for Everyone

fix: button flex 'bouncy' layout issue

Kyle Mendell51977fc0a8cb
diff --git a/frontend/src/lib/components/arcane-button/arcane-button.svelte b/frontend/src/lib/components/arcane-button/arcane-button.svelte
index 11e3cbf55..c2be0bd35 100644
--- a/frontend/src/lib/components/arcane-button/arcane-button.svelte
+++ b/frontend/src/lib/components/arcane-button/arcane-button.svelte
@@ -105,10 +105,9 @@
<Spinner class="size-4" />
</div>
<span class="sr-only">{m.common_loading_label({ label: displayLoadingLabel })}</span>
- {#if !isIconOnlyButton && displayLabel}
- <span class="opacity-0">{displayLabel}</span>
- {/if}
- {:else}
+ {/if}
+
+ <span class={cn('flex items-center gap-2', loading && 'opacity-0')}>
{#if IconComponent}
<IconComponent class="size-4" />
{/if}
@@ -116,5 +115,5 @@
{displayLabel}
{/if}
{@render children?.()}
- {/if}
+ </span>
</svelte:element>
diff --git a/frontend/src/lib/components/arcane-button/variants.ts b/frontend/src/lib/components/arcane-button/variants.ts
index efd57282f..ae80846b7 100644
--- a/frontend/src/lib/components/arcane-button/variants.ts
+++ b/frontend/src/lib/components/arcane-button/variants.ts
@@ -52,9 +52,9 @@ export const arcaneButtonVariants = tv({
link: 'border-transparent bg-transparent text-primary underline-offset-4 hover:underline shadow-none hover:shadow-none'
},
size: {
- default: 'h-9 px-4 py-2 has-[>svg]:px-3',
- sm: 'h-8 gap-1.5 rounded-md px-3 has-[>svg]:px-2.5',
- lg: 'h-10 rounded-md px-5 has-[>svg]:px-4',
+ default: 'h-9 px-4 py-2 has-[svg]:px-3',
+ sm: 'h-8 gap-1.5 rounded-md px-3 has-[svg]:px-2.5',
+ lg: 'h-10 rounded-md px-5 has-[svg]:px-4',
icon: 'size-9'
},
hoverEffect: {
diff --git a/frontend/src/lib/components/ui/button/button.svelte b/frontend/src/lib/components/ui/button/button.svelte
index a7b335e62..ef786c2b7 100644
--- a/frontend/src/lib/components/ui/button/button.svelte
+++ b/frontend/src/lib/components/ui/button/button.svelte
@@ -17,9 +17,9 @@
link: 'text-primary underline-offset-4 hover:underline'
},
size: {
- default: 'h-9 px-4 py-2 has-[>svg]:px-3',
- sm: 'h-8 gap-1.5 rounded-lg px-3 has-[>svg]:px-2.5',
- lg: 'h-10 rounded-lg px-6 has-[>svg]:px-4',
+ default: 'h-9 px-4 py-2 has-[svg]:px-3',
+ sm: 'h-8 gap-1.5 rounded-lg px-3 has-[svg]:px-2.5',
+ lg: 'h-10 rounded-lg px-6 has-[svg]:px-4',
icon: 'size-9'
},
hoverEffect: {
diff --git a/frontend/src/lib/components/ui/input-group/input-group-button.svelte b/frontend/src/lib/components/ui/input-group/input-group-button.svelte
index 3411bfbf0..a30c621da 100644
--- a/frontend/src/lib/components/ui/input-group/input-group-button.svelte
+++ b/frontend/src/lib/components/ui/input-group/input-group-button.svelte
@@ -5,10 +5,10 @@
base: 'flex items-center gap-2 text-sm shadow-none',
variants: {
size: {
- xs: "h-6 gap-1 rounded-[calc(var(--radius)-5px)] px-2 has-[>svg]:px-2 [&>svg:not([class*='size-'])]:size-3.5",
- sm: 'h-8 gap-1.5 rounded-md px-2.5 has-[>svg]:px-2.5',
- 'icon-xs': 'size-6 rounded-[calc(var(--radius)-5px)] p-0 has-[>svg]:p-0',
- 'icon-sm': 'size-8 p-0 has-[>svg]:p-0'
+ xs: "h-6 gap-1 rounded-[calc(var(--radius)-5px)] px-2 has-[svg]:px-2 [&>svg:not([class*='size-'])]:size-3.5",
+ sm: 'h-8 gap-1.5 rounded-md px-2.5 has-[svg]:px-2.5',
+ 'icon-xs': 'size-6 rounded-[calc(var(--radius)-5px)] p-0 has-[svg]:p-0',
+ 'icon-sm': 'size-8 p-0 has-[svg]:p-0'
}
},
defaultVariants: {