From fd0baf637dc7cc884a79ae339f43482d75f27b2d Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 4 Apr 2023 07:05:41 -0400 Subject: [PATCH] Org pages style fixes (#23901) (#23914) Backport #23901 by @silverwind Few fixes/enhancements around org pages: Use flexbox for member and repo lists and tweak rendering of tabs and list: Screenshot 2023-04-03 at 22 54 24 Screenshot 2023-04-03 at 22 55 15 Vertically center remove/leave buttons, add link to avatar: Screenshot 2023-04-03 at 21 51 20 Co-authored-by: silverwind --- templates/org/home.tmpl | 4 +--- templates/org/member/members.tmpl | 4 ++-- templates/org/team/members.tmpl | 12 ++++++------ templates/org/team/navbar.tmpl | 2 +- templates/org/team/repositories.tmpl | 26 +++++++++++++------------- web_src/css/organization.css | 13 ++++++------- 6 files changed, 29 insertions(+), 32 deletions(-) diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index e1adaf1c1b..66aa98e80d 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -51,9 +51,7 @@ {{$isMember := .IsOrganizationMember}} {{range .Members}} {{if or $isMember (call $.IsPublicMember .ID)}} - - {{avatar $.Context .}} - + {{avatar $.Context . 48}} {{end}} {{end}} diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index 0eae60fbfc..511d333c29 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -8,7 +8,7 @@ {{range .Members}}
- {{avatar $.Context . 48}} + {{avatar $.Context . 48}}
{{.Name}}
{{.FullName}}
@@ -55,7 +55,7 @@ {{end}}
{{end}} -
+
{{if eq $.SignedUser.ID .ID}}
diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index 6ea1614753..fd5e3b8458 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -25,19 +25,19 @@ {{end}}
{{range .Team.Members}} -
+
+ {{avatar $.Context . 48 "gt-mr-3 gt-mb-0"}} + + {{.DisplayName}} + {{if and $.IsOrganizationOwner (not (and ($.Team.IsOwnerTeam) (eq (len $.Team.Members) 1)))}} - {{end}} - - {{avatar $.Context .}} - {{.DisplayName}} -
{{else}}
diff --git a/templates/org/team/navbar.tmpl b/templates/org/team/navbar.tmpl index 436c69bfc6..44fe5f1c21 100644 --- a/templates/org/team/navbar.tmpl +++ b/templates/org/team/navbar.tmpl @@ -1,4 +1,4 @@ -
+
{{svg "octicon-person"}} {{.Team.NumMembers}}  {{$.locale.Tr "org.lower_members"}} {{svg "octicon-repo"}} {{.Team.NumRepos}}  {{$.locale.Tr "org.lower_repositories"}}
diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index 0391a762fa..c0f6b2561e 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -33,25 +33,25 @@ {{end}}
{{range .Team.Repos}} -
+
+ {{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}} + + {{$.Org.Name}}/{{.Name}} + {{if $canAddRemove}}
{{$.CsrfTokenHtml}}
{{end}} - - {{if .IsPrivate}} - {{svg "octicon-lock"}} - {{else if .IsFork}} - {{svg "octicon-repo-forked"}} - {{else if .IsMirror}} - {{svg "octicon-mirror"}} - {{else}} - {{svg "octicon-repo"}} - {{end}} - {{$.Org.Name}}/{{.Name}} -
{{else}}
diff --git a/web_src/css/organization.css b/web_src/css/organization.css index 0a7cd26513..35eaa3ae22 100644 --- a/web_src/css/organization.css +++ b/web_src/css/organization.css @@ -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; @@ -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), @@ -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, @@ -248,3 +243,7 @@ .organization.teams #repo-top-segment { height: 60px; } + +.org-team-navbar .active.item { + background: var(--color-box-body) !important; +}