diff options
author | Cherrg <michael@gnehr.de> | 2019-07-07 00:03:00 +0200 |
---|---|---|
committer | techknowlogick <techknowlogick@gitea.io> | 2019-07-06 18:03:00 -0400 |
commit | 362100023cc4fffbe053fc69bd8dd7252a30a0e3 (patch) | |
tree | 20eef6c40f6321a268686aafd54cecf313f42cc1 /templates | |
parent | 5b92bc1bec26de0143efccf70927bc9e46f9101c (diff) | |
download | gitea-362100023cc4fffbe053fc69bd8dd7252a30a0e3.tar.gz gitea-362100023cc4fffbe053fc69bd8dd7252a30a0e3.zip |
ui - issue view - fix icon position (#7354)
* issue view - fix icon position
- move style from template to css
- add bullets to: key, circle-slash, comment
Signed-off-by: Michael Gnehr <michael@gnehr.de>
* add border to symbols
Signed-off-by: Michael Gnehr <michael@gnehr.de>
* fix circle slash position
Signed-off-by: Michael Gnehr <michael@gnehr.de>
* fix top margin
Signed-off-by: Michael Gnehr <michael@gnehr.de>
* changed mixed space/tab indent to tabindent only
Signed-off-by: Michael Gnehr <michael@gnehr.de>
Diffstat (limited to 'templates')
-rw-r--r-- | templates/repo/issue/view_content/comments.tmpl | 108 |
1 files changed, 53 insertions, 55 deletions
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 6f562dc6b0..20474f6302 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -82,7 +82,7 @@ </div> {{else if eq .Type 2}} <div class="event"> - <span class="octicon octicon-circle-slash"></span> + <span class="octicon octicon-circle-slash issue-symbol"></span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -172,7 +172,7 @@ {{$.i18n.Tr "repo.issues.delete_branch_at" (.CommitSHA|Escape) $createdStr | Safe}} </span> </div> - {{else if eq .Type 12}} + {{else if eq .Type 12}} <div class="event"> <span class="octicon octicon-primitive-dot"></span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> @@ -245,55 +245,55 @@ </div> {{else if eq .Type 19}} <div class="event"> - <span class="octicon octicon-primitive-dot"></span> - <a class="ui avatar image" href="{{.Poster.HomeLink}}"> + <span class="octicon octicon-primitive-dot"></span> + <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> - </a> - <span class="text grey"> - {{$.i18n.Tr "repo.issues.dependency.added_dependency" .Poster.HomeLink (.Poster.GetDisplayName|Escape) $createdStr | Safe}} - </span> - <div class="detail"> - <span class="octicon octicon-plus"></span> + </a> + <span class="text grey"> + {{$.i18n.Tr "repo.issues.dependency.added_dependency" .Poster.HomeLink (.Poster.GetDisplayName|Escape) $createdStr | Safe}} + </span> + <div class="detail"> + <span class="octicon octicon-plus"></span> <span class="text grey"><a href="{{$.RepoLink}}/issues/{{.DependentIssue.Index}}">#{{.DependentIssue.Index}} {{.DependentIssue.Title}}</a></span> </div> - </div> + </div> {{else if eq .Type 20}} <div class="event"> - <span class="octicon octicon-primitive-dot"></span> - <a class="ui avatar image" href="{{.Poster.HomeLink}}"> - <img src="{{.Poster.RelAvatarLink}}"> - </a> - <span class="text grey"> - {{$.i18n.Tr "repo.issues.dependency.removed_dependency" .Poster.HomeLink (.Poster.GetDisplayName|Escape) $createdStr | Safe}} - </span> - <div class="detail"> - <span class="text grey octicon octicon-trashcan"></span> + <span class="octicon octicon-primitive-dot"></span> + <a class="ui avatar image" href="{{.Poster.HomeLink}}"> + <img src="{{.Poster.RelAvatarLink}}"> + </a> + <span class="text grey"> + {{$.i18n.Tr "repo.issues.dependency.removed_dependency" .Poster.HomeLink (.Poster.GetDisplayName|Escape) $createdStr | Safe}} + </span> + <div class="detail"> + <span class="text grey octicon octicon-trashcan"></span> <span class="text grey"><a href="{{$.RepoLink}}/issues/{{.DependentIssue.Index}}">#{{.DependentIssue.Index}} {{.DependentIssue.Title}}</a></span> - </div> - </div> + </div> + </div> {{else if eq .Type 22}} - <div class="event" id="{{.HashTag}}"> - <span class="octicon octicon-{{.Review.Type.Icon}}"></span> - <a class="ui avatar image" href="{{.Poster.HomeLink}}"> - <img src="{{.Poster.RelAvatarLink}}"> - </a> - <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a> - {{if eq .Review.Type 1}} - {{$.i18n.Tr "repo.issues.review.approve" $createdStr | Safe}} - {{else if eq .Review.Type 2}} - {{$.i18n.Tr "repo.issues.review.comment" $createdStr | Safe}} - {{else if eq .Review.Type 3}} - {{$.i18n.Tr "repo.issues.review.reject" $createdStr | Safe}} - {{else}} - {{$.i18n.Tr "repo.issues.review.comment" $createdStr | Safe}} - {{end}} - </span> - {{if .Content}} - <div class="detail"> + <div class="event" id="{{.HashTag}}"> + <span class="octicon octicon-{{.Review.Type.Icon}} issue-symbol"></span> + <a class="ui avatar image" href="{{.Poster.HomeLink}}"> + <img src="{{.Poster.RelAvatarLink}}"> + </a> + <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a> + {{if eq .Review.Type 1}} + {{$.i18n.Tr "repo.issues.review.approve" $createdStr | Safe}} + {{else if eq .Review.Type 2}} + {{$.i18n.Tr "repo.issues.review.comment" $createdStr | Safe}} + {{else if eq .Review.Type 3}} + {{$.i18n.Tr "repo.issues.review.reject" $createdStr | Safe}} + {{else}} + {{$.i18n.Tr "repo.issues.review.comment" $createdStr | Safe}} + {{end}} + </span> + {{if .Content}} + <div class="detail"> <span class="octicon octicon-quote"></span> - <span class="text grey">{{.Content}}</span> - </div> - {{end}} + <span class="text grey">{{.Content}}</span> + </div> + {{end}} {{ range $filename, $lines := .Review.CodeComments}} {{range $line, $comms := $lines}} <div class="ui segments"> @@ -358,36 +358,34 @@ </div> {{end}} {{end}} - </div> + </div> {{else if eq .Type 23}} <div class="event"> - <span class="octicon octicon-lock" - style="font-size:20px;margin-left:-28.5px; margin-right: -1px"></span> + <span class="octicon octicon-lock issue-symbol"></span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> {{ if .Content }} - <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a> + <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a> {{$.i18n.Tr "repo.issues.lock_with_reason" .Content $createdStr | Safe}} - </span> + </span> {{ else }} - <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a> + <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a> {{$.i18n.Tr "repo.issues.lock_no_reason" $createdStr | Safe}} - </span> + </span> {{ end }} </div> {{else if eq .Type 24}} <div class="event"> - <span class="octicon octicon-key" - style="font-size:20px;margin-left:-28.5px; margin-right: -1px"></span> + <span class="octicon octicon-key issue-symbol"></span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> - <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a> - {{$.i18n.Tr "repo.issues.unlock_comment" $createdStr | Safe}} - </span> + <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a> + {{$.i18n.Tr "repo.issues.unlock_comment" $createdStr | Safe}} + </span> </div> {{end}} {{end}} |