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

Change commit status icons to SVG #20736

Merged
merged 10 commits into from
Aug 9, 2022
Merged

Change commit status icons to SVG #20736

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d819635
Fix commit status popover and switch to svg icons
silverwind Aug 9, 2022
6fd1c67
margin tweak
silverwind Aug 9, 2022
b6b0509
fix integration, use warning sign for error to match previous
silverwind Aug 9, 2022
0a9f883
remove fix from here, will be a new pr
silverwind Aug 9, 2022
8628692
use top/bottom positioning
silverwind Aug 9, 2022
573c46f
vertically center
silverwind Aug 9, 2022
71f96eb
use no-entry over alert oction
silverwind Aug 9, 2022
1db68c7
add exclamation icon
silverwind Aug 9, 2022
61b302b
fix test selector
silverwind Aug 9, 2022
e9c0216
more test fixes
silverwind Aug 9, 2022
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
14 changes: 7 additions & 7 deletions integrations/pull_status_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ func TestPullCreate_CommitStatus(t *testing.T) {
}

statesIcons := map[api.CommitStatusState]string{
api.CommitStatusPending: "circle icon yellow",
api.CommitStatusSuccess: "check icon green",
api.CommitStatusError: "warning icon red",
api.CommitStatusFailure: "remove icon red",
api.CommitStatusWarning: "warning sign icon yellow",
api.CommitStatusPending: "octicon-dot-fill",
api.CommitStatusSuccess: "octicon-check",
api.CommitStatusError: "octicon-no-entry",
api.CommitStatusFailure: "octicon-x",
api.CommitStatusWarning: "octicon-no-entry",
}

testCtx := NewAPITestContext(t, "user1", "repo1")
Expand All @@ -80,9 +80,9 @@ func TestPullCreate_CommitStatus(t *testing.T) {
assert.NotEmpty(t, commitURL)
assert.EqualValues(t, commitID, path.Base(commitURL))

cls, ok := doc.doc.Find("#commits-table tbody tr td.message i.commit-status").Last().Attr("class")
cls, ok := doc.doc.Find("#commits-table tbody tr td.message .commit-status").Last().Attr("class")
assert.True(t, ok)
assert.EqualValues(t, "commit-status "+statesIcons[status], cls)
assert.Contains(t, cls, statesIcons[status])
}
})
}
Expand Down
10 changes: 5 additions & 5 deletions templates/repo/commit_status.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{{if eq .State "pending"}}
<i class="commit-status circle icon yellow"></i>
{{svg "octicon-dot-fill" 18 "commit-status icon text yellow"}}
{{end}}
{{if eq .State "success"}}
<i class="commit-status check icon green"></i>
{{svg "octicon-check" 18 "commit-status icon text green"}}
{{end}}
{{if eq .State "error"}}
<i class="commit-status warning icon red"></i>
{{svg "octicon-no-entry" 18 "commit-status icon text red"}}
{{end}}
{{if eq .State "failure"}}
<i class="commit-status remove icon red"></i>
{{svg "octicon-x" 18 "commit-status icon text red"}}
{{end}}
{{if eq .State "warning"}}
<i class="commit-status warning sign icon yellow"></i>
{{svg "octicon-no-entry" 18 "commit-status icon text yellow"}}
{{end}}
8 changes: 4 additions & 4 deletions templates/repo/commit_statuses.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<a class="ui link commit-statuses-trigger">{{template "repo/commit_status" .Status}}</a>
<a class="ui link commit-statuses-trigger vm">{{template "repo/commit_status" .Status}}</a>
<div class="ui commit-statuses-popup commit-statuses hide">
<div class="ui relaxed list divided">
{{range .Statuses}}
<div class="ui item singular-status df">
<span>{{template "repo/commit_status" .}}</span>
<span class="ui f1">{{.Context}} <span class="text grey">{{.Description}}</span></span>
{{template "repo/commit_status" .}}
<span class="ui ml-3 f1">{{.Context}} <span class="text grey">{{.Description}}</span></span>
{{if .TargetURL}}
<div class="ui"><a href="{{.TargetURL}}" target="_blank" rel="noopener noreferrer">{{$.root.locale.Tr "repo.pulls.status_checks_details"}}</a></div>
<a class="ml-3" href="{{.TargetURL}}" target="_blank" rel="noopener noreferrer">{{$.root.locale.Tr "repo.pulls.status_checks_details"}}</a>
{{end}}
</div>
{{end}}
Expand Down
4 changes: 2 additions & 2 deletions web_src/js/features/repo-commit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ export function initRepoCommitLastCommitLoader() {

export function initCommitStatuses() {
$('.commit-statuses-trigger').each(function () {
const positionRight = $('.repository.file.list').length > 0 || $('.repository.diff').length > 0;
const top = $('.repository.file.list').length > 0 || $('.repository.diff').length > 0;

createTippy(this, {
trigger: 'click',
content: this.nextSibling,
placement: positionRight ? 'right' : 'left',
placement: top ? 'top-start' : 'bottom-start',
interactive: true,
});
});
Expand Down