8099238618I 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">
74 lines
4.2 KiB
Handlebars
74 lines
4.2 KiB
Handlebars
<div class="commit-form-wrapper">
|
|
{{ctx.AvatarUtils.Avatar .SignedUser 48 "commit-avatar"}}
|
|
<div class="commit-form">
|
|
<h3>{{- if .CanCommitToBranch.WillSign}}
|
|
<span title="{{.locale.Tr "repo.signing.will_sign" .CanCommitToBranch.SigningKey}}">{{svg "octicon-lock" 24}}</span>
|
|
{{.locale.Tr "repo.editor.commit_signed_changes"}}
|
|
{{- else}}
|
|
<span title="{{.locale.Tr (printf "repo.signing.wont_sign.%s" .CanCommitToBranch.WontSignReason)}}">{{svg "octicon-unlock" 24}}</span>
|
|
{{.locale.Tr "repo.editor.commit_changes"}}
|
|
{{- end}}</h3>
|
|
<div class="field">
|
|
<input name="commit_summary" placeholder="{{if .PageIsDelete}}{{.locale.Tr "repo.editor.delete" .TreePath}}{{else if .PageIsUpload}}{{.locale.Tr "repo.editor.upload_files_to_dir" .TreePath}}{{else if .IsNewFile}}{{.locale.Tr "repo.editor.add_tmpl"}}{{else if .PageIsPatch}}{{.locale.Tr "repo.editor.patch"}}{{else}}{{.locale.Tr "repo.editor.update" .TreePath}}{{end}}" value="{{.commit_summary}}" autofocus>
|
|
</div>
|
|
<div class="field">
|
|
<textarea name="commit_message" placeholder="{{.locale.Tr "repo.editor.commit_message_desc"}}" rows="5">{{.commit_message}}</textarea>
|
|
</div>
|
|
<div class="inline field">
|
|
<div class="ui checkbox">
|
|
<input name="signoff" type="checkbox">
|
|
<label>{{.locale.Tr "repo.editor.signoff_desc"}}</label>
|
|
</div>
|
|
</div>
|
|
<div class="quick-pull-choice js-quick-pull-choice">
|
|
<div class="field">
|
|
<div class="ui radio checkbox {{if not .CanCommitToBranch.CanCommitToBranch}}disabled{{end}}">
|
|
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="direct" button_text="{{.locale.Tr "repo.editor.commit_changes"}}" {{if eq .commit_choice "direct"}}checked{{end}}>
|
|
<label>
|
|
{{svg "octicon-git-commit"}}
|
|
{{.locale.Tr "repo.editor.commit_directly_to_this_branch" (.BranchName|Escape) | Safe}}
|
|
{{if not .CanCommitToBranch.CanCommitToBranch}}
|
|
<div class="ui visible small warning message">
|
|
{{.locale.Tr "repo.editor.no_commit_to_branch"}}
|
|
<ul>
|
|
{{if not .CanCommitToBranch.UserCanPush}}<li>{{.locale.Tr "repo.editor.user_no_push_to_branch"}}</li>{{end}}
|
|
{{if and .CanCommitToBranch.RequireSigned (not .CanCommitToBranch.WillSign)}}<li>{{.locale.Tr "repo.editor.require_signed_commit"}}</li>{{end}}
|
|
</ul>
|
|
</div>
|
|
{{end}}
|
|
</label>
|
|
</div>
|
|
</div>
|
|
{{if not .Repository.IsEmpty}}
|
|
<div class="field">
|
|
<div class="ui radio checkbox">
|
|
{{if .CanCreatePullRequest}}
|
|
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch" button_text="{{.locale.Tr "repo.editor.propose_file_change"}}" {{if eq .commit_choice "commit-to-new-branch"}}checked{{end}}>
|
|
{{else}}
|
|
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch" button_text="{{.locale.Tr "repo.editor.commit_changes"}}" {{if eq .commit_choice "commit-to-new-branch"}}checked{{end}}>
|
|
{{end}}
|
|
<label>
|
|
{{svg "octicon-git-pull-request"}}
|
|
{{if .CanCreatePullRequest}}
|
|
{{.locale.Tr "repo.editor.create_new_branch" | Safe}}
|
|
{{else}}
|
|
{{.locale.Tr "repo.editor.create_new_branch_np" | Safe}}
|
|
{{end}}
|
|
</label>
|
|
</div>
|
|
</div>
|
|
<div class="quick-pull-branch-name {{if not (eq .commit_choice "commit-to-new-branch")}}gt-hidden{{end}}">
|
|
<div class="new-branch-name-input field {{if .Err_NewBranchName}}error{{end}}">
|
|
{{svg "octicon-git-branch"}}
|
|
<input type="text" name="new_branch_name" value="{{.new_branch_name}}" class="input-contrast gt-mr-2 js-quick-pull-new-branch-name" placeholder="{{.locale.Tr "repo.editor.new_branch_name_desc"}}" {{if eq .commit_choice "commit-to-new-branch"}}required{{end}} title="{{.locale.Tr "repo.editor.new_branch_name"}}">
|
|
<span class="text-muted js-quick-pull-normalization-info"></span>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
<button id="commit-button" type="submit" class="ui primary button">
|
|
{{if eq .commit_choice "commit-to-new-branch"}}{{.locale.Tr "repo.editor.propose_file_change"}}{{else}}{{.locale.Tr "repo.editor.commit_changes"}}{{end}}
|
|
</button>
|
|
<a class="ui button red" href="{{$.BranchLink}}/{{PathEscapeSegments .TreePath}}">{{.locale.Tr "repo.editor.cancel"}}</a>
|
|
</div>
|