From a460b9352ec1d22cffbb86b56ac56ce09dc603dc Mon Sep 17 00:00:00 2001 From: Alexis Sellier Date: Mon, 14 Jun 2021 14:54:31 +0200 Subject: [PATCH] Show last commit on blobs --- src/base/projects/Blob.svelte | 23 +++++++++++++++++++++-- src/base/projects/Browser.svelte | 6 +++--- src/project.ts | 2 +- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/base/projects/Blob.svelte b/src/base/projects/Blob.svelte index 42eb159c2..965cf442b 100644 --- a/src/base/projects/Blob.svelte +++ b/src/base/projects/Blob.svelte @@ -3,6 +3,7 @@ export let blob: Blob; + const lastCommit = blob.info.lastCommit; const lines = (blob.content.match(/\n/g) || []).length; const lineNumbers = Array(lines).fill(0).map((_, index) => (index + 1).toString()); @@ -12,7 +13,8 @@ display: flex; height: 3rem; align-items: center; - padding: 0 1rem; + justify-content: space-between; + padding: 0 0.5rem 0 1rem; color: var(--color-foreground); border-width: 1px 1px 0 1px; border-color: var(--color-foreground-subtle); @@ -25,6 +27,19 @@ font-weight: normal; } + .last-commit { + padding: 0.5rem; + color: var(--color-secondary); + background-color: var(--color-secondary-background); + font-size: 0.75rem; + border-radius: 0.25rem; + } + .last-commit .hash { + font-weight: bold; + font-family: var(--font-family-monospace); + margin-right: 0.25rem; + } + .line-numbers { color: var(--color-foreground-subtle); font-family: var(--font-family-sans-serif); @@ -56,10 +71,14 @@
-
+
{blob.path.split("/").join(" / ")} +
+ {lastCommit.sha1.slice(0, 7)} + {lastCommit.summary} +
diff --git a/src/base/projects/Browser.svelte b/src/base/projects/Browser.svelte index 6b0c91d5d..1dd4b5809 100644 --- a/src/base/projects/Browser.svelte +++ b/src/base/projects/Browser.svelte @@ -49,7 +49,7 @@ font-family: var(--font-family-monospace); color: var(--color-secondary); background-color: var(--color-secondary-background); - padding: 0.75rem; + padding: 0.5rem 0.75rem; } .anchor { @@ -57,7 +57,7 @@ } .anchor-widget { display: flex; - padding: 0.75rem; + padding: 0.5rem 0.75rem; border-radius: 0.25rem; color: var(--color-tertiary); background-color: var(--color-tertiary-background); @@ -76,7 +76,7 @@ .stat { font-family: var(--font-family-monospace); - padding: 0.75rem; + padding: 0.5rem 0.75rem; background: var(--color-foreground-background); } diff --git a/src/project.ts b/src/project.ts index faddd5171..2c4b12293 100644 --- a/src/project.ts +++ b/src/project.ts @@ -69,7 +69,7 @@ export interface Blob { html?: boolean; content: string; path: string; - info: Info; + info: EntryInfo; } export async function getInfo(urn: string, config: Config): Promise {