From b39bb958cc44511c3590e832f77cebdf70616b8c Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Sat, 21 Oct 2023 12:38:19 +0200
Subject: [PATCH] Improve diff tree spacing (#27714)
1. Un-indent top-level items, matching GitHub rendering
2. Increase item padding and add 1px gap between items
Before and After:
<img width="247" alt="Screenshot 2023-10-20 at 18 37 32"
src="https://github.com/go-gitea/gitea/assets/115237/43c1ce86-1814-4a8a-9dd2-0c4a82a2be7c">
<img width="241" alt="Screenshot 2023-10-20 at 18 40 46"
src="https://github.com/go-gitea/gitea/assets/115237/b541b85b-c428-4903-becd-773ae5807495">
---------
Co-authored-by: 6543 <m.huber@kithara.com>
---
web_src/js/components/DiffFileTree.vue | 10 +++++++++-
web_src/js/components/DiffFileTreeItem.vue | 11 +++++++----
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/web_src/js/components/DiffFileTree.vue b/web_src/js/components/DiffFileTree.vue
index 6136f7b94754..3686629df895 100644
--- a/web_src/js/components/DiffFileTree.vue
+++ b/web_src/js/components/DiffFileTree.vue
@@ -126,7 +126,7 @@ export default {
};
</script>
<template>
- <div v-if="store.fileTreeIsVisible" class="gt-mr-3">
+ <div v-if="store.fileTreeIsVisible" class="diff-file-tree-items">
<!-- only render the tree if we're visible. in many cases this is something that doesn't change very often -->
<DiffFileTreeItem v-for="item in fileTree" :key="item.name" :item="item"/>
<div v-if="store.isIncomplete" class="gt-pt-2">
@@ -134,3 +134,11 @@ export default {
</div>
</div>
</template>
+<style scoped>
+.diff-file-tree-items {
+ display: flex;
+ flex-direction: column;
+ gap: 1px;
+ margin-right: .5rem;
+}
+</style>
diff --git a/web_src/js/components/DiffFileTreeItem.vue b/web_src/js/components/DiffFileTreeItem.vue
index 553ab1464f5a..22c23f3ca0c1 100644
--- a/web_src/js/components/DiffFileTreeItem.vue
+++ b/web_src/js/components/DiffFileTreeItem.vue
@@ -58,11 +58,14 @@ a, a:hover {
}
.sub-items {
- padding-left: 9px;
+ display: flex;
+ flex-direction: column;
+ gap: 1px;
+ padding-left: 8px;
}
-.item-file {
- margin-left: 20px;
+.sub-items .item-file {
+ padding-left: 24px;
}
.item-file.selected {
@@ -80,7 +83,7 @@ a, a:hover {
display: flex;
align-items: center;
gap: 0.25em;
- padding: 2px;
+ padding: 3px 6px;
}
.item-file:hover,