gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-20 08:01:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

lint fixes

Browse Source
This commit is contained in:
Pavel Laptev 2024-02-07 15:42:14 +01:00 committed by GitButler
parent 448be7fb20
commit 97cd4053a7
2 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
gitbutler-ui/src/lib/components/BranchLane.svelte
View File

@ -103,9 +103,7 @@
selectable={$commitBoxOpen && !isUnapplied}
on:close={() => {
const selectedId = selected?.id;
selectedFiles.update((fileIds) =>
fileIds.filter((file) => file.id != selectedId)
);
selectedFiles.update((fileIds) => fileIds.filter((file) => file.id != selectedId));
}}
/>
<Resizer
@ -124,43 +122,43 @@
</div>
<style lang="postcss">
.wrapper {
display: flex;
height: 100%;
align-items: self-start;
flex-shrink: 0;
position: relative;
--target-branch-background: var(--clr-theme-container-pale);
--selected-resize-shift: 0;
--selected-target-branch-right-padding: 0;
--selected-opacity: 1;
background-color: var(--target-branch-background);
}
.wrapper {
display: flex;
height: 100%;
align-items: self-start;
flex-shrink: 0;
position: relative;
--target-branch-background: var(--clr-theme-container-pale);
--selected-resize-shift: 0;
--selected-target-branch-right-padding: 0;
--selected-opacity: 1;
background-color: var(--target-branch-background);
}
.target-branch {
--target-branch-background: color-mix(
in srgb,
var(--clr-theme-scale-pop-60) 15%,
var(--clr-theme-container-pale)
);
}
.target-branch {
--target-branch-background: color-mix(
in srgb,
var(--clr-theme-scale-pop-60) 15%,
var(--clr-theme-container-pale)
);
}
.selected {
--selected-resize-shift: calc(var(--space-6) * -1);
--selected-target-branch-right-padding: calc(var(--space-4) * -1);
--selected-opacity: 0;
}
.selected {
--selected-resize-shift: calc(var(--space-6) * -1);
--selected-target-branch-right-padding: calc(var(--space-4) * -1);
--selected-opacity: 0;
}
.file-preview {
display: flex;
position: relative;
height: 100%;
.file-preview {
display: flex;
position: relative;
height: 100%;
overflow: hidden;
align-items: self-start;
overflow: hidden;
align-items: self-start;
padding: var(--space-12) var(--space-12) var(--space-12) 0;
border-right: 1px solid var(--clr-theme-container-outline-light);
margin-left: var(--selected-target-branch-right-padding);
}
padding: var(--space-12) var(--space-12) var(--space-12) 0;
border-right: 1px solid var(--clr-theme-container-outline-light);
margin-left: var(--selected-target-branch-right-padding);
}
</style>

4
gitbutler-ui/src/lib/components/FileCardHeader.svelte
View File

@ -44,11 +44,11 @@
icon="locked-small"
color="warning"
help="File changes cannot be moved because part of this file was already committed into this branch"
border>Locked</Tag
>Locked</Tag
>
{/if}
{#if file.conflicted}
<Tag icon="warning-small" color="error" border>Has conflicts</Tag>
<Tag icon="warning-small" color="error">Has conflicts</Tag>
{/if}
</div>
{/if}