mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-23 08:47:42 -05: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">
78 lines
2.8 KiB
Handlebars
78 lines
2.8 KiB
Handlebars
{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings edit")}}
|
|
<div class="repo-setting-content">
|
|
{{if .Repository.IsArchived}}
|
|
<div class="ui warning message gt-text-center">
|
|
{{.locale.Tr "repo.settings.archive.branchsettings_unavailable"}}
|
|
</div>
|
|
{{else}}
|
|
<h4 class="ui top attached header">
|
|
{{.locale.Tr "repo.default_branch"}}
|
|
</h4>
|
|
<div class="ui attached segment">
|
|
<p>
|
|
{{.locale.Tr "repo.settings.default_branch_desc"}}
|
|
</p>
|
|
<form class="gt-df" action="{{.Link}}" method="post">
|
|
{{.CsrfTokenHtml}}
|
|
<input type="hidden" name="action" value="default_branch">
|
|
{{if not .Repository.IsEmpty}}
|
|
<div class="ui dropdown selection gt-f1 gt-mr-3 gt-max-width-24rem">
|
|
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
|
|
<input type="hidden" name="branch" value="{{.Repository.DefaultBranch}}">
|
|
<div class="default text">{{.Repository.DefaultBranch}}</div>
|
|
<div class="menu">
|
|
{{range .Branches}}
|
|
<div class="item" data-value="{{.}}">{{.}}</div>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
<button class="ui primary button">{{$.locale.Tr "repo.settings.branches.update_default_branch"}}</button>
|
|
{{end}}
|
|
</form>
|
|
</div>
|
|
|
|
<h4 class="ui top attached header">
|
|
{{.locale.Tr "repo.settings.protected_branch"}}
|
|
<div class="ui right">
|
|
<a class="ui primary tiny button" href="{{$.Repository.Link}}/settings/branches/edit">{{$.locale.Tr "repo.settings.branches.add_new_rule"}}</a>
|
|
</div>
|
|
</h4>
|
|
|
|
<div class="ui attached segment">
|
|
<div class="flex-list">
|
|
{{range .ProtectedBranches}}
|
|
<div class="flex-item gt-ac">
|
|
<div class="flex-item-main">
|
|
<div class="flex-item-title">
|
|
<div class="ui basic primary label">{{.RuleName}}</div>
|
|
</div>
|
|
</div>
|
|
<div class="flex-item-trailing">
|
|
<a class="rm ui tiny button" href="{{$.Repository.Link}}/settings/branches/edit?rule_name={{.RuleName}}">{{$.locale.Tr "repo.settings.edit_protected_branch"}}</a>
|
|
<button class="ui red tiny button delete-button" data-url="{{$.Repository.Link}}/settings/branches/{{.ID}}/delete" data-id="{{.ID}}">
|
|
{{$.locale.Tr "repo.settings.protected_branch.delete_rule"}}
|
|
</button>
|
|
</div>
|
|
</div>
|
|
{{else}}
|
|
<div class="flex-item center aligned">
|
|
{{.locale.Tr "repo.settings.no_protected_branch"}}
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
|
|
<div class="ui g-modal-confirm delete modal">
|
|
<div class="header">
|
|
{{svg "octicon-trash"}}
|
|
{{.locale.Tr "repo.settings.protected_branch_deletion"}}
|
|
</div>
|
|
<div class="content">
|
|
<p>{{.locale.Tr "repo.settings.protected_branch_deletion_desc"}}</p>
|
|
</div>
|
|
{{template "base/modal_actions_confirm" .}}
|
|
</div>
|
|
|
|
{{template "repo/settings/layout_footer" .}}
|