Skip to content

Fix 10327 commit graph options #6

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

Merged
merged 2 commits into from
Oct 27, 2020
Merged

Fix 10327 commit graph options #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2ce5dc
graph tweaks
silverwind Oct 27, 2020
f633478
more tweaks
silverwind Oct 27, 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
56 changes: 28 additions & 28 deletions templates/repo/graph/commits.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,40 +28,40 @@
{{- end -}}
</a>
</span>
{{range $commit.Refs}}
{{$refGroup := .RefGroup}}
{{if eq $refGroup "pull"}}
{{if $.HidePRRefs}}
{{if (containGeneric $.SelectedBranches .Name) }}
<span class="message df ac mr-2">{{RenderCommitMessage $commit.Subject $.RepoLink $.Repository.ComposeMetas}}</span>
<span class="tags df ac">
{{range $commit.Refs}}
{{$refGroup := .RefGroup}}
{{if eq $refGroup "pull"}}
{{if $.HidePRRefs}}
{{if (containGeneric $.SelectedBranches .Name) }}
<a class="ui labelled icon button basic tiny" href="{{$.RepoLink}}/pulls/{{.ShortName|PathEscape}}">
{{svg "octicon-git-pull-request" 16 "mr-2"}}#{{.ShortName}}
</a>
{{end}}
{{else}}
<a class="ui labelled icon button basic tiny" href="{{$.RepoLink}}/pulls/{{.ShortName|PathEscape}}">
{{svg "octicon-git-pull-request" 16 "mr-2"}}#{{.ShortName}}
</a>
{{end}}
{{else}}
<a class="ui labelled icon button basic tiny" href="{{$.RepoLink}}/pulls/{{.ShortName|PathEscape}}">
{{svg "octicon-git-pull-request" 16 "mr-2"}}#{{.ShortName}}
{{else if eq $refGroup "tags"}}
<a class="ui labelled icon button basic tiny" href="{{$.RepoLink}}/src/tag/{{.ShortName|PathEscape}}">
{{svg "octicon-tag" 16 "mr-2"}}{{.ShortName}}
</a>
{{else if eq $refGroup "remotes"}}
<a class="ui labelled icon button basic tiny" href="{{$.RepoLink}}/src/commit/{{$commit.Rev}}">
{{svg "octicon-cross-reference" 16 "mr-2"}}{{.ShortName}}
</a>
{{else if eq $refGroup "heads"}}
<a class="ui labelled icon button basic tiny" href="{{$.RepoLink}}/src/branch/{{.ShortName|PathEscape}}">
{{svg "octicon-git-branch" 16 "mr-2"}}{{.ShortName}}
</a>
{{else}}
<!-- Unknown ref type {{.Name}} -->
{{end}}
{{else if eq $refGroup "tags"}}
<a class="ui labelled icon button basic tiny" href="{{$.RepoLink}}/src/tag/{{.ShortName|PathEscape}}">
{{svg "octicon-tag" 16 "mr-2"}}{{.ShortName}}
</a>
{{else if eq $refGroup "remotes"}}
<a class="ui labelled icon button basic tiny" href="{{$.RepoLink}}/src/commit/{{$commit.Rev}}">
{{svg "octicon-cross-reference" 16 "mr-2"}}{{.ShortName}}
</a>
{{else if eq $refGroup "heads"}}
<a class="ui labelled icon button basic tiny" href="{{$.RepoLink}}/src/branch/{{.ShortName|PathEscape}}">
{{svg "octicon-git-branch" 16 "mr-2"}}{{.ShortName}}
</a>
{{else}}
<!-- Unknown ref type {{.Name}} -->
{{end}}
{{end}}
—
<span>{{RenderCommitMessage $commit.Subject $.RepoLink $.Repository.ComposeMetas}}</span>
—
<span class="author">
</span>
<span class="author df ac mr-2">
{{$userName := $commit.Commit.Author.Name}}
{{if $commit.User}}
{{if $commit.User.FullName}}
Expand All @@ -72,7 +72,7 @@
<img class="ui avatar image" src="{{AvatarLink $commit.Commit.Author.Email}}" alt=""/>{{$userName}}
{{end}}
</span>
<span class="time">{{$commit.Date}}</span>
<span class="time df ac">{{$commit.Date}}</span>
{{ end }}
</li>
{{ end }}
Expand Down
24 changes: 7 additions & 17 deletions web_src/less/features/gitgraph.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@
height: 24px;
line-height: 24px;
white-space: nowrap;
display: flex;
align-items: center;

.node-relation {
font-family: "Bitstream Vera Sans Mono", "Courier", monospace;
Expand All @@ -78,10 +80,6 @@
font-size: 80%;
}

a {
color: #000000;
}

a:hover {
text-decoration: underline;
}
Expand All @@ -106,23 +104,15 @@

#rev-list {
margin: 0;
padding: 0 5px;
min-width: 95%;

li.highlight,
li.hover {
background-color: rgba(0, 0, 0, .05);
}
padding: 0;
width: 100%;

li.highlight.hover {
background-color: rgba(0, 0, 0, .1);
background-color: rgba(0, 0, 0, .05);
}

li a.button {
padding-top: 2px;
padding-bottom: 2px;
vertical-align: top;
margin-top: 2px;
.tags a.button {
padding: 2px 4px;
}

.sha.label {
Expand Down
25 changes: 4 additions & 21 deletions web_src/less/themes/theme-arc-green.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1782,22 +1782,6 @@ a.ui.labels .label:hover {
background-color: #a27558;
}

#git-graph-container li a.sha {
color: #dbdbdb;
}

#git-graph-container li a {
color: #c79575;
}

#git-graph-container li.highlight a.ui.labelled {
border: 1px solid #999999;
}

#git-graph-container li .author {
color: #c79575;
}

.ui.header .sub.header {
color: #9e9e9e;
}
Expand Down Expand Up @@ -2142,6 +2126,10 @@ img[src$="/img/matrix.svg"] {
filter: invert(80%);
}

#git-graph-container li .time {
color: #6a737d;
}

#git-graph-container.monochrome #rel-container .flow-group {
stroke: dimgrey;
fill: dimgrey;
Expand All @@ -2166,11 +2154,6 @@ img[src$="/img/matrix.svg"] {
}
}

#git-graph-container #rev-list li.highlight,
#git-graph-container #rev-list li.hover {
background-color: rgba(255, 255, 255, .05);
}

#git-graph-container #rev-list li.highlight.hover {
background-color: rgba(255, 255, 255, .1);
}
Expand Down