mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2024-12-02 07:53:55 +03:00
Merged origin/master into Fix file name and path stylesCSS fixes
This commit is contained in:
commit
3fc932f387
@ -8,7 +8,6 @@
|
|||||||
import CommitListHeader from './CommitListHeader.svelte';
|
import CommitListHeader from './CommitListHeader.svelte';
|
||||||
import type { CommitType } from './commitList';
|
import type { CommitType } from './commitList';
|
||||||
import CommitListFooter from './CommitListFooter.svelte';
|
import CommitListFooter from './CommitListFooter.svelte';
|
||||||
import { onMount } from 'svelte';
|
|
||||||
|
|
||||||
export let branch: Branch;
|
export let branch: Branch;
|
||||||
export let githubContext: GitHubIntegrationContext | undefined;
|
export let githubContext: GitHubIntegrationContext | undefined;
|
||||||
@ -26,7 +25,6 @@
|
|||||||
export let resetHeadCommit: () => void;
|
export let resetHeadCommit: () => void;
|
||||||
|
|
||||||
let viewport: HTMLDivElement;
|
let viewport: HTMLDivElement;
|
||||||
let height: number;
|
|
||||||
let headerHeight: number;
|
let headerHeight: number;
|
||||||
|
|
||||||
$: headCommit = branch.commits[0];
|
$: headCommit = branch.commits[0];
|
||||||
@ -43,18 +41,13 @@
|
|||||||
$: pr$ = prService.get(branch.upstreamName);
|
$: pr$ = prService.get(branch.upstreamName);
|
||||||
|
|
||||||
let expanded = true;
|
let expanded = true;
|
||||||
|
|
||||||
onMount(() => {
|
|
||||||
height = viewport?.offsetHeight;
|
|
||||||
});
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if commits.length > 0}
|
{#if commits.length > 0}
|
||||||
<div
|
<div
|
||||||
class="commit-list"
|
class="commit-list"
|
||||||
bind:this={viewport}
|
bind:this={viewport}
|
||||||
style:height={`${height}px`}
|
style:min-height={expanded ? `${2 * headerHeight}px` : undefined}
|
||||||
style:min-height={`${2 * headerHeight}px`}
|
|
||||||
>
|
>
|
||||||
<CommitListHeader bind:expanded {branch} {pr$} {type} {base} bind:height={headerHeight} />
|
<CommitListHeader bind:expanded {branch} {pr$} {type} {base} bind:height={headerHeight} />
|
||||||
{#if expanded}
|
{#if expanded}
|
||||||
|
Loading…
Reference in New Issue
Block a user