gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-11-09 16:24:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix some merge issues

Browse Source
This commit is contained in:
Kiril Videlov 2023-03-28 16:18:04 +02:00
parent 7e4156a414
commit 5b87728c74
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib/components/Button.svelte
View File

@ -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];
}
</style>