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

"unnaply and drop changes" update copy, update modals UI and layout (#5092)

Browse Source 
* update copy, update modals UI and layout

* Update BranchLaneContextMenu.svelte
This commit is contained in:
Pavel Laptev 2024-10-10 16:39:07 +02:00 committed by GitHub
parent 7c178734ce
commit 56d0fe44c8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/desktop/src/lib/branch/BranchLaneContextMenu.svelte
View File

@ -180,7 +180,6 @@
<Modal
width="small"
title="Delete branch"
bind:this={deleteBranchModal}
onSubmit={async (close) => {
try {
@ -193,10 +192,12 @@
}}
>
{#snippet children(branch)}
Are you sure you want to delete <code class="code-string">{branch.name}</code>?
All changes will be lost for <strong>{branch.name}</strong>. Are you sure you want to continue?
{/snippet}
{#snippet controls(close)}
<Button style="ghost" outline onclick={close}>Cancel</Button>
<Button style="error" kind="solid" type="submit" loading={isDeleting}>Delete</Button>
<Button style="error" kind="solid" type="submit" loading={isDeleting}
>Unapply and drop changes</Button
>
{/snippet}
</Modal>

1
apps/desktop/src/lib/branch/BranchPreviewHeader.svelte
View File

@ -148,7 +148,6 @@
<Modal
width="small"
title="Delete branch"
bind:this={deleteBranchModal}
onSubmit={async (close) => {
try {

6
apps/desktop/src/lib/stack/StackHeader.svelte
View File

@ -122,6 +122,7 @@
<Button
bind:el={meatballButtonEl}
style="ghost"
size="tag"
icon="kebab"
onclick={() => {
contextMenu?.toggle();
@ -150,7 +151,6 @@
height: auto;
}
}
.header.card {
border-bottom-right-radius: 0px;
border-bottom-left-radius: 0px;
@ -205,7 +205,7 @@
.header__info-wrapper {
display: flex;
gap: 2px;
padding: 10px;
padding: 12px;
}
.header__info {
flex: 1;
@ -218,7 +218,7 @@
.button-group {
display: flex;
align-items: center;
gap: 10px;
gap: 6px;
}
.draggable {