diff options
author | silverwind <me@silverwind.io> | 2020-09-11 22:19:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-11 16:19:00 -0400 |
commit | ffddf3f8a6ca5e3db46e5731d717a55eb58e858f (patch) | |
tree | de8b73f1346e81d2bb9acf042bd33eafd0df26c1 /templates/org | |
parent | 26c4a049da178993e5ccddcb50e7edc70a6bde5d (diff) | |
download | gitea-ffddf3f8a6ca5e3db46e5731d717a55eb58e858f.tar.gz gitea-ffddf3f8a6ca5e3db46e5731d717a55eb58e858f.zip |
Make SVG size argument optional (#12814)
Now defaults to 16 on both frontend and backend.
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'templates/org')
-rw-r--r-- | templates/org/header.tmpl | 4 | ||||
-rw-r--r-- | templates/org/home.tmpl | 10 | ||||
-rw-r--r-- | templates/org/member/members.tmpl | 6 | ||||
-rw-r--r-- | templates/org/settings/delete.tmpl | 2 | ||||
-rw-r--r-- | templates/org/team/navbar.tmpl | 4 | ||||
-rw-r--r-- | templates/org/team/repositories.tmpl | 8 | ||||
-rw-r--r-- | templates/org/team/sidebar.tmpl | 2 | ||||
-rw-r--r-- | templates/org/team/teams.tmpl | 2 |
8 files changed, 19 insertions, 19 deletions
diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl index 6593900c1e..17cc58fcbb 100644 --- a/templates/org/header.tmpl +++ b/templates/org/header.tmpl @@ -9,11 +9,11 @@ <div class="ui right"> <div class="ui menu"> <a class="{{if $.PageIsOrgMembers}}active{{end}} item" href="{{$.OrgLink}}/members"> - {{svg "octicon-organization" 16}} {{$.i18n.Tr "org.people"}} + {{svg "octicon-organization"}} {{$.i18n.Tr "org.people"}} <div class="floating ui black label">{{.NumMembers}}</div> </a> <a class="{{if $.PageIsOrgTeams}}active{{end}} item" href="{{$.OrgLink}}/teams"> - {{svg "octicon-people" 16}} {{$.i18n.Tr "org.teams"}} + {{svg "octicon-people"}} {{$.i18n.Tr "org.teams"}} <div class="floating ui black label">{{.NumTeams}}</div> </a> </div> diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index 7fc2a5c2de..01c1fe66b0 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -7,12 +7,12 @@ <div id="org-info"> <div class="ui header"> {{.Org.DisplayName}} - {{if .IsOrganizationOwner}}<a class="middle text grey" href="{{.OrgLink}}/settings">{{svg "octicon-gear" 16}}</a>{{end}} + {{if .IsOrganizationOwner}}<a class="middle text grey" href="{{.OrgLink}}/settings">{{svg "octicon-gear"}}</a>{{end}} </div> {{if .Org.Description}}<p class="desc">{{.Org.Description}}</p>{{end}} <div class="text grey meta"> - {{if .Org.Location}}<div class="item">{{svg "octicon-location" 16}} <span>{{.Org.Location}}</span></div>{{end}} - {{if .Org.Website}}<div class="item">{{svg "octicon-link" 16}} <a target="_blank" rel="noopener noreferrer" href="{{.Org.Website}}">{{.Org.Website}}</a></div>{{end}} + {{if .Org.Location}}<div class="item">{{svg "octicon-location"}} <span>{{.Org.Location}}</span></div>{{end}} + {{if .Org.Website}}<div class="item">{{svg "octicon-link"}} <a target="_blank" rel="noopener noreferrer" href="{{.Org.Website}}">{{.Org.Website}}</a></div>{{end}} </div> </div> </div> @@ -38,7 +38,7 @@ <strong>{{.i18n.Tr "org.people"}}</strong> {{if .IsOrganizationMember}} <div class="ui right"> - <a class="text grey" href="{{.OrgLink}}/members">{{.Org.NumMembers}} {{svg "octicon-chevron-right" 16}}</a> + <a class="text grey" href="{{.OrgLink}}/members">{{.Org.NumMembers}} {{svg "octicon-chevron-right"}}</a> </div> {{end}} </h4> @@ -55,7 +55,7 @@ <div class="ui top attached header"> <strong>{{.i18n.Tr "org.teams"}}</strong> <div class="ui right"> - <a class="text grey" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right" 16}}</a> + <a class="text grey" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right"}}</a> </div> </div> <div class="ui attached table segment teams"> diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index 1c33c55c5a..f33f9be927 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -34,7 +34,7 @@ {{$.i18n.Tr "org.members.member_role"}} </div> <div class="meta"> - <strong>{{if index $.MembersIsUserOrgOwner .ID}}{{svg "octicon-shield-lock" 16}} {{$.i18n.Tr "org.members.owner"}}{{else}}{{$.i18n.Tr "org.members.member"}}{{end}}</strong> + <strong>{{if index $.MembersIsUserOrgOwner .ID}}{{svg "octicon-shield-lock"}} {{$.i18n.Tr "org.members.owner"}}{{else}}{{$.i18n.Tr "org.members.member"}}{{end}}</strong> </div> </div> <div class="ui one wide column center"> @@ -44,9 +44,9 @@ <div class="meta"> <strong> {{if index $.MembersTwoFaStatus .ID}} - <span class="text green">{{svg "octicon-check" 16}}</span> + <span class="text green">{{svg "octicon-check"}}</span> {{else}} - {{svg "octicon-x" 16}} + {{svg "octicon-x"}} {{end}} </strong> </div> diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl index 729126b7b9..a189a2f5e3 100644 --- a/templates/org/settings/delete.tmpl +++ b/templates/org/settings/delete.tmpl @@ -11,7 +11,7 @@ </h4> <div class="ui attached warning segment"> <div class="ui red message"> - <p class="text left">{{svg "octicon-alert" 16}} {{.i18n.Tr "org.settings.delete_prompt" | Str2html}}</p> + <p class="text left">{{svg "octicon-alert"}} {{.i18n.Tr "org.settings.delete_prompt" | Str2html}}</p> </div> <form class="ui form ignore-dirty" id="delete-form" action="{{.Link}}" method="post"> {{.CsrfTokenHtml}} diff --git a/templates/org/team/navbar.tmpl b/templates/org/team/navbar.tmpl index 95329a2be3..18d638796c 100644 --- a/templates/org/team/navbar.tmpl +++ b/templates/org/team/navbar.tmpl @@ -1,4 +1,4 @@ <div class="ui top attached tabular menu"> - <a class="item{{if .PageIsOrgTeamMembers}} active{{end}}" href="{{.OrgLink}}/teams/{{.Team.LowerName}}">{{svg "octicon-person" 16}} <strong>{{.Team.NumMembers}}</strong> {{$.i18n.Tr "org.lower_members"}}</a> - <a class="item{{if .PageIsOrgTeamRepos}} active{{end}}" href="{{.OrgLink}}/teams/{{.Team.LowerName}}/repositories">{{svg "octicon-repo" 16}} <strong>{{.Team.NumRepos}}</strong> {{$.i18n.Tr "org.lower_repositories"}}</a> + <a class="item{{if .PageIsOrgTeamMembers}} active{{end}}" href="{{.OrgLink}}/teams/{{.Team.LowerName}}">{{svg "octicon-person"}} <strong>{{.Team.NumMembers}}</strong> {{$.i18n.Tr "org.lower_members"}}</a> + <a class="item{{if .PageIsOrgTeamRepos}} active{{end}}" href="{{.OrgLink}}/teams/{{.Team.LowerName}}/repositories">{{svg "octicon-repo"}} <strong>{{.Team.NumRepos}}</strong> {{$.i18n.Tr "org.lower_repositories"}}</a> </div> diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index f6cb4f028a..de39fee2ea 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -42,13 +42,13 @@ {{end}} <a class="member" href="{{AppSubUrl}}/{{$.Org.Name}}/{{.Name}}"> {{if .IsPrivate}} - {{svg "octicon-lock" 16}} + {{svg "octicon-lock"}} {{else if .IsFork}} - {{svg "octicon-repo-forked" 16}} + {{svg "octicon-repo-forked"}} {{else if .IsMirror}} - {{svg "octicon-mirror" 16}} + {{svg "octicon-mirror"}} {{else}} - {{svg "octicon-repo" 16}} + {{svg "octicon-repo"}} {{end}} <strong>{{$.Org.Name}}/{{.Name}}</strong> </a> diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl index d3bd082875..9ab6e8f4cd 100644 --- a/templates/org/team/sidebar.tmpl +++ b/templates/org/team/sidebar.tmpl @@ -55,7 +55,7 @@ </div> {{if .IsOrganizationOwner}} <div class="ui bottom attached segment"> - <a class="ui teal small button" href="{{.OrgLink}}/teams/{{.Team.LowerName}}/edit">{{svg "octicon-gear" 16}} {{$.i18n.Tr "org.teams.settings"}}</a> + <a class="ui teal small button" href="{{.OrgLink}}/teams/{{.Team.LowerName}}/edit">{{svg "octicon-gear"}} {{$.i18n.Tr "org.teams.settings"}}</a> </div> {{end}} </div> diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl index 6aef18dfff..e4be11ee52 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -5,7 +5,7 @@ {{template "base/alert" .}} {{if .IsOrganizationOwner}} <div class="text right"> - <a class="ui green button" href="{{.OrgLink}}/teams/new">{{svg "octicon-plus" 16}} {{.i18n.Tr "org.create_new_team"}}</a> + <a class="ui green button" href="{{.OrgLink}}/teams/new">{{svg "octicon-plus"}} {{.i18n.Tr "org.create_new_team"}}</a> </div> <div class="ui divider"></div> {{end}} |