From 1b1459ee55fe3b33639b763b97db0e3c0bdc68eb Mon Sep 17 00:00:00 2001 From: Kiril Videlov Date: Tue, 28 Mar 2023 16:18:04 +0200 Subject: [PATCH] fix some merge issues --- src/lib/components/Button.svelte | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/lib/components/Button.svelte b/src/lib/components/Button.svelte index fda94af51..36a7602d2 100644 --- a/src/lib/components/Button.svelte +++ b/src/lib/components/Button.svelte @@ -35,8 +35,8 @@ And the following optional props: : filled ? 'default-filled' : 'default-nofill'} - {small ? 'short' : ''} - {wide ? 'wide' : ''} + {small ? 'height-small' : 'height-normal'} + {wide ? 'width-normal' : 'width-small'} " type="button" on:click @@ -94,13 +94,16 @@ And the following optional props: } /* Size */ - .size-normal { - @apply px-4 py-2; + .height-normal { + @apply py-2; } - .size-small { - @apply px-2 py-1; + .height-small { + @apply py-1; } - .wide { - width: 119.5px; + .width-normal { + @apply px-[42.75px]; + } + .width-small { + @apply px-[16px]; }