Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Org pages style fixes #23901

Merged
merged 2 commits into from
Apr 4, 2023
Merged

Org pages style fixes #23901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f0c81c
Org pages style fixes
silverwind Apr 3, 2023
f3484c5
Merge branch 'main' into org-fixes
lunny Apr 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions templates/org/home.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,7 @@
{{$isMember := .IsOrganizationMember}}
{{range .Members}}
{{if or $isMember (call $.IsPublicMember .ID)}}
<a href="{{.HomeLink}}" title="{{.Name}}{{if .FullName}} ({{.FullName}}){{end}}">
{{avatar $.Context .}}
</a>
<a href="{{.HomeLink}}" title="{{.Name}}{{if .FullName}} ({{.FullName}}){{end}}">{{avatar $.Context . 48}}</a>
silverwind marked this conversation as resolved.
Show resolved Hide resolved
{{end}}
{{end}}
</div>
Expand Down
4 changes: 2 additions & 2 deletions templates/org/member/members.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{{range .Members}}
<div class="item ui grid">
<div class="ui four wide column" style="display: flex;">
{{avatar $.Context . 48}}
<a href="{{.HomeLink}}">{{avatar $.Context . 48}}</a>
<div>
<div class="meta"><a href="{{.HomeLink}}">{{.Name}}</a></div>
<div class="meta">{{.FullName}}</div>
Expand Down Expand Up @@ -55,7 +55,7 @@
{{end}}
</div>
{{end}}
<div class="ui three wide column">
<div class="ui three wide column gt-df gt-ac gt-je">
<div class="text right">
{{if eq $.SignedUser.ID .ID}}
<form>
Expand Down
12 changes: 6 additions & 6 deletions templates/org/team/members.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@
{{end}}
<div class="ui bottom attached table segment members">
{{range .Team.Members}}
<div class="item">
<div class="item gt-df gt-ac gt-fw">
<a href="{{.HomeLink}}">{{avatar $.Context . 48 "gt-mr-3 gt-mb-0"}}</a>
<a class="gt-f1" href="{{.HomeLink}}">
<strong>{{.DisplayName}}</strong>
</a>
{{if and $.IsOrganizationOwner (not (and ($.Team.IsOwnerTeam) (eq (len $.Team.Members) 1)))}}
<form>
<button class="ui red button delete-button right" data-modal-id="remove-team-member"
<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}}
<a href="{{.HomeLink}}">
{{avatar $.Context .}}
{{.DisplayName}}
</a>
</div>
{{else}}
<div class="item">
Expand Down
2 changes: 1 addition & 1 deletion templates/org/team/navbar.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="ui top attached tabular menu">
<div class="ui top attached tabular menu org-team-navbar">
<a class="item{{if .PageIsOrgTeamMembers}} active{{end}}" href="{{.OrgLink}}/teams/{{.Team.LowerName | PathEscape}}">{{svg "octicon-person"}} <strong>{{.Team.NumMembers}}</strong>&nbsp; {{$.locale.Tr "org.lower_members"}}</a>
<a class="item{{if .PageIsOrgTeamRepos}} active{{end}}" href="{{.OrgLink}}/teams/{{.Team.LowerName | PathEscape}}/repositories">{{svg "octicon-repo"}} <strong>{{.Team.NumRepos}}</strong>&nbsp; {{$.locale.Tr "org.lower_repositories"}}</a>
</div>
26 changes: 13 additions & 13 deletions templates/org/team/repositories.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,25 @@
{{end}}
<div class="ui bottom attached table segment repositories">
{{range .Team.Repos}}
<div class="item">
<div class="item gt-df gt-ac gt-fw">
{{if .IsPrivate}}
{{svg "octicon-lock" 16 "gt-mr-3"}}
{{else if .IsFork}}
{{svg "octicon-repo-forked" 16 "gt-mr-3"}}
{{else if .IsMirror}}
{{svg "octicon-mirror" 16 "gt-mr-3"}}
{{else}}
{{svg "octicon-repo" 16 "gt-mr-3"}}
{{end}}
<a class="member gt-f1" href="{{$.Org.HomeLink}}/{{.Name | PathEscape}}">
<strong>{{$.Org.Name}}/{{.Name}}</strong>
</a>
{{if $canAddRemove}}
<form method="post" action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/repo/remove">
{{$.CsrfTokenHtml}}
<button type="submit" class="ui red small button right" name="repoid" value="{{.ID}}">{{$.locale.Tr "remove"}}</button>
</form>
{{end}}
<a class="member" href="{{$.Org.HomeLink}}/{{.Name | PathEscape}}">
{{if .IsPrivate}}
{{svg "octicon-lock"}}
{{else if .IsFork}}
{{svg "octicon-repo-forked"}}
{{else if .IsMirror}}
{{svg "octicon-mirror"}}
{{else}}
{{svg "octicon-repo"}}
{{end}}
<strong>{{$.Org.Name}}/{{.Name}}</strong>
</a>
</div>
{{else}}
<div class="item">
Expand Down
13 changes: 6 additions & 7 deletions web_src/css/organization.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,6 @@
padding: 10px 15px;
}

.organization.teams .members a:hover,
.organization.profile .members a:hover {
text-decoration: none;
}

.organization.teams .members .ui.avatar,
.organization.profile .members .ui.avatar {
width: 48px;
Expand Down Expand Up @@ -218,8 +213,7 @@

.organization.teams .repositories .item,
.organization.teams .members .item {
padding: 10px 20px;
line-height: 32px;
padding: 10px 19px;
}

.organization.teams .repositories .item:not(:last-child),
Expand All @@ -230,6 +224,7 @@
.organization.teams .repositories .item .button,
.organization.teams .members .item .button {
padding: 9px 10px;
margin: 0;
}

.organization.teams #add-repo-form input,
Expand All @@ -248,3 +243,7 @@
.organization.teams #repo-top-segment {
height: 60px;
}

.org-team-navbar .active.item {
background: var(--color-box-body) !important;
}