mirror of
https://codeberg.org/forgejo/forgejo
synced 2024-11-24 18:56:11 +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">
89 lines
3.5 KiB
Handlebars
89 lines
3.5 KiB
Handlebars
{{template "base/head" .}}
|
|
<div role="main" aria-label="{{.Title}}" class="page-content organization teams">
|
|
{{template "org/header" .}}
|
|
<div class="ui container">
|
|
{{template "base/alert" .}}
|
|
<div class="ui stackable grid">
|
|
{{template "org/team/sidebar" .}}
|
|
<div class="ui ten wide column">
|
|
{{template "org/team/navbar" .}}
|
|
{{if .IsOrganizationOwner}}
|
|
<div class="ui attached segment">
|
|
<form class="ui form ignore-dirty gt-df gt-fw gt-gap-3" action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/add" method="post">
|
|
{{.CsrfTokenHtml}}
|
|
<input type="hidden" name="uid" value="{{.SignedUser.ID}}">
|
|
<div id="search-user-box" class="ui search gt-mr-3"{{if .IsEmailInviteEnabled}} data-allow-email="true" data-allow-email-description="{{.locale.Tr "org.teams.invite_team_member" $.Team.Name}}"{{end}}>
|
|
<div class="ui input">
|
|
<input class="prompt" name="uname" placeholder="{{.locale.Tr "repo.settings.search_user_placeholder"}}" autocomplete="off" required>
|
|
</div>
|
|
</div>
|
|
<button class="ui primary button">{{.locale.Tr "org.teams.add_team_member"}}</button>
|
|
</form>
|
|
</div>
|
|
{{end}}
|
|
<div class="ui attached segment">
|
|
<div class="flex-list">
|
|
{{range .Team.Members}}
|
|
<div class="flex-item gt-ac">
|
|
<div class="flex-item-leading">
|
|
<a href="{{.HomeLink}}">{{ctx.AvatarUtils.Avatar . 32}}</a>
|
|
</div>
|
|
<div class="flex-item-main">
|
|
<div class="flex-item-title">
|
|
{{template "shared/user/name" .}}
|
|
</div>
|
|
</div>
|
|
<div class="flex-item-trailing">
|
|
{{if and $.IsOrganizationOwner (not (and ($.Team.IsOwnerTeam) (eq (len $.Team.Members) 1)))}}
|
|
<form>
|
|
<button class="ui red button delete-button" data-modal-id="remove-team-member"
|
|
data-url="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/remove" data-datauid="{{.ID}}"
|
|
data-name="{{.DisplayName}}"
|
|
data-data-team-name="{{$.Team.Name}}">{{$.locale.Tr "org.members.remove"}}</button>
|
|
</form>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
{{else}}
|
|
<div class="flex-item">
|
|
<span class="text grey italic">{{$.locale.Tr "org.teams.members.none"}}</span>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
{{if and .Invites $.IsOrganizationOwner}}
|
|
<h4 class="ui top attached header">{{$.locale.Tr "org.teams.invite_team_member.list"}}</h4>
|
|
<div class="ui attached segment">
|
|
<div class="flex-list">
|
|
{{range .Invites}}
|
|
<div class="flex-item gt-ac">
|
|
<div class="flex-item-main">
|
|
{{.Email}}
|
|
</div>
|
|
<div class="flex-item-trailing">
|
|
<form action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/remove_invite" method="post">
|
|
{{$.CsrfTokenHtml}}
|
|
<input type="hidden" name="iid" value="{{.ID}}">
|
|
<button class="ui red button">{{$.locale.Tr "org.members.remove"}}</button>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="ui g-modal-confirm delete modal" id="remove-team-member">
|
|
<div class="header">
|
|
{{$.locale.Tr "org.members.remove"}}
|
|
</div>
|
|
<div class="content">
|
|
<p>{{$.locale.Tr "org.members.remove.detail" `<span class="name"></span>` `<span class="dataTeamName"></span>` | Safe}}</p>
|
|
</div>
|
|
{{template "base/modal_actions_confirm" .}}
|
|
</div>
|
|
{{template "base/footer" .}}
|