lavender-legacy/gitea
7
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Comment Header fixes (#13356)

Browse source 
Apply more flexboxes on comment header and remove float hacks. Needs
1.13 backport.

Fixes: https://github.com/go-gitea/gitea/issues/13316

Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
silverwind 2020-10-31 14:17:52 +01:00 committed by GitHub
parent d01d39d6cf
commit 0e6bf7e4c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 43 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
templates/repo/issue/view_content.tmpl
View file

@ -21,6 +21,7 @@
{{end}}
<div class="content">
<div class="ui top attached header">
<div class="header-left df ac">
{{if .Issue.OriginalAuthor }}
<span class="text black">
<i class="fa {{MigrationIcon .Repository.GetOriginalURLHostname}}" aria-hidden="true"></i>
@ -38,8 +39,9 @@
{{.i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe}}
</span>
{{end}}
</div>
<div class="header-right actions df ac">
{{if not $.Repository.IsArchived}}
<div class="ui right actions">
{{if gt .Issue.ShowTag 0}}
<div class="ui basic label">
{{if eq .Issue.ShowTag 2}}
@ -51,9 +53,9 @@
{{end}}
{{template "repo/issue/view_content/add_reaction" Dict "ctx" $ "ActionURL" (Printf "%s/issues/%d/reactions" $.RepoLink .Issue.Index)}}
{{template "repo/issue/view_content/context_menu" Dict "ctx" $ "item" .Issue "delete" false "diff" false "IsCommentPoster" $.IsIssuePoster}}
</div>
{{end}}
</div>
</div>
<div class="ui attached segment">
<div class="render-content markdown">
{{if .Issue.RenderedContent}}

6
templates/repo/issue/view_content/comments.tmpl
View file

@ -20,13 +20,15 @@
{{end}}
<div class="content">
<div class="ui top attached header">
<div class="header-left df ac">
{{if .OriginalAuthor }}
<span class="text black"><i class="fa {{MigrationIcon $.Repository.GetOriginalURLHostname}}" aria-hidden="true"></i> {{ .OriginalAuthor }}</span><span class="text grey"> {{$.i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe}} {{if $.Repository.OriginalURL}}</span><span class="text migrate">({{$.i18n.Tr "repo.migrated_from" $.Repository.OriginalURL $.Repository.GetOriginalURLHostname | Safe }}){{end}}</span>
{{else}}
<span class="text grey"><a class="author"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.GetDisplayName}}</a> {{$.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}}</span>
{{end}}
</div>
<div class="header-right actions df ac">
{{if not $.Repository.IsArchived}}
<div class="ui right actions">
{{if eq .PosterID .Issue.PosterID }}
<div class="ui basic label">
{{$.i18n.Tr "repo.issues.poster"}}
@ -43,9 +45,9 @@
{{end}}
{{template "repo/issue/view_content/add_reaction" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.RepoLink .ID)}}
{{template "repo/issue/view_content/context_menu" Dict "ctx" $ "item" . "delete" true "diff" false "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}}
</div>
{{end}}
</div>
</div>
<div class="ui attached segment">
<div class="render-content markdown">
{{if .RenderedContent}}

6
web_src/less/_form.less
View file

@ -10,14 +10,10 @@
.ui.attached.header {
background: #f0f0f0;
.right {
margin-top: -5px;
.button {
.right .button {
padding: 8px 10px;
font-weight: normal;
}
}
}
@create-page-form-input-padding: 250px !important;

32
web_src/less/_repository.less
View file

@ -1002,27 +1002,6 @@
}
.comment {
.actions {
.item {
float: left;
&.context {
float: none;
}
&.tag {
margin-right: 5px;
}
&.action {
margin-top: 6px;
padding-left: 10px;
padding-right: 3px;
}
}
}
> .content {
> div:first-child {
border-top-left-radius: 4px;
@ -1062,15 +1041,14 @@
left: 7px;
}
.actions {
display: flex;
padding: 0 .5rem;
&.right {
margin: 0;
.header-left > * + *,
.header-right > * + * {
margin-left: .25rem;
}
.actions {
a {
padding: .5rem;
color: rgba(0, 0, 0, .4);
&:hover {