diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 53a14a28e1..be5d5c77f4 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -21,25 +21,27 @@ {{end}}
- {{if .Issue.OriginalAuthor }} - - - {{ .Issue.OriginalAuthor }} - - - {{ .i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe }} - - - {{if .Repository.OriginalURL}} ({{$.i18n.Tr "repo.migrated_from" .Repository.OriginalURL .Repository.GetOriginalURLHostname | Safe }}){{end}} - - {{else}} - - {{.Issue.Poster.GetDisplayName}} - {{.i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe}} - - {{end}} - {{if not $.Repository.IsArchived}} -
+
+ {{if .Issue.OriginalAuthor }} + + + {{ .Issue.OriginalAuthor }} + + + {{ .i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe }} + + + {{if .Repository.OriginalURL}} ({{$.i18n.Tr "repo.migrated_from" .Repository.OriginalURL .Repository.GetOriginalURLHostname | Safe }}){{end}} + + {{else}} + + {{.Issue.Poster.GetDisplayName}} + {{.i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe}} + + {{end}} +
+
+ {{if not $.Repository.IsArchived}} {{if gt .Issue.ShowTag 0}}
{{if eq .Issue.ShowTag 2}} @@ -51,8 +53,8 @@ {{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}} -
- {{end}} + {{end}} +
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index e37c7e7fdd..9699371e00 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -20,13 +20,15 @@ {{end}}
- {{if .OriginalAuthor }} - {{ .OriginalAuthor }} {{$.i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe}} {{if $.Repository.OriginalURL}}({{$.i18n.Tr "repo.migrated_from" $.Repository.OriginalURL $.Repository.GetOriginalURLHostname | Safe }}){{end}} - {{else}} - {{.Poster.GetDisplayName}} {{$.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}} - {{end}} - {{if not $.Repository.IsArchived}} -
+
+ {{if .OriginalAuthor }} + {{ .OriginalAuthor }} {{$.i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe}} {{if $.Repository.OriginalURL}}({{$.i18n.Tr "repo.migrated_from" $.Repository.OriginalURL $.Repository.GetOriginalURLHostname | Safe }}){{end}} + {{else}} + {{.Poster.GetDisplayName}} {{$.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}} + {{end}} +
+
+ {{if not $.Repository.IsArchived}} {{if eq .PosterID .Issue.PosterID }}
{{$.i18n.Tr "repo.issues.poster"}} @@ -43,8 +45,8 @@ {{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))}} -
- {{end}} + {{end}} +
diff --git a/web_src/less/_form.less b/web_src/less/_form.less index 260910e95c..9ca6387bc3 100644 --- a/web_src/less/_form.less +++ b/web_src/less/_form.less @@ -10,13 +10,9 @@ .ui.attached.header { background: #f0f0f0; - .right { - margin-top: -5px; - - .button { - padding: 8px 10px; - font-weight: normal; - } + .right .button { + padding: 8px 10px; + font-weight: normal; } } diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 14b342cab3..7fe8216571 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -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; } + .header-left > * + *, + .header-right > * + * { + margin-left: .25rem; + } + .actions { - display: flex; - padding: 0 .5rem; - - &.right { - margin: 0; - } - a { + padding: .5rem; color: rgba(0, 0, 0, .4); &:hover {