wanderer/gitea
1
0
Fork 0
forked from mirror/gitea
Code Issues Pull Requests Releases Activity

Timeline and color tweaks (#21799)

Browse Source 
Followup to https://github.com/go-gitea/gitea/pull/21784.

- Restore muted effect on timeline author and issuelist comment icon
- Remove whitespace inside shared user templates, fixing link hover
underline
- Use shared author link template more
- Use `bold` class instead of CSS
- Fix grey-light color being too dark on arc-green
- Add missing black-light color
- Fix issuelist progress bar color
- Fix various other cases of missing `.muted`

<img width="416" alt="Screenshot 2022-11-13 at 12 15 22"
src="https://user-images.githubusercontent.com/115237/201519497-1d4725c6-bc8b-47b5-9f68-1278ac9a8c92.png">
<img width="324" alt="Screenshot 2022-11-13 at 12 16 52"
src="https://user-images.githubusercontent.com/115237/201519501-c0d03700-f9af-4316-ab46-482f2c7c738b.png">
<img width="79" alt="Screenshot 2022-11-13 at 12 30 55"
src="https://user-images.githubusercontent.com/115237/201519502-46dc2d73-bbdf-4a2e-84d3-d2976f793163.png">
<img width="440" alt="Screenshot 2022-11-13 at 12 41 03"
src="https://user-images.githubusercontent.com/115237/201519876-ada33948-f84a-4aeb-a40d-5c873f9a49e9.png">
<img width="213" alt="Screenshot 2022-11-13 at 12 52 54"
src="https://user-images.githubusercontent.com/115237/201520291-a4d7238e-aeca-46c7-9008-8b644b1b676e.png">
<img width="208" alt="Screenshot 2022-11-13 at 12 56 16"
src="https://user-images.githubusercontent.com/115237/201520436-aa8ba109-b959-42fb-831a-021e806c7082.png">

Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
silverwind 2022-11-19 05:02:30 +01:00 committed by GitHub
parent 595d940daa
commit fefdb7ffd1
Signed by: GitHub
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/explore/repo_list.tmpl
View File

@ -38,10 +38,10 @@
{{end}} {{end}}
</div> </div>
</div> </div>
<div class="metas df ac"> <div class="metas df ac text grey">
{{if .PrimaryLanguage}} {{if .PrimaryLanguage}}
<a href="{{$.Link}}?q={{$.Keyword}}&sort={{$.SortType}}&language={{.PrimaryLanguage.Language}}"> <a class="muted" href="{{$.Link}}?q={{$.Keyword}}&sort={{$.SortType}}&language={{.PrimaryLanguage.Language}}">
<span class="text grey df ac mr-3"><i class="color-icon mr-3" style="background-color: {{.PrimaryLanguage.Color}}"></i>{{.PrimaryLanguage.Language}}</span> <span class="df ac mr-3"><i class="color-icon mr-3" style="background-color: {{.PrimaryLanguage.Color}}"></i>{{.PrimaryLanguage.Language}}</span>
</a> </a>
{{end}} {{end}}
{{if not $.DisableStars}} {{if not $.DisableStars}}

4
templates/org/home.tmpl
View File

@ -68,8 +68,8 @@
<div class="item"> <div class="item">
<a href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong class="team-name">{{.Name}}</strong></a> <a href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong class="team-name">{{.Name}}</strong></a>
<p class="text grey"> <p class="text grey">
<a href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong>{{.NumMembers}}</strong> {{$.locale.Tr "org.lower_members"}}</a> · <a class="muted" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong>{{.NumMembers}}</strong> {{$.locale.Tr "org.lower_members"}}</a> ·
<a href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/repositories"><strong>{{.NumRepos}}</strong> {{$.locale.Tr "org.lower_repositories"}}</a> <a class="muted" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/repositories"><strong>{{.NumRepos}}</strong> {{$.locale.Tr "org.lower_repositories"}}</a>
</p> </p>
</div> </div>
{{end}} {{end}}

2
templates/repo/diff/comments.tmpl
View File

@ -11,7 +11,7 @@
<div class="ui top attached header comment-header df ac sb"> <div class="ui top attached header comment-header df ac sb">
<div class="comment-header-left df ac"> <div class="comment-header-left df ac">
{{if .OriginalAuthor}} {{if .OriginalAuthor}}
<span class="text black mr-2"> <span class="text black bold mr-2">
{{svg (MigrationIcon $.root.Repository.GetOriginalURLHostname)}} {{svg (MigrationIcon $.root.Repository.GetOriginalURLHostname)}}
{{.OriginalAuthor}} {{.OriginalAuthor}}
</span> </span>

4
templates/repo/issue/view_content.tmpl
View File

@ -30,7 +30,7 @@
<div class="ui top attached header comment-header df ac sb"> <div class="ui top attached header comment-header df ac sb">
<div class="comment-header-left df ac"> <div class="comment-header-left df ac">
{{if .Issue.OriginalAuthor}} {{if .Issue.OriginalAuthor}}
<span class="text black"> <span class="text black bold">
{{svg (MigrationIcon .Repository.GetOriginalURLHostname)}} {{svg (MigrationIcon .Repository.GetOriginalURLHostname)}}
{{.Issue.OriginalAuthor}} {{.Issue.OriginalAuthor}}
</span> </span>
@ -45,7 +45,7 @@
{{avatar .Issue.Poster}} {{avatar .Issue.Poster}}
</a> </a>
<span class="text grey"> <span class="text grey">
<a class="author"{{if gt .Issue.Poster.ID 0}} href="{{.Issue.Poster.HomeLink}}"{{end}}>{{.Issue.Poster.GetDisplayName}}</a> {{template "shared/user/authorlink" .Issue.Poster}}
{{.locale.Tr "repo.issues.commented_at" (.Issue.HashTag|Escape) $createdStr | Safe}} {{.locale.Tr "repo.issues.commented_at" (.Issue.HashTag|Escape) $createdStr | Safe}}
</span> </span>
{{end}} {{end}}

20
templates/repo/issue/view_content/comments.tmpl
View File

@ -25,7 +25,7 @@
<div class="ui top attached header comment-header df ac sb"> <div class="ui top attached header comment-header df ac sb">
<div class="comment-header-left df ac"> <div class="comment-header-left df ac">
{{if .OriginalAuthor}} {{if .OriginalAuthor}}
<span class="text black mr-2"> <span class="text black bold mr-2">
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}} {{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
{{.OriginalAuthor}} {{.OriginalAuthor}}
</span> </span>
@ -42,9 +42,7 @@
</a> </a>
{{end}} {{end}}
<span class="text grey"> <span class="text grey">
<a class="author"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}> {{template "shared/user/authorlink" .Poster}}
{{.Poster.GetDisplayName}}
</a>
{{$.locale.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdStr | Safe}} {{$.locale.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdStr | Safe}}
</span> </span>
{{end}} {{end}}
@ -151,14 +149,14 @@
<span class="badge">{{svg "octicon-bookmark"}}</span> <span class="badge">{{svg "octicon-bookmark"}}</span>
{{template "shared/user/avatarlink" .Poster}} {{template "shared/user/avatarlink" .Poster}}
{{if eq .RefAction 3}}<del>{{end}} {{if eq .RefAction 3}}<del>{{end}}
<span class="text grey"> <span class="text grey muted-links">
{{template "shared/user/authorlink" .Poster}} {{template "shared/user/authorlink" .Poster}}
{{$.locale.Tr $refTr (.EventTag|Escape) $createdStr (.RefCommentHTMLURL|Escape) $refFrom | Safe}} {{$.locale.Tr $refTr (.EventTag|Escape) $createdStr (.RefCommentHTMLURL|Escape) $refFrom | Safe}}
</span> </span>
{{if eq .RefAction 3}}</del>{{end}} {{if eq .RefAction 3}}</del>{{end}}
<div class="detail"> <div class="detail">
<span class="text grey"><a href="{{.RefIssueHTMLURL}}"><b>{{.RefIssueTitle}}</b> {{.RefIssueIdent}}</a></span> <span class="text grey"><a class="muted" href="{{.RefIssueHTMLURL}}"><b>{{.RefIssueTitle}}</b> {{.RefIssueIdent}}</a></span>
</div> </div>
</div> </div>
{{else if eq .Type 4}} {{else if eq .Type 4}}
@ -207,7 +205,7 @@
{{if .RemovedAssignee}} {{if .RemovedAssignee}}
{{template "shared/user/avatarlink" .Assignee}} {{template "shared/user/avatarlink" .Assignee}}
<span class="text grey"> <span class="text grey">
<a class="author" {{if gt .Assignee.ID 0}}href="{{.Assignee.HomeLink}}"{{end}}>{{.Assignee.GetDisplayName}}</a> {{template "shared/user/authorlink" .Assignee}}
{{if eq .Poster.ID .Assignee.ID}} {{if eq .Poster.ID .Assignee.ID}}
{{$.locale.Tr "repo.issues.remove_self_assignment" $createdStr | Safe}} {{$.locale.Tr "repo.issues.remove_self_assignment" $createdStr | Safe}}
{{else}} {{else}}
@ -331,7 +329,7 @@
<div class="detail"> <div class="detail">
{{svg "octicon-plus"}} {{svg "octicon-plus"}}
<span class="text grey"> <span class="text grey">
<a href="{{.DependentIssue.HTMLURL}}"> <a class="muted" href="{{.DependentIssue.HTMLURL}}">
{{if eq .DependentIssue.RepoID .Issue.RepoID}} {{if eq .DependentIssue.RepoID .Issue.RepoID}}
#{{.DependentIssue.Index}} {{.DependentIssue.Title}} #{{.DependentIssue.Index}} {{.DependentIssue.Title}}
{{else}} {{else}}
@ -354,7 +352,7 @@
<div class="detail"> <div class="detail">
<span class="text grey">{{svg "octicon-trash"}}</span> <span class="text grey">{{svg "octicon-trash"}}</span>
<span class="text grey"> <span class="text grey">
<a href="{{.DependentIssue.HTMLURL}}"> <a class="muted" href="{{.DependentIssue.HTMLURL}}">
{{if eq .DependentIssue.RepoID .Issue.RepoID}} {{if eq .DependentIssue.RepoID .Issue.RepoID}}
#{{.DependentIssue.Index}} {{.DependentIssue.Title}} #{{.DependentIssue.Index}} {{.DependentIssue.Title}}
{{else}} {{else}}
@ -408,7 +406,7 @@
<div class="comment-header-left df ac"> <div class="comment-header-left df ac">
<span class="text grey"> <span class="text grey">
{{if .OriginalAuthor}} {{if .OriginalAuthor}}
<span class="text black"> <span class="text black bold">
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}} {{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
{{.OriginalAuthor}} {{.OriginalAuthor}}
</span> </span>
@ -536,7 +534,7 @@
{{end}} {{end}}
<span class="text grey"> <span class="text grey">
{{if .OriginalAuthor}} {{if .OriginalAuthor}}
<span class="text black"> <span class="text black bold">
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}} {{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
{{.OriginalAuthor}} {{.OriginalAuthor}}
</span> </span>

2
templates/repo/issue/view_content/sidebar.tmpl
View File

@ -389,7 +389,7 @@
{{avatar $user}} {{avatar $user}}
</a> </a>
<div class="content"> <div class="content">
<a class="author">{{$user.DisplayName}}</a> {{template "shared/user/authorlink" $user}}
<div class="text"> <div class="text">
{{$trackedtime}} {{$trackedtime}}
</div> </div>

2
templates/shared/issuelist.tmpl
View File

@ -160,7 +160,7 @@
</div> </div>
<div class="issue-item-icon-right text grey"> <div class="issue-item-icon-right text grey">
{{if .NumComments}} {{if .NumComments}}
<a class="tdn" href="{{if .HTMLURL}}{{.HTMLURL}}{{else}}{{$.Link}}/{{.Index}}{{end}}"> <a class="tdn muted" href="{{if .HTMLURL}}{{.HTMLURL}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
{{svg "octicon-comment" 16 "mr-2"}}{{.NumComments}} {{svg "octicon-comment" 16 "mr-2"}}{{.NumComments}}
</a> </a>
{{end}} {{end}}

4
templates/shared/user/authorlink.tmpl
View File

@ -1,3 +1 @@
<a class="author"{{if gt .ID 0}} href="{{.HomeLink}}"{{end}}> <a class="author text black bold muted"{{if gt .ID 0}} href="{{.HomeLink}}"{{end}}>{{.GetDisplayName}}</a>
{{.GetDisplayName}}
</a>

4
templates/shared/user/avatarlink.tmpl
View File

@ -1,3 +1 @@
<a class="avatar"{{if gt .ID 0}} href="{{.HomeLink}}"{{end}}> <a class="avatar"{{if gt .ID 0}} href="{{.HomeLink}}"{{end}}>{{avatar .}}</a>
{{avatar .}}
</a>

4
templates/shared/user/namelink.tmpl
View File

@ -1,3 +1 @@
<a{{if gt .ID 0}} href="{{.HomeLink}}"{{end}}> <a{{if gt .ID 0}} href="{{.HomeLink}}"{{end}}>{{.GetDisplayName}}</a>
{{.GetDisplayName}}
</a>

7
web_src/less/_base.less
View File

@ -79,6 +79,7 @@
--color-pink: #e03997; --color-pink: #e03997;
--color-brown: #a5673f; --color-brown: #a5673f;
--color-grey: #888888; --color-grey: #888888;
--color-black: #1b1c1d;
/* light variants - produced via Sass scale-color(color, $lightness: +25%) */ /* light variants - produced via Sass scale-color(color, $lightness: +25%) */
--color-red-light: #e45e5e; --color-red-light: #e45e5e;
--color-orange-light: #f59555; --color-orange-light: #f59555;
@ -92,9 +93,9 @@
--color-pink-light: #e86bb1; --color-pink-light: #e86bb1;
--color-brown-light: #c58b66; --color-brown-light: #c58b66;
--color-grey-light: #a6a6a6; --color-grey-light: #a6a6a6;
--color-black-light: #525558;
/* other colors */ /* other colors */
--color-gold: #a1882b; --color-gold: #a1882b;
--color-black: #1b1c1d;
--color-white: #ffffff; --color-white: #ffffff;
--color-diff-removed-word-bg: #fdb8c0; --color-diff-removed-word-bg: #fdb8c0;
--color-diff-added-word-bg: #acf2bd; --color-diff-added-word-bg: #acf2bd;
@ -293,13 +294,15 @@ a,
text-decoration-skip-ink: all; text-decoration-skip-ink: all;
} }
a.muted { a.muted,
.muted-links a {
color: inherit; color: inherit;
} }
a:hover, a:hover,
a.muted:hover, a.muted:hover,
a.muted:hover [class*="color-text"], a.muted:hover [class*="color-text"],
.muted-links a:hover,
.ui.breadcrumb a:hover { .ui.breadcrumb a:hover {
color: var(--color-primary); color: var(--color-primary);
} }

18
web_src/less/_repository.less
View File

@ -829,7 +829,7 @@
.timeline-avatar { .timeline-avatar {
position: absolute; position: absolute;
left: -72px; left: -68px;
img { img {
width: 40px !important; width: 40px !important;
@ -846,7 +846,6 @@
.avatar img { .avatar img {
width: 20px; width: 20px;
height: 20px; height: 20px;
margin: 0 .25rem;
vertical-align: middle; vertical-align: middle;
} }
@ -981,10 +980,6 @@
margin-top: 4px; margin-top: 4px;
} }
.author {
font-weight: 600;
}
.comment-form-reply .footer { .comment-form-reply .footer {
padding-bottom: 1em; padding-bottom: 1em;
} }
@ -1165,9 +1160,12 @@
padding-left: 15px; padding-left: 15px;
.detail { .detail {
font-size: .9rem; margin-top: 4px;
margin-top: 5px; margin-left: 14px;
margin-left: 8px;
.svg {
margin-right: 2px;
}
} }
.segments { .segments {
@ -2723,12 +2721,10 @@
a { a {
color: var(--color-text); color: var(--color-text);
text-decoration: none;
} }
a:hover { a:hover {
color: var(--color-primary); color: var(--color-primary);
text-decoration: none;
} }
} }

8
web_src/less/shared/issuelist.less
View File

@ -91,6 +91,14 @@
border-radius: 3px; border-radius: 3px;
vertical-align: 2px !important; vertical-align: 2px !important;
} }
progress::-webkit-progress-value {
background-color: var(--color-secondary-dark-4);
}
progress::-moz-progress-bar {
background-color: var(--color-secondary-dark-4);
}
} }
.conflicting { .conflicting {

9
web_src/less/themes/theme-arc-green.less
View File

@ -67,8 +67,9 @@
--color-purple: #b259d0; --color-purple: #b259d0;
--color-pink: #d22e8b; --color-pink: #d22e8b;
--color-brown: #a47252; --color-brown: #a47252;
--color-grey: #5e626a; --color-grey: #9ea2aa;
/* light variants */ --color-black: #1e222e;
/* light variants - produced via Sass scale-color(color, $lightness: -10%) */
--color-red-light: #c23636; --color-red-light: #c23636;
--color-orange-light: #b84f0b; --color-orange-light: #b84f0b;
--color-yellow-light: #b88a03; --color-yellow-light: #b88a03;
@ -80,9 +81,9 @@
--color-purple-light: #a742c9; --color-purple-light: #a742c9;
--color-pink-light: #be297d; --color-pink-light: #be297d;
--color-brown-light: #94674a; --color-brown-light: #94674a;
--color-grey-light: #55585f; --color-grey-light: #8d919b;
--color-black-light: #1b1f29;
/* other colors */ /* other colors */
--color-black: #1e222e;
--color-gold: #b1983b; --color-gold: #b1983b;
--color-white: #ffffff; --color-white: #ffffff;
--color-diff-removed-word-bg: #6f3333; --color-diff-removed-word-bg: #6f3333;