mirror of
https://codeberg.org/forgejo/forgejo
synced 2024-11-27 20:26:09 +01: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">
45 lines
2.4 KiB
Handlebars
45 lines
2.4 KiB
Handlebars
{{if and $.root.SignedUserID (not $.Repository.IsArchived)}}
|
|
<form class="ui form {{if $.hidden}}gt-hidden comment-form{{end}}" action="{{$.root.Issue.Link}}/files/reviews/comments" method="post">
|
|
{{$.root.CsrfTokenHtml}}
|
|
<input type="hidden" name="origin" value="{{if $.root.PageIsPullFiles}}diff{{else}}timeline{{end}}">
|
|
<input type="hidden" name="latest_commit_id" value="{{$.root.AfterCommitID}}">
|
|
<input type="hidden" name="side" value="{{if $.Side}}{{$.Side}}{{end}}">
|
|
<input type="hidden" name="line" value="{{if $.Line}}{{$.Line}}{{end}}">
|
|
<input type="hidden" name="path" value="{{if $.File}}{{$.File}}{{end}}">
|
|
<input type="hidden" name="diff_start_cid">
|
|
<input type="hidden" name="diff_end_cid">
|
|
<input type="hidden" name="diff_base_cid">
|
|
|
|
{{template "shared/combomarkdowneditor" (dict
|
|
"locale" $.root.locale
|
|
"MarkdownPreviewUrl" (print $.root.Repository.Link "/markup")
|
|
"MarkdownPreviewContext" $.root.RepoLink
|
|
"TextareaName" "content"
|
|
"TextareaPlaceholder" ($.locale.Tr "repo.diff.comment.placeholder")
|
|
"DropzoneParentContainer" "form"
|
|
"DisableAutosize" "true"
|
|
)}}
|
|
|
|
<div class="field footer gt-mx-3">
|
|
<span class="markup-info">{{svg "octicon-markup"}} {{$.root.locale.Tr "repo.diff.comment.markdown_info"}}</span>
|
|
<div class="gt-text-right">
|
|
{{if $.reply}}
|
|
<button class="ui submit primary tiny button btn-reply" type="submit">{{$.root.locale.Tr "repo.diff.comment.reply"}}</button>
|
|
<input type="hidden" name="reply" value="{{$.reply}}">
|
|
<input type="hidden" name="single_review" value="true">
|
|
{{else}}
|
|
{{if $.root.CurrentReview}}
|
|
<button name="pending_review" type="submit" class="ui submit primary tiny button btn-add-comment">{{$.root.locale.Tr "repo.diff.comment.add_review_comment"}}</button>
|
|
{{else}}
|
|
<button name="pending_review" type="submit" class="ui submit primary tiny button btn-start-review">{{$.root.locale.Tr "repo.diff.comment.start_review"}}</button>
|
|
<button name="single_review" value="true" type="submit" class="ui submit tiny basic button btn-add-single">{{$.root.locale.Tr "repo.diff.comment.add_single_comment"}}</button>
|
|
{{end}}
|
|
{{end}}
|
|
{{if or (not $.HasComments) $.hidden}}
|
|
<button type="button" class="ui submit tiny basic button btn-cancel cancel-code-comment">{{$.root.locale.Tr "cancel"}}</button>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
</form>
|
|
{{end}}
|