aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsilverwind <me@silverwind.io>2020-12-12 02:06:22 +0100
committerGitHub <noreply@github.com>2020-12-12 02:06:22 +0100
commit1837e647eb2ae3f4de0ed1a729f0da01c07b9449 (patch)
tree8abfaacd2a4bda51e09a5633b75864a06772f83c
parent3285babcae57b410815d4415db9c9ea6c6f9a84e (diff)
downloadgitea-1837e647eb2ae3f4de0ed1a729f0da01c07b9449.tar.gz
gitea-1837e647eb2ae3f4de0ed1a729f0da01c07b9449.zip
Diff stat improvements (#13954)
* Diff stat improvements - Combine number to just total number of changes - Add tooltip over stats bar - Increase contrast on file name - Refactor classes and CSS to be more reusable * misc tweaks * make count bold
-rw-r--r--options/locale/locale_en-US.ini1
-rw-r--r--templates/repo/diff/box.tmpl12
-rw-r--r--templates/repo/diff/stats.tmpl8
-rw-r--r--web_src/less/_repository.less51
4 files changed, 29 insertions, 43 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 58fd7d8f50..63a768dc73 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1787,6 +1787,7 @@ diff.whitespace_ignore_all_whitespace = Ignore whitespace when comparing lines
diff.whitespace_ignore_amount_changes = Ignore changes in amount of whitespace
diff.whitespace_ignore_at_eol = Ignore changes in whitespace at EOL
diff.stats_desc = <strong> %d changed files</strong> with <strong>%d additions</strong> and <strong>%d deletions</strong>
+diff.stats_desc_file = %d changes: %d additions and %d deletions
diff.bin = BIN
diff.view_file = View File
diff.file_before = Before
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl
index 275dc51501..40e9d277b3 100644
--- a/templates/repo/diff/box.tmpl
+++ b/templates/repo/diff/box.tmpl
@@ -36,9 +36,9 @@
<ol class="diff-detail-box diff-stats detail-files hide" id="diff-files">
{{range .Diff.Files}}
<li>
- <div class="diff-counter count pull-right">
+ <div class="diff-counter pull-right">
{{if not .IsBin}}
- {{template "repo/diff/stats" .}}
+ {{template "repo/diff/stats" dict "file" . "root" $}}
{{else}}
<span>{{$.i18n.Tr "repo.diff.bin"}}</span>
{{end}}
@@ -53,9 +53,9 @@
{{if $file.IsIncomplete}}
<div class="diff-file-box diff-box file-content">
<h4 class="ui top attached normal header rounded">
- <div class="diff-counter count ui left">
+ <div class="diff-counter ui left">
{{if not $file.IsRenamed}}
- {{template "repo/diff/stats" .}}
+ {{template "repo/diff/stats" dict "file" . "root" $}}
{{end}}
</div>
<span class="file">{{$file.Name}}</span>
@@ -87,11 +87,11 @@
{{svg "octicon-chevron-down" 18}}
</a>
{{end}}
- <div class="diff-counter count">
+ <div class="diff-counter">
{{if $file.IsBin}}
{{$.i18n.Tr "repo.diff.bin"}}
{{else if not $file.IsRenamed}}
- {{template "repo/diff/stats" .}}
+ {{template "repo/diff/stats" dict "file" . "root" $}}
{{end}}
</div>
<span class="file">{{if $file.IsRenamed}}{{$file.OldName}} &rarr; {{end}}{{$file.Name}}{{if .IsLFSFile}} ({{$.i18n.Tr "repo.stored_lfs"}}){{end}}</span>
diff --git a/templates/repo/diff/stats.tmpl b/templates/repo/diff/stats.tmpl
index 7e5d34c3dd..97503f0ea5 100644
--- a/templates/repo/diff/stats.tmpl
+++ b/templates/repo/diff/stats.tmpl
@@ -1,6 +1,4 @@
-<span class="add" data-line="{{.Addition}}">+ {{.Addition}}</span>
-<span class="bar">
- <div class="pull-left add" style="width: {{DiffStatsWidth .Addition .Deletion}}%"></div>
- <div class="pull-left del"></div>
+{{Add .file.Addition .file.Deletion}}
+<span class="diff-stats-bar poping up ml-2" data-content="{{.root.i18n.Tr "repo.diff.stats_desc_file" (Add .file.Addition .file.Deletion) .file.Addition .file.Deletion | Str2html}}" data-variation="wide">
+ <div class="diff-stats-add-bar" style="width: {{DiffStatsWidth .file.Addition .file.Deletion}}%"></div>
</span>
-<span class="del" data-line="{{.Deletion}}">- {{.Deletion}}</span>
diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
index 1cedb07f12..8876dcdcb0 100644
--- a/web_src/less/_repository.less
+++ b/web_src/less/_repository.less
@@ -1563,29 +1563,8 @@
display: flex;
align-items: center;
- .count {
- margin-right: 12px;
- font-size: 13px;
- flex: 0 0 auto;
-
- .bar {
- background-color: var(--color-red);
- height: 12px;
- width: 40px;
- display: inline-block;
- margin: 2px 4px 0;
- vertical-align: text-top;
-
- .add {
- background-color: var(--color-green);
- height: 12px;
- }
- }
- }
-
.file {
flex: 1;
- color: var(--color-text-light-2);
word-break: break-all;
}
@@ -1768,17 +1747,6 @@
border-bottom: 1px dashed #dddddd;
padding-left: 6px;
}
-
- .diff-counter {
- margin-right: 15px;
-
- .del {
- color: var(--color-red);
- }
- .add {
- color: var(--color-green);
- }
- }
}
.repo-search-result {
@@ -3142,6 +3110,25 @@ td.blob-excerpt {
border-radius: var(--border-radius) !important;
}
+.diff-counter {
+ font-weight: 600;
+ margin-right: 8px;
+}
+
+.diff-stats-bar {
+ display: inline-block;
+ background-color: var(--color-red);
+ height: 12px;
+ width: 40px;
+ position: relative;
+ top: 2px;
+
+ .diff-stats-add-bar {
+ background-color: var(--color-green);
+ height: 100%;
+ }
+}
+
/* prevent page shaking on language bar click */
.repository-summary-language-stats {
height: 48px;