mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-29 15:13:53 +03:00
8099238618
I think it's better if the primary actions have primary color instead of green which fits better into the overall single-color UI design. This PR currently replaces every green button with primary: <img width="141" alt="Screenshot 2023-09-16 at 14 07 59" src="https://github.com/go-gitea/gitea/assets/115237/843c1e50-4fb2-4ec6-84ba-0efb9472dcbe"> <img width="161" alt="Screenshot 2023-09-16 at 14 07 51" src="https://github.com/go-gitea/gitea/assets/115237/9442195a-a3b2-4a42-b262-8377d6f5c0d1"> Modal actions now use uncolored/primary instead of previous green/red colors. I also removed the box-shadow on all basic buttons: <img width="259" alt="Screenshot 2023-09-16 at 14 16 39" src="https://github.com/go-gitea/gitea/assets/115237/5beea529-127a-44b0-8d4c-afa7b034a490"> <img width="261" alt="Screenshot 2023-09-16 at 14 17 42" src="https://github.com/go-gitea/gitea/assets/115237/4757f7b2-4d46-49bc-a797-38bb28437b88"> The change currently includes the "Merge PR" button, for which we might want to make an exception to match the icon color there: <img width="442" alt="Screenshot 2023-09-16 at 14 33 53" src="https://github.com/go-gitea/gitea/assets/115237/993ac1a5-c94d-4895-b76c-0d872181a70b">
66 lines
3.5 KiB
Handlebars
66 lines
3.5 KiB
Handlebars
{{$resolved := (index .comments 0).IsResolved}}
|
|
{{$invalid := (index .comments 0).Invalidated}}
|
|
{{$resolveDoer := (index .comments 0).ResolveDoer}}
|
|
{{$isNotPending := (not (eq (index .comments 0).Review.Type 0))}}
|
|
{{$referenceUrl := printf "%s#%s" $.Issue.Link (index .comments 0).HashTag}}
|
|
<div class="conversation-holder" data-path="{{(index .comments 0).TreePath}}" data-side="{{if lt (index .comments 0).Line 0}}left{{else}}right{{end}}" data-idx="{{(index .comments 0).UnsignedLine}}">
|
|
{{if $resolved}}
|
|
<div class="ui attached header resolved-placeholder gt-df gt-ac gt-sb">
|
|
<div class="ui grey text gt-df gt-ac gt-fw gt-gap-2">
|
|
{{svg "octicon-check" 16 "icon gt-mr-2"}}
|
|
<b>{{$resolveDoer.Name}}</b> {{$.locale.Tr "repo.issues.review.resolved_by"}}
|
|
{{if $invalid}}
|
|
<!--
|
|
We only handle the case $resolved=true and $invalid=true in this template because if the comment is not resolved it has the outdated label in the comments area (not the header above).
|
|
The case $resolved=false and $invalid=true is handled in repo/diff/comments.tmpl
|
|
-->
|
|
<a href="{{AppSubUrl}}{{$referenceUrl}}" class="ui label basic small gt-ml-3" data-tooltip-content="{{$.locale.Tr "repo.issues.review.outdated_description"}}">
|
|
{{$.locale.Tr "repo.issues.review.outdated"}}
|
|
</a>
|
|
{{end}}
|
|
</div>
|
|
<div class="gt-df gt-ac gt-gap-3">
|
|
<button id="show-outdated-{{(index .comments 0).ID}}" data-comment="{{(index .comments 0).ID}}" class="ui tiny labeled button show-outdated gt-df gt-ac">
|
|
{{svg "octicon-unfold" 16 "gt-mr-3"}}
|
|
{{$.locale.Tr "repo.issues.review.show_resolved"}}
|
|
</button>
|
|
<button id="hide-outdated-{{(index .comments 0).ID}}" data-comment="{{(index .comments 0).ID}}" class="ui tiny labeled button hide-outdated gt-df gt-ac gt-hidden">
|
|
{{svg "octicon-fold" 16 "gt-mr-3"}}
|
|
{{$.locale.Tr "repo.issues.review.hide_resolved"}}
|
|
</button>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
<div id="code-comments-{{(index .comments 0).ID}}" class="field comment-code-cloud {{if $resolved}}gt-hidden{{end}}">
|
|
<div class="comment-list">
|
|
<ui class="ui comments">
|
|
{{template "repo/diff/comments" dict "root" $ "comments" .comments}}
|
|
</ui>
|
|
</div>
|
|
<div class="gt-df gt-je gt-ac gt-fw gt-mt-3">
|
|
<div class="ui buttons gt-mr-2">
|
|
<button class="ui icon tiny basic button previous-conversation">
|
|
{{svg "octicon-arrow-up" 12 "icon"}} {{$.locale.Tr "repo.issues.previous"}}
|
|
</button>
|
|
<button class="ui icon tiny basic button next-conversation">
|
|
{{svg "octicon-arrow-down" 12 "icon"}} {{$.locale.Tr "repo.issues.next"}}
|
|
</button>
|
|
</div>
|
|
{{if and $.CanMarkConversation $isNotPending}}
|
|
<button class="ui icon tiny basic button resolve-conversation" data-origin="diff" data-action="{{if not $resolved}}Resolve{{else}}UnResolve{{end}}" data-comment-id="{{(index .comments 0).ID}}" data-update-url="{{$.RepoLink}}/issues/resolve_conversation">
|
|
{{if $resolved}}
|
|
{{$.locale.Tr "repo.issues.review.un_resolve_conversation"}}
|
|
{{else}}
|
|
{{$.locale.Tr "repo.issues.review.resolve_conversation"}}
|
|
{{end}}
|
|
</button>
|
|
{{end}}
|
|
{{if and $.SignedUserID (not $.Repository.IsArchived)}}
|
|
<button class="comment-form-reply ui primary tiny labeled icon button gt-ml-2 gt-mr-0">
|
|
{{svg "octicon-reply" 16 "reply icon gt-mr-2"}}{{$.locale.Tr "repo.diff.comment.reply"}}
|
|
</button>
|
|
{{end}}
|
|
</div>
|
|
{{template "repo/diff/comment_form_datahandler" dict "hidden" true "reply" (index .comments 0).ReviewID "root" $ "comment" (index .comments 0)}}
|
|
</div>
|
|
</div>
|