Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Diff stat improvements #13954

Merged
merged 4 commits into from
Dec 12, 2020
Merged

Diff stat improvements #13954

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
323b72d
Diff stat improvements
silverwind Dec 11, 2020
70d708c
misc tweaks
silverwind Dec 11, 2020
cb492e7
make count bold
silverwind Dec 11, 2020
af7456e
Merge branch 'master' into linecount
6543 Dec 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions templates/repo/diff/box.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
8 changes: 3 additions & 5 deletions templates/repo/diff/stats.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
51 changes: 19 additions & 32 deletions web_src/less/_repository.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down