From b9baed2c74286710481886c5d1f3010e43840012 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Tue, 1 Aug 2023 00:13:42 +0200 Subject: [PATCH] Introduce `flex-list` & `flex-item` elements for Gitea UI (#25790) This PR introduces a new UI element type for Gitea called `flex-item`. It consists of a horizontal card with a leading, main and trailing part: ![grafik](https://github.com/go-gitea/gitea/assets/47871822/395dd3f3-3906-4481-8f65-be6ac0acbe03) The idea behind it is that in Gitea UI, we have many cases where we use this kind of layout, but it is achieved in many different ways: - grid layout - `.ui.list` with additional hacky flexbox - `.ui.key.list` - looks to me like a style set originally created for ssh/gpg key list, was used in many other places - `.issue.list` - created for issue cards, used in many other places - ... This new style is based on `.issue.list`, specifically the refactoring of it done in #25750. In this PR, the new element is introduced and lots of templates are being refactored to use that style. This allows to remove a lot of page-specific css, makes many of the elements responsive or simply provides a cleaner/better-looking way to present information. A devtest section with the new style is also available.
Screenshots (left: before, right: after) ![Bildschirmfoto vom 2023-07-09 21-01-21](https://github.com/go-gitea/gitea/assets/47871822/545b7da5-b300-475f-bd6d-b7d836950bb5) ![Bildschirmfoto vom 2023-07-09 21-01-56](https://github.com/go-gitea/gitea/assets/47871822/b6f70415-6795-4f71-a5ea-117d56107ea1) ![Bildschirmfoto vom 2023-07-09 21-02-45](https://github.com/go-gitea/gitea/assets/47871822/47407121-3f2a-4778-8f6d-ad2687c2e7b3) ![Bildschirmfoto vom 2023-07-09 21-03-44](https://github.com/go-gitea/gitea/assets/47871822/76167aaf-c3b2-46f6-9ffd-709f20aa6a34) ![Bildschirmfoto vom 2023-07-09 21-04-52](https://github.com/go-gitea/gitea/assets/47871822/af8fdde5-711e-4524-99cf-fb5d68af85b9) ![Bildschirmfoto vom 2023-07-09 21-05-25](https://github.com/go-gitea/gitea/assets/47871822/ae406946-e3e4-4109-abfe-b3588a07b468) ![Bildschirmfoto vom 2023-07-09 21-06-35](https://github.com/go-gitea/gitea/assets/47871822/2dbacc04-24d6-4f91-9e42-e16d6e4b5f1f) ![Bildschirmfoto vom 2023-07-09 21-09-03](https://github.com/go-gitea/gitea/assets/47871822/d3ca4e56-a72f-4179-adc8-98bfd638025b) ![Bildschirmfoto vom 2023-07-09 21-09-44](https://github.com/go-gitea/gitea/assets/47871822/df1fa689-499c-4e54-b6fb-3b81644b725f) ![Bildschirmfoto vom 2023-07-09 21-10-27](https://github.com/go-gitea/gitea/assets/47871822/b21cac71-a85a-4c8c-bb99-ab90373d8e09) ![Bildschirmfoto vom 2023-07-09 21-11-12](https://github.com/go-gitea/gitea/assets/47871822/89be39cf-0af9-4f2d-9fca-42f9eb5e7824) ![Bildschirmfoto vom 2023-07-09 21-12-01](https://github.com/go-gitea/gitea/assets/47871822/079579ea-1ecb-49c0-b32b-b59ed957caec) ![Bildschirmfoto vom 2023-07-09 21-17-44](https://github.com/go-gitea/gitea/assets/47871822/61ac6ec4-a319-4d5c-9c99-2e02a77295ba) ![Bildschirmfoto vom 2023-07-09 21-18-27](https://github.com/go-gitea/gitea/assets/47871822/5b55b73f-6244-47f7-a3e6-c5e4a7474585) ![Bildschirmfoto vom 2023-07-09 21-19-18](https://github.com/go-gitea/gitea/assets/47871822/c1b7c22e-3e5a-46d4-b8d6-5560db478c0b) ![Bildschirmfoto vom 2023-07-09 21-29-13](https://github.com/go-gitea/gitea/assets/47871822/82ffca8d-ab2e-4a18-9954-5b685bf6a422) ![Bildschirmfoto vom 2023-07-09 21-30-11](https://github.com/go-gitea/gitea/assets/47871822/ad2fdccc-2be8-41bb-bfdc-a084aa387b61) ![Bildschirmfoto vom 2023-07-09 21-32-44](https://github.com/go-gitea/gitea/assets/47871822/2d298ba7-d084-48b5-a139-f86d56262110) ![Bildschirmfoto vom 2023-07-09 21-33-28](https://github.com/go-gitea/gitea/assets/47871822/4cbd838e-9de8-4ad0-8ed9-438da5c9a5cb)
--------- Co-authored-by: Giteabot --- templates/devtest/gitea-ui.tmpl | 58 +++++ templates/explore/organizations.tmpl | 39 +-- templates/explore/repo_list.tmpl | 100 +++---- templates/explore/users.tmpl | 31 ++- templates/org/member/members.tmpl | 89 +++---- templates/org/team/members.tmpl | 50 ++-- templates/org/team/repositories.tmpl | 59 +++-- .../package/shared/cleanup_rules/list.tmpl | 46 +++- templates/package/shared/list.tmpl | 16 +- templates/package/shared/versionlist.tmpl | 14 +- templates/repo/actions/runs_list.tmpl | 28 +- templates/repo/header.tmpl | 4 +- templates/repo/icon.tmpl | 2 +- templates/repo/settings/branches.tmpl | 41 +-- templates/repo/settings/collaboration.tmpl | 104 ++++---- templates/repo/settings/deploy_keys.tmpl | 30 +-- templates/repo/settings/options.tmpl | 169 ++++++------ templates/shared/issuelist.tmpl | 24 +- templates/shared/secrets/add_list.tmpl | 26 +- templates/shared/user/name.tmpl | 5 + templates/shared/variables/variable_list.tmpl | 33 ++- templates/user/dashboard/feeds.tmpl | 246 +++++++++--------- templates/user/settings/applications.tmpl | 31 ++- .../settings/applications_oauth2_list.tmpl | 27 +- templates/user/settings/grants_oauth2.tmpl | 30 +-- templates/user/settings/keys_gpg.tmpl | 48 ++-- templates/user/settings/keys_principal.tmpl | 24 +- templates/user/settings/keys_ssh.tmpl | 41 ++- templates/user/settings/organization.tmpl | 19 +- .../user/settings/security/accountlinks.tmpl | 30 ++- templates/user/settings/security/openid.tmpl | 29 ++- .../user/settings/security/webauthn.tmpl | 17 +- tests/integration/auth_ldap_test.go | 2 +- tests/integration/issue_test.go | 4 +- tests/integration/privateactivity_test.go | 2 +- tests/integration/setting_test.go | 4 +- web_src/css/actions.css | 15 ++ web_src/css/dashboard.css | 52 +--- web_src/css/explore.css | 51 ---- web_src/css/index.css | 2 +- web_src/css/org.css | 36 --- web_src/css/repo.css | 27 -- web_src/css/repo/issue-list.css | 33 +++ web_src/css/shared/flex-list.css | 94 +++++++ web_src/css/shared/issuelist.css | 134 ---------- web_src/css/user.css | 9 - 46 files changed, 955 insertions(+), 1020 deletions(-) create mode 100644 templates/shared/user/name.tmpl create mode 100644 web_src/css/shared/flex-list.css delete mode 100644 web_src/css/shared/issuelist.css diff --git a/templates/devtest/gitea-ui.tmpl b/templates/devtest/gitea-ui.tmpl index 8b31957f2e..9e15e3c1bc 100644 --- a/templates/devtest/gitea-ui.tmpl +++ b/templates/devtest/gitea-ui.tmpl @@ -253,5 +253,63 @@ {{template "shared/combomarkdowneditor" .}} + +
+

Flex List

+
+
+
+ {{svg "octicon-info" 32}} +
+
+
+ Flex Item + + with label + +
+
+ consists of leading/main/trailing part +
+
+ main part contains title and (multiple) body lines +
+
+
+ + +
+
+
+
+ {{svg "octicon-repo" 32}} +
+
+
+
+ + gitea-org / gitea + + {{svg "octicon-repo-forked"}} +
+
+ + Go + + {{svg "octicon-star" 16}}45000 + {{svg "octicon-git-branch" 16}}1234 +
+
+
+ when inside header, the trailing part will wrap below the title +
+
+
+
+
{{template "base/footer" .}} diff --git a/templates/explore/organizations.tmpl b/templates/explore/organizations.tmpl index ecf7f21bdd..ea788b149b 100644 --- a/templates/explore/organizations.tmpl +++ b/templates/explore/organizations.tmpl @@ -1,38 +1 @@ -{{template "base/head" .}} -
- {{template "explore/navbar" .}} -
- {{template "explore/search" .}} - -
- {{range .Users}} -
- {{avatar $.Context .}} -
- - {{.Name}} {{.FullName}} - {{if .Visibility.IsPrivate}} - {{$.locale.Tr "repo.desc.private"}} - {{end}} - -
- {{if .Location}} - {{svg "octicon-location"}} {{.Location}} - {{end}} - {{if and .Website}} - {{svg "octicon-link"}} - {{.Website}} - {{end}} - {{svg "octicon-calendar"}} {{$.locale.Tr "user.joined_on" (DateTime "short" .CreatedUnix) | Safe}} -
-
-
- {{else}} -
{{$.locale.Tr "explore.org_no_results"}}
- {{end}} -
- - {{template "base/paginate" .}} -
-
-{{template "base/footer" .}} +{{template "explore/users" .}} diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index 47e9921332..44f7900327 100644 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -1,66 +1,72 @@ -
+
{{range .Repos}} -
-
-
- {{$avatar := (repoAvatar . 32 "gt-mr-3")}} - {{if $avatar}} - {{$avatar}} - {{end}} - - {{if or $.PageIsExplore $.PageIsProfileStarList}}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}} - -
- {{if .IsArchived}} - {{$.locale.Tr "repo.desc.archived"}} - {{end}} - {{if .IsTemplate}} - {{if .IsPrivate}} - {{$.locale.Tr "repo.desc.private_template"}} +
+
+ {{$avatar := (repoAvatar . 32)}} + {{if $avatar}} + {{$avatar}} + {{else}} + {{template "repo/icon" .}} + {{end}} +
+
+
+
+ + {{if or $.PageIsExplore $.PageIsProfileStarList}}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}} + + + {{if .IsArchived}} + {{$.locale.Tr "repo.desc.archived"}} + {{end}} + {{if .IsTemplate}} + {{if .IsPrivate}} + {{$.locale.Tr "repo.desc.private_template"}} + {{else}} + {{if .Owner.Visibility.IsPrivate}} + {{$.locale.Tr "repo.desc.internal_template"}} + {{end}} + {{end}} {{else}} - {{if .Owner.Visibility.IsPrivate}} - {{$.locale.Tr "repo.desc.internal_template"}} + {{if .IsPrivate}} + {{$.locale.Tr "repo.desc.private"}} + {{else}} + {{if .Owner.Visibility.IsPrivate}} + {{$.locale.Tr "repo.desc.internal"}} + {{end}} {{end}} {{end}} - {{else}} - {{if .IsPrivate}} - {{$.locale.Tr "repo.desc.private"}} - {{else}} - {{if .Owner.Visibility.IsPrivate}} - {{$.locale.Tr "repo.desc.internal"}} - {{end}} - {{end}} - {{end}} + {{if .IsFork}} - {{svg "octicon-repo-forked"}} + {{svg "octicon-repo-forked"}} {{else if .IsMirror}} - {{svg "octicon-mirror"}} + {{svg "octicon-mirror"}} {{end}}
+
+ {{if .PrimaryLanguage}} + + {{.PrimaryLanguage.Language}} + + {{end}} + {{if not $.DisableStars}} + {{svg "octicon-star" 16}}{{.NumStars}} + {{end}} + {{svg "octicon-git-branch" 16}}{{.NumForks}} +
-
- {{if .PrimaryLanguage}} - - {{.PrimaryLanguage.Language}} - - {{end}} - {{if not $.DisableStars}} - {{svg "octicon-star" 16 "gt-mr-3"}}{{.NumStars}} - {{end}} - {{svg "octicon-git-branch" 16 "gt-mr-3"}}{{.NumForks}} -
-
-
{{$description := .DescriptionHTML $.Context}} - {{if $description}}

{{$description}}

{{end}} + {{if $description}} +
{{$description}}
+ {{end}} {{if .Topics}} -
+
{{range .Topics}} {{if ne . ""}}{{.}}{{end}} {{end}}
{{end}} -

{{$.locale.Tr "org.repo_updated"}} {{TimeSinceUnix .UpdatedUnix $.locale}}

+
{{$.locale.Tr "org.repo_updated"}} {{TimeSinceUnix .UpdatedUnix $.locale}}
{{else}} diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl index e3318479bb..5e150f692f 100644 --- a/templates/explore/users.tmpl +++ b/templates/explore/users.tmpl @@ -4,26 +4,35 @@
{{template "explore/search" .}} -
+
{{range .Users}} -
- {{avatar $.Context .}} -
- {{.Name}} {{.FullName}} -
+
+
+ {{avatar $.Context . 48}} +
+
+
+ {{template "shared/user/name" .}} + {{if .Visibility.IsPrivate}} + {{$.locale.Tr "repo.desc.private"}} + {{end}} +
+
{{if .Location}} - {{svg "octicon-location"}} {{.Location}} + {{svg "octicon-location"}}{{.Location}} {{end}} {{if and $.ShowUserEmail .Email $.IsSigned (not .KeepEmailPrivate)}} - {{svg "octicon-mail"}} - {{.Email}} + + {{svg "octicon-mail"}} + {{.Email}} + {{end}} - {{svg "octicon-calendar"}} {{$.locale.Tr "user.joined_on" (DateTime "short" .CreatedUnix) | Safe}} + {{svg "octicon-calendar"}}{{$.locale.Tr "user.joined_on" (DateTime "short" .CreatedUnix) | Safe}}
{{else}} -
{{$.locale.Tr "explore.user_no_results"}}
+
{{$.locale.Tr "explore.user_no_results"}}
{{end}}
diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index 3d5b3beebd..13b7d964f7 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -1,49 +1,31 @@ {{template "base/head" .}} -
+
{{template "org/header" .}}
{{template "base/alert" .}} -
+
{{range .Members}} -
-
+ {{$isPublic := index $.MembersIsPublicMember .ID}} +
+
{{avatar $.Context . 48}} -
-
{{.Name}}
-
{{.FullName}}
-
-
-
- {{$.locale.Tr "org.members.membership_visibility"}} -
-
- {{$isPublic := index $.MembersIsPublicMember .ID}} - {{if $isPublic}} - {{$.locale.Tr "org.members.public"}} - {{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}}({{$.locale.Tr "org.members.public_helper"}}){{end}} - {{else}} - {{$.locale.Tr "org.members.private"}} - {{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}}({{$.locale.Tr "org.members.private_helper"}}){{end}} +
+
+ {{template "shared/user/name" .}} + {{if not $isPublic}} + {{$.locale.Tr "org.members.private"}} {{end}}
-
- {{if not $.PublicOnly}} -
-
+ {{if not $.PublicOnly}} +
{{$.locale.Tr "org.members.member_role"}} + {{if index $.MembersIsUserOrgOwner .ID}}{{svg "octicon-shield-lock"}} {{$.locale.Tr "org.members.owner"}}{{else}}{{$.locale.Tr "org.members.member"}}{{end}}
-
- {{if index $.MembersIsUserOrgOwner .ID}}{{svg "octicon-shield-lock"}} {{$.locale.Tr "org.members.owner"}}{{else}}{{$.locale.Tr "org.members.member"}}{{end}} -
-
-
{{if $.IsOrganizationOwner}} -
+
{{$.locale.Tr "admin.users.2fa"}} -
-
{{if index $.MembersTwoFaStatus .ID}} {{svg "octicon-check"}} @@ -53,26 +35,31 @@
{{end}} -
- {{end}} -
-
- {{if eq $.SignedUser.ID .ID}} -
- -
- {{else if $.IsOrganizationOwner}} -
- -
+ {{end}} +
+
+ {{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}} + {{if $isPublic}} + {{svg "octicon-eye-closed" 12 "icon"}}{{$.locale.Tr "org.members.public_helper"}} + {{else}} + {{svg "octicon-eye" 12 "icon"}}{{$.locale.Tr "org.members.private_helper"}} {{end}} -
+ {{end}} + {{if eq $.SignedUser.ID .ID}} +
+ +
+ {{else if $.IsOrganizationOwner}} +
+ +
+ {{end}}
{{end}} diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index 6bd258955d..4a97763d9a 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -21,27 +21,35 @@
{{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}} -
- {{else}} -
- {{$.locale.Tr "org.teams.members.none"}} -
- {{end}} +
+
+ {{range .Team.Members}} +
+
+ {{avatar $.Context . 32}} +
+
+
+ {{template "shared/user/name" .}} +
+
+
+ {{if and $.IsOrganizationOwner (not (and ($.Team.IsOwnerTeam) (eq (len $.Team.Members) 1)))}} +
+ +
+ {{end}} +
+
+ {{else}} +
+ {{$.locale.Tr "org.teams.members.none"}} +
+ {{end}} +
{{if and .Invites $.IsOrganizationOwner}}

{{$.locale.Tr "org.teams.invite_team_member.list"}}

diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index 83e238016a..698b0a91ba 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -25,33 +25,38 @@
{{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}} -
- {{else}} -
- {{$.locale.Tr "org.teams.repos.none"}} -
- {{end}} +
+
+ {{range .Team.Repos}} +
+
+ {{$avatar := (repoAvatar . 32)}} + {{if $avatar}} + {{$avatar}} + {{else}} + {{template "repo/icon" .}} + {{end}} +
+
+ + {{$.Org.Name}}/{{.Name}} + +
+
+ {{if $canAddRemove}} +
+ {{$.CsrfTokenHtml}} + +
+ {{end}} +
+
+ {{else}} +
+ {{$.locale.Tr "org.teams.repos.none"}} +
+ {{end}} +
diff --git a/templates/package/shared/cleanup_rules/list.tmpl b/templates/package/shared/cleanup_rules/list.tmpl index 485bff562e..e2af344817 100644 --- a/templates/package/shared/cleanup_rules/list.tmpl +++ b/templates/package/shared/cleanup_rules/list.tmpl @@ -5,10 +5,41 @@
-
+
{{range .CleanupRules}} -
-
+
+
+ {{svg .Type.SVGName 32}} +
+
+
+ {{.Type.Name}} +
+
+ {{if .Enabled}}{{$.locale.Tr "enabled"}}{{else}}{{$.locale.Tr "disabled"}}{{end}} +
+ {{if .KeepCount}} +
+ {{$.locale.Tr "packages.owner.settings.cleanuprules.keep.count"}}: {{if eq .KeepCount 1}}{{$.locale.Tr "packages.owner.settings.cleanuprules.keep.count.1"}}{{else}}{{$.locale.Tr "packages.owner.settings.cleanuprules.keep.count.n" .KeepCount}}{{end}} +
+ {{end}} + {{if .KeepPattern}} +
+ {{$.locale.Tr "packages.owner.settings.cleanuprules.keep.pattern"}}: {{StringUtils.EllipsisString .KeepPattern 100}} +
+ {{end}} + {{if .RemoveDays}} +
+ {{$.locale.Tr "packages.owner.settings.cleanuprules.remove.days"}}: {{$.locale.Tr "tool.days" .RemoveDays}} +
+ {{end}} + {{if .RemovePattern}} +
+ {{$.locale.Tr "packages.owner.settings.cleanuprules.remove.pattern"}}: {{StringUtils.EllipsisString .RemovePattern 100}} +
+ {{end}} +
+
{{svg "octicon-kebab-horizontal"}}
@@ -17,15 +48,6 @@
- {{svg .Type.SVGName 36}} -
- {{.Type.Name}} -
{{if .Enabled}}{{$.locale.Tr "enabled"}}{{else}}{{$.locale.Tr "disabled"}}{{end}}
- {{if .KeepCount}}
{{$.locale.Tr "packages.owner.settings.cleanuprules.keep.count"}}: {{if eq .KeepCount 1}}{{$.locale.Tr "packages.owner.settings.cleanuprules.keep.count.1"}}{{else}}{{$.locale.Tr "packages.owner.settings.cleanuprules.keep.count.n" .KeepCount}}{{end}}
{{end}} - {{if .KeepPattern}}
{{$.locale.Tr "packages.owner.settings.cleanuprules.keep.pattern"}}: {{StringUtils.EllipsisString .KeepPattern 100}}
{{end}} - {{if .RemoveDays}}
{{$.locale.Tr "packages.owner.settings.cleanuprules.remove.days"}}: {{$.locale.Tr "tool.days" .RemoveDays}}
{{end}} - {{if .RemovePattern}}
{{$.locale.Tr "packages.owner.settings.cleanuprules.remove.pattern"}}: {{StringUtils.EllipsisString .RemovePattern 100}}
{{end}} -
{{else}}
{{.locale.Tr "packages.owner.settings.cleanuprules.none"}}
diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index 79a2d885fb..d2370b1208 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -12,15 +12,15 @@
-
+
{{range .PackageDescriptors}} -
  • -
    -
    - {{.Package.Name}} +
    +
    +
    + {{.Package.Name}} {{svg .Package.Type.SVGName 16}} {{.Package.Type.Name}}
    -
    +
    {{$timeStr := TimeSinceUnix .Version.CreatedUnix $.locale}} {{$hasRepositoryAccess := false}} {{if .Repository}} @@ -33,10 +33,10 @@ {{end}}
    -
    • +
    {{else}} {{if not .HasPackages}} -
    +
    {{svg "octicon-package" 48}}

    {{.locale.Tr "packages.empty"}}

    {{if and .Repository .CanWritePackages}} diff --git a/templates/package/shared/versionlist.tmpl b/templates/package/shared/versionlist.tmpl index feba8ef145..897f4d716a 100644 --- a/templates/package/shared/versionlist.tmpl +++ b/templates/package/shared/versionlist.tmpl @@ -18,18 +18,16 @@
    -
    +
    {{range .PackageDescriptors}} -
  • -
    -
    - {{.Version.LowerVersion}} -
    -
    +
    +
    + {{.Version.LowerVersion}} +
    {{$.locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix $.locale) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}}
    -
    • +
    {{else}}

    {{.locale.Tr "packages.filter.no_result"}}

    {{end}} diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index 87b5ed69de..1a45733b77 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -1,4 +1,4 @@ -
    +
    {{if eq (len .Runs) 0}}
    {{svg "octicon-no-entry" 48}} @@ -6,17 +6,15 @@
    {{end}} {{range .Runs}} -
  • -
    +
    +
    {{template "repo/actions/status" (dict "status" .Status.String "locale" $.locale)}}
    -
    -
    - - {{- .Title -}} - -
    -
    +
    + + {{- .Title -}} + +
    {{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}} : {{$.locale.Tr "actions.runs.commit"}} {{ShortSha .CommitSHA}} @@ -24,18 +22,18 @@ {{.TriggerUser.GetDisplayName}}
    -
    +
    {{if .RefLink}} {{.PrettyRef}} {{else}} {{.PrettyRef}} {{end}}
    -
    -
    {{svg "octicon-calendar" 16}}{{TimeSinceUnix .Updated $.locale}}
    -
    {{svg "octicon-stopwatch" 16}}{{.Duration}}
    +
    +
    {{svg "octicon-calendar" 16}}{{TimeSinceUnix .Updated $.locale}}
    +
    {{svg "octicon-stopwatch" 16}}{{.Duration}}
    -
    • +
    {{end}}
    {{template "base/paginate" .}} diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index b119c31948..865f3ba4a7 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -8,7 +8,9 @@ {{if $avatar}} {{$avatar}} {{else}} - {{template "repo/icon" .}} +
    + {{template "repo/icon" .}} +
    {{end}} {{.Owner.Name}}
    /
    diff --git a/templates/repo/icon.tmpl b/templates/repo/icon.tmpl index e956745153..a37197d42a 100644 --- a/templates/repo/icon.tmpl +++ b/templates/repo/icon.tmpl @@ -1,4 +1,4 @@ -
    +
    {{if $.IsTemplate}} {{svg "octicon-repo-template" 32}} {{else}} diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl index f8a0270db3..fcc3615ced 100644 --- a/templates/repo/settings/branches.tmpl +++ b/templates/repo/settings/branches.tmpl @@ -38,26 +38,27 @@
    -
    -
    -
    - - - {{range .ProtectedBranches}} - - - - - {{else}} - - {{end}} - -
    {{.RuleName}}
    		 - {{$.locale.Tr "repo.settings.edit_protected_branch"}} - -
    {{.locale.Tr "repo.settings.no_protected_branch"}}
    -
    +
    +
    + {{range .ProtectedBranches}} +
    +
    +
    +
    {{.RuleName}}
    +
    +
    +
    + {{$.locale.Tr "repo.settings.edit_protected_branch"}} + +
    +
    + {{else}} +
    + {{.locale.Tr "repo.settings.no_protected_branch"}} +
    + {{end}}
    {{end}} diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 84f23ee0bd..0716489291 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -4,34 +4,38 @@ {{.locale.Tr "repo.settings.collaboration"}} {{if .Collaborators}} -
    - {{range .Collaborators}} -
    -
    - - {{avatar $.Context .}} - {{.DisplayName}} - -
    -
    - {{svg "octicon-shield-lock"}} -
    -
    {{if eq .Collaboration.Mode 1}}{{$.locale.Tr "repo.settings.collaboration.read"}}{{else if eq .Collaboration.Mode 2}}{{$.locale.Tr "repo.settings.collaboration.write"}}{{else if eq .Collaboration.Mode 3}}{{$.locale.Tr "repo.settings.collaboration.admin"}}{{else}}{{$.locale.Tr "repo.settings.collaboration.undefined"}}{{end}}
    - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
    -
    {{$.locale.Tr "repo.settings.collaboration.admin"}}
    -
    {{$.locale.Tr "repo.settings.collaboration.write"}}
    -
    {{$.locale.Tr "repo.settings.collaboration.read"}}
    +
    +
    + {{range .Collaborators}} +
    +
    + {{avatar $.Context . 32}} +
    +
    +
    + {{template "shared/user/name" .}}
    +
    +
    + {{svg "octicon-shield-lock"}} +
    +
    {{if eq .Collaboration.Mode 1}}{{$.locale.Tr "repo.settings.collaboration.read"}}{{else if eq .Collaboration.Mode 2}}{{$.locale.Tr "repo.settings.collaboration.write"}}{{else if eq .Collaboration.Mode 3}}{{$.locale.Tr "repo.settings.collaboration.admin"}}{{else}}{{$.locale.Tr "repo.settings.collaboration.undefined"}}{{end}}
    + {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
    +
    {{$.locale.Tr "repo.settings.collaboration.admin"}}
    +
    {{$.locale.Tr "repo.settings.collaboration.write"}}
    +
    {{$.locale.Tr "repo.settings.collaboration.read"}}
    +
    +
    +
    + +
    -
    - -
    -
    - {{end}} + {{end}} +
    {{end}}
    @@ -54,35 +58,35 @@ {{$allowedToChangeTeams := (or (.Org.RepoAdminChangeTeamAccess) (.Permission.IsOwner))}} {{if .Teams}} -
    - {{range $t, $team := .Teams}} -
    -
    - - {{.Name}} - -
    -
    - {{svg "octicon-shield-lock"}} -
    -
    {{if eq .AccessMode 1}}{{$.locale.Tr "repo.settings.collaboration.read"}}{{else if eq .AccessMode 2}}{{$.locale.Tr "repo.settings.collaboration.write"}}{{else if eq .AccessMode 3}}{{$.locale.Tr "repo.settings.collaboration.admin"}}{{else if eq .AccessMode 4}}{{$.locale.Tr "repo.settings.collaboration.owner"}}{{else}}{{$.locale.Tr "repo.settings.collaboration.undefined"}}{{end}}
    +
    +
    + {{range $t, $team := .Teams}} +
    +
    + + {{.Name}} + +
    + {{svg "octicon-shield-lock"}} + {{if eq .AccessMode 1}}{{$.locale.Tr "repo.settings.collaboration.read"}}{{else if eq .AccessMode 2}}{{$.locale.Tr "repo.settings.collaboration.write"}}{{else if eq .AccessMode 3}}{{$.locale.Tr "repo.settings.collaboration.admin"}}{{else if eq .AccessMode 4}}{{$.locale.Tr "repo.settings.collaboration.owner"}}{{else}}{{$.locale.Tr "repo.settings.collaboration.undefined"}}{{end}} +
    + {{if or (eq .AccessMode 1) (eq .AccessMode 2)}} + {{$first := true}} +
    + Sections: {{range $u, $unit := $.Units}}{{if and ($.Repo.UnitEnabled $.Context $unit.Type) ($team.UnitEnabled $.Context $unit.Type)}}{{if $first}}{{$first = false}}{{else}}, {{end}}{{$.locale.Tr $unit.NameKey}}{{end}}{{end}} {{if $first}}None{{end}} +
    + {{end}}
    - {{if or (eq .AccessMode 1) (eq .AccessMode 2)}} - {{$first := true}} -
    - Sections: {{range $u, $unit := $.Units}}{{if and ($.Repo.UnitEnabled $.Context $unit.Type) ($team.UnitEnabled $.Context $unit.Type)}}{{if $first}}{{$first = false}}{{else}}, {{end}}{{$.locale.Tr $unit.NameKey}}{{end}}{{end}} {{if $first}}None{{end}} + {{if $allowedToChangeTeams}} +
    +
    {{end}}
    - {{if $allowedToChangeTeams}} -
    - -
    - {{end}} -
    - {{end}} + {{end}} +
    {{end}}
    diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index 621e1fa01e..10e79f6b82 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -43,26 +43,26 @@
    {{if .Deploykeys}} -
    +
    {{range .Deploykeys}} -
    -
    +
    +
    + {{svg "octicon-key" 32}} +
    +
    +
    {{.Name}}
    +
    + {{.Fingerprint}} +
    +
    + {{$.locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix) | Safe}} — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix}}{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}} - {{$.locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{$.locale.Tr "settings.can_write_info"}} {{end}} +
    +
    +
    -
    - {{svg "octicon-key" 32}} -
    -
    - {{.Name}} -
    - {{.Fingerprint}} -
    -
    - {{$.locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix) | Safe}} — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix}}{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}} - {{$.locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{$.locale.Tr "settings.can_write_info"}} {{end}} -
    -
    {{end}}
    diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index ef72c0eadc..f0b030dc54 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -692,103 +692,96 @@

    {{.locale.Tr "repo.settings.danger_zone"}}

    -
    - {{if .Repository.IsMirror}} -
    -
    - +
    +
    + {{if .Repository.IsMirror}} +
    +
    +
    {{.locale.Tr "repo.settings.convert"}}
    +
    {{.locale.Tr "repo.settings.convert_desc"}}
    +
    +
    + +
    -
    -
    {{.locale.Tr "repo.settings.convert"}}
    -

    {{.locale.Tr "repo.settings.convert_desc"}}

    + {{end}} + {{if and .Repository.IsFork .Repository.Owner.CanCreateRepo}} +
    +
    +
    {{.locale.Tr "repo.settings.convert_fork"}}
    +
    {{.locale.Tr "repo.settings.convert_fork_desc"}}
    +
    +
    + +
    -
    -
    - {{end}} - {{if and .Repository.IsFork .Repository.Owner.CanCreateRepo}} -
    -
    - -
    -
    -
    {{.locale.Tr "repo.settings.convert_fork"}}
    -

    {{.locale.Tr "repo.settings.convert_fork_desc"}}

    -
    -
    -
    - {{end}} -
    -
    - {{if .RepoTransfer}} -
    - {{.CsrfTokenHtml}} - - -
    - {{else}} - - {{end}} -
    -
    -
    {{.locale.Tr "repo.settings.transfer"}}
    - {{if .RepoTransfer}} -

    {{.locale.Tr "repo.settings.transfer_started" .RepoTransfer.Recipient.DisplayName}}

    - {{else}} -

    {{.locale.Tr "repo.settings.transfer_desc"}}

    - {{end}} -
    -
    - - {{if .Permission.CanRead $.UnitTypeWiki}} -
    - -
    -
    - -
    -
    -
    {{.locale.Tr "repo.settings.wiki_delete"}}
    -

    {{.locale.Tr "repo.settings.wiki_delete_desc"}}

    -
    -
    - {{end}} - -
    - -
    -
    - -
    -
    -
    {{.locale.Tr "repo.settings.delete"}}
    -

    {{.locale.Tr "repo.settings.delete_desc"}}

    -
    -
    - - {{if not .Repository.IsMirror}} -
    - -
    -
    - +
    -
    - {{if .Repository.IsArchived}} -
    {{.locale.Tr "repo.settings.unarchive.header"}}
    -

    {{.locale.Tr "repo.settings.unarchive.text"}}

    +
    + {{if .RepoTransfer}} +
    + {{.CsrfTokenHtml}} + + +
    {{else}} -
    {{.locale.Tr "repo.settings.archive.header"}}
    -

    {{.locale.Tr "repo.settings.archive.text"}}

    + {{end}}
    - {{end}} + {{if .Permission.CanRead $.UnitTypeWiki}} +
    +
    +
    {{.locale.Tr "repo.settings.wiki_delete"}}
    +
    {{.locale.Tr "repo.settings.wiki_delete_desc"}}
    +
    +
    + +
    +
    + {{end}} +
    +
    +
    {{.locale.Tr "repo.settings.delete"}}
    +
    {{.locale.Tr "repo.settings.delete_desc"}}
    +
    +
    + +
    +
    + {{if not .Repository.IsMirror}} +
    +
    + {{if .Repository.IsArchived}} +
    {{.locale.Tr "repo.settings.unarchive.header"}}
    +
    {{.locale.Tr "repo.settings.unarchive.text"}}
    + {{else}} +
    {{.locale.Tr "repo.settings.archive.header"}}
    +
    {{.locale.Tr "repo.settings.archive.text"}}
    + {{end}} +
    +
    + +
    +
    + {{end}} +
    {{end}}
    diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index 7d80e04736..30e19baf7c 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -1,19 +1,19 @@ -
    +
    {{$approvalCounts := .ApprovalCounts}} {{range .Issues}} -
  • -
    +
    +
    {{if $.CanWriteIssuesOrPulls}} - + {{end}} -
    +
    {{template "shared/issueicon" .}}
    -
    -
    -
    - {{RenderEmoji $.Context .Title | RenderCodeBlock}} +
    +
    +
    + {{RenderEmoji $.Context .Title | RenderCodeBlock}} {{if .IsPull}} {{if (index $.CommitStatuses .PullRequest.ID)}} {{template "repo/commit_statuses" dict "Status" (index $.CommitLastStatus .PullRequest.ID) "Statuses" (index $.CommitStatuses .PullRequest.ID) "root" $}} @@ -26,7 +26,7 @@
    {{if or .TotalTrackedTime .Assignees .NumComments}} -
    +
    {{if .TotalTrackedTime}}
    {{svg "octicon-clock" 16}} @@ -52,7 +52,7 @@
    {{end}}
    -
    +
    {{if eq $.listType "dashboard"}} {{.Repo.FullName}}#{{.Index}} @@ -149,7 +149,7 @@ {{end}}
    -
    • +
    {{end}} {{if .IssueIndexerUnavailable}}
    diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl index ce5351d22b..a80ec314d2 100644 --- a/templates/shared/secrets/add_list.tmpl +++ b/templates/shared/secrets/add_list.tmpl @@ -12,21 +12,23 @@
    {{if .Secrets}} -
    - {{range $i, $v := .Secrets}} -
    -
    -
    - {{svg "octicon-key" 32}} +
    + {{range .Secrets}} +
    +
    + {{svg "octicon-key" 32}} +
    +
    +
    + {{.Name}}
    -
    - {{$v.Name}} -
    ******
    +
    + ******
    -
    - - {{$.locale.Tr "settings.added_on" (DateTime "short" $v.CreatedUnix) | Safe}} +
    + + {{$.locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix) | Safe}} +
    +
    + + {{svg "fontawesome-send" 32}} +
    - {{svg "fontawesome-send" 36}} -
    -
    {{.Name}} +
    +
    + {{.Name}}

    {{$.locale.Tr "settings.repo_and_org_access"}}: {{if .DisplayPublicOnly}} @@ -36,10 +35,16 @@ {{end}}

    -
    - {{$.locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix) | Safe}} — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix}}{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}} +
    + {{$.locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix) | Safe}} — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix}}{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}
    +
    + +
    {{end}}
    diff --git a/templates/user/settings/applications_oauth2_list.tmpl b/templates/user/settings/applications_oauth2_list.tmpl index 3ffe317512..be6569c03c 100644 --- a/templates/user/settings/applications_oauth2_list.tmpl +++ b/templates/user/settings/applications_oauth2_list.tmpl @@ -1,24 +1,31 @@
    -
    -
    +
    +
    {{.locale.Tr "settings.oauth2_application_create_description"}}
    - {{range $app := .Applications}} -
    -
    - + {{range .Applications}} +
    +
    + {{svg "octicon-apps" 32}} +
    +
    +
    {{.Name}}
    +
    + {{$.locale.Tr "settings.oauth2_client_id"}} + {{.ClientID}} +
    +
    +
    + {{svg "octicon-pencil" 16 "gt-mr-2"}} {{$.locale.Tr "settings.oauth2_application_edit"}}
    -
    - {{$app.Name}} -
    {{end}}
    diff --git a/templates/user/settings/grants_oauth2.tmpl b/templates/user/settings/grants_oauth2.tmpl index b769020c62..dbe7d0409f 100644 --- a/templates/user/settings/grants_oauth2.tmpl +++ b/templates/user/settings/grants_oauth2.tmpl @@ -2,27 +2,27 @@ {{.locale.Tr "settings.authorized_oauth2_applications"}}
    -
    -
    +
    +
    {{.locale.Tr "settings.authorized_oauth2_applications_description"}}
    - {{range $grant := .Grants}} -
    -
    + {{range .Grants}} +
    +
    + {{svg "octicon-key" 32}} +
    +
    +
    {{.Application.Name}}
    +
    + {{$.locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix) | Safe}} +
    +
    +
    -
    - {{svg "octicon-key"}} -
    -
    - {{$grant.Application.Name}} -
    - {{$.locale.Tr "settings.added_on" (DateTime "short" $grant.CreatedUnix) | Safe}} -
    -
    {{end}}
    diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index ecbcf265ff..5ab96eb63a 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -39,13 +39,33 @@
    -
    -
    +
    +
    {{.locale.Tr "settings.gpg_desc"}}
    {{range .GPGKeys}} -
    -
    +
    +
    + {{svg "octicon-key" 32}} +
    +
    + {{if .Verified}} + {{svg "octicon-verified"}} {{$.locale.Tr "settings.gpg_key_verified"}} + {{end}} + {{if gt (len .Emails) 0}} + {{svg "octicon-mail"}} {{$.locale.Tr "settings.gpg_key_matched_identities"}} {{range .Emails}}{{.Email}} {{end}} + {{end}} +
    + {{$.locale.Tr "settings.key_id"}}: {{.PaddedKeyID}} + {{$.locale.Tr "settings.subkeys"}}: {{range .SubsKey}} {{.PaddedKeyID}} {{end}} +
    +
    + {{$.locale.Tr "settings.added_on" (DateTime "short" .AddedUnix) | Safe}} + - + {{if not .ExpiredUnix.IsZero}}{{$.locale.Tr "settings.valid_until_date" (DateTime "short" .ExpiredUnix) | Safe}}{{else}}{{$.locale.Tr "settings.valid_forever"}}{{end}} +
    +
    +
    @@ -53,26 +73,6 @@ {{$.locale.Tr "settings.gpg_key_verify"}} {{end}}
    -
    - {{svg "octicon-key" 32}} -
    -
    - {{if .Verified}} - {{svg "octicon-verified"}} {{$.locale.Tr "settings.gpg_key_verified"}} - {{end}} - {{if gt (len .Emails) 0}} - {{svg "octicon-mail"}} {{$.locale.Tr "settings.gpg_key_matched_identities"}} {{range .Emails}}{{.Email}} {{end}} - {{end}} -
    - {{$.locale.Tr "settings.key_id"}}: {{.PaddedKeyID}} - {{$.locale.Tr "settings.subkeys"}}: {{range .SubsKey}} {{.PaddedKeyID}} {{end}} -
    -
    - {{$.locale.Tr "settings.added_on" (DateTime "short" .AddedUnix) | Safe}} - - - {{if not .ExpiredUnix.IsZero}}{{$.locale.Tr "settings.valid_until_date" (DateTime "short" .ExpiredUnix) | Safe}}{{else}}{{$.locale.Tr "settings.valid_forever"}}{{end}} -
    -
    {{if and (not .Verified) (eq $.VerifyingID .KeyID)}}
    diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl index 7dda6665bd..42c21373d5 100644 --- a/templates/user/settings/keys_principal.tmpl +++ b/templates/user/settings/keys_principal.tmpl @@ -10,24 +10,26 @@
    -
    -
    +
    +
    {{.locale.Tr "settings.principal_desc"}}
    {{range .Principals}} -
    -
    +
    +
    + {{svg "octicon-key" 32}} +
    +
    +
    {{.Name}}
    +
    + {{$.locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix) | Safe}} — {{svg "octicon-info" 16}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix}}{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}} +
    +
    +
    - {{svg "octicon-key" 36}} -
    - {{.Name}} -
    - {{$.locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix) | Safe}} — {{svg "octicon-info" 16}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix}}{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}} -
    -
    {{end}}
    diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl index 0a47c44bd8..0d2916d30c 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -27,40 +27,39 @@
    -
    -
    +
    +
    {{.locale.Tr "settings.ssh_desc"}}
    {{if .DisableSSH}} -
    +
    {{.locale.Tr "settings.ssh_signonly"}}
    {{end}} {{range $index, $key := .Keys}} -
    -
    +
    +
    + {{svg "octicon-key" 32}} +
    +
    + {{if .Verified}} +
    {{svg "octicon-verified"}}{{$.locale.Tr "settings.ssh_key_verified"}}
    + {{end}} +
    {{.Name}}
    +
    + {{.Fingerprint}} +
    +
    + {{$.locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix) | Safe}} — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix}}{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}} +
    +
    +
    {{if and (not .Verified) (ne $.VerifyingFingerprint .Fingerprint)}} {{$.locale.Tr "settings.ssh_key_verify"}} {{end}} - -
    -
    - {{svg "octicon-key" 32}} -
    -
    - {{if .Verified}} - {{svg "octicon-verified"}} {{$.locale.Tr "settings.ssh_key_verified"}} - {{end}} - {{.Name}} -
    - {{.Fingerprint}} -
    -
    - {{$.locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix) | Safe}} — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix}}{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}} -
    {{if and (not .Verified) (eq $.VerifyingFingerprint .Fingerprint)}} diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl index 9b6d0f66c5..7a4ea17cb2 100644 --- a/templates/user/settings/organization.tmpl +++ b/templates/user/settings/organization.tmpl @@ -10,10 +10,19 @@
    {{if .Orgs}} -
    +
    {{range .Orgs}} -
    -
    +
    +
    + {{avatar $.Context . 28 "mini"}} +
    +
    +
    {{template "shared/user/name" .}}
    +
    + {{.Description}} +
    +
    +
    {{$.CsrfTokenHtml}}
    -
    - {{avatar $.Context . 28 "mini"}} - {{.Name}} -
    {{end}}
    diff --git a/templates/user/settings/security/accountlinks.tmpl b/templates/user/settings/security/accountlinks.tmpl index 515806d7a8..f64277b5af 100644 --- a/templates/user/settings/security/accountlinks.tmpl +++ b/templates/user/settings/security/accountlinks.tmpl @@ -21,21 +21,29 @@
    -
    -
    +
    +
    {{.locale.Tr "settings.manage_account_links_desc"}}
    {{range $loginSource, $provider := .AccountLinks}} -
    -
    - - {{$loginSource.Name}} - {{if $loginSource.IsActive}}{{$.locale.Tr "repo.settings.active"}}{{end}} - +
    + {{$providerData := index $.OAuth2Providers $loginSource.Name}} +
    + {{$providerData.IconHTML}} +
    +
    + + {{$loginSource.Name}} + + {{if $loginSource.IsActive}} + {{$.locale.Tr "repo.settings.active"}} + {{end}} +
    +
    +
    -
    {{end}}
    diff --git a/templates/user/settings/security/openid.tmpl b/templates/user/settings/security/openid.tmpl index dae49dcd89..86cb161bce 100644 --- a/templates/user/settings/security/openid.tmpl +++ b/templates/user/settings/security/openid.tmpl @@ -2,19 +2,20 @@ {{.locale.Tr "settings.manage_openid"}}
    -
    -
    +
    +
    {{.locale.Tr "settings.openid_desc"}}
    {{range .OpenIDs}} -
    -
    - +
    +
    + {{svg "fontawesome-openid" 20}}
    -
    -
    +
    +
    {{.URI}}
    +
    +
    + {{$.CsrfTokenHtml}} {{if .Show}} @@ -28,11 +29,11 @@ {{$.locale.Tr "settings.show_openid"}} {{end}} - -
    -
    - {{.URI}} -
    + + +
    {{end}}
    diff --git a/templates/user/settings/security/webauthn.tmpl b/templates/user/settings/security/webauthn.tmpl index 16551307c1..676754df59 100644 --- a/templates/user/settings/security/webauthn.tmpl +++ b/templates/user/settings/security/webauthn.tmpl @@ -2,18 +2,21 @@

    {{.locale.Tr "settings.webauthn_desc" | Str2html}}

    {{template "user/auth/webauthn_error" .}} -
    +
    {{range .WebAuthnCredentials}} -
    -
    +
    +
    + {{svg "octicon-key" 32}} +
    +
    +
    {{.Name}}
    + {{TimeSinceUnix .CreatedUnix $.locale}} +
    +
    -
    - {{.Name}} -
    - {{TimeSinceUnix .CreatedUnix $.locale}}
    {{end}}
    diff --git a/tests/integration/auth_ldap_test.go b/tests/integration/auth_ldap_test.go index 25395f5721..cf4c66734a 100644 --- a/tests/integration/auth_ldap_test.go +++ b/tests/integration/auth_ldap_test.go @@ -387,7 +387,7 @@ func TestLDAPUserSSHKeySync(t *testing.T) { htmlDoc := NewHTMLParser(t, resp.Body) - divs := htmlDoc.doc.Find(".key.list .print.meta") + divs := htmlDoc.doc.Find("#keys-ssh .flex-item .flex-item-body:not(:last-child)") syncedKeys := make([]string, divs.Length()) for i := 0; i < divs.Length(); i++ { diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go index b712e16f29..58577a37ff 100644 --- a/tests/integration/issue_test.go +++ b/tests/integration/issue_test.go @@ -30,9 +30,9 @@ import ( ) func getIssuesSelection(t testing.TB, htmlDoc *HTMLDoc) *goquery.Selection { - issueList := htmlDoc.doc.Find(".issue.list") + issueList := htmlDoc.doc.Find("#issue-list") assert.EqualValues(t, 1, issueList.Length()) - return issueList.Find("li").Find(".title") + return issueList.Find(".flex-item").Find(".issue-title") } func getIssue(t *testing.T, repoID int64, issueSelection *goquery.Selection) *issues_model.Issue { diff --git a/tests/integration/privateactivity_test.go b/tests/integration/privateactivity_test.go index 5d3291bfe3..8c95d7c8a6 100644 --- a/tests/integration/privateactivity_test.go +++ b/tests/integration/privateactivity_test.go @@ -58,7 +58,7 @@ func testPrivateActivityHelperEnablePrivateActivity(t *testing.T) { } func testPrivateActivityHelperHasVisibleActivitiesInHTMLDoc(htmlDoc *HTMLDoc) bool { - return htmlDoc.doc.Find(".feeds").Find(".news").Length() > 0 + return htmlDoc.doc.Find("#activity-feed").Find(".flex-item").Length() > 0 } func testPrivateActivityHelperHasVisibleActivitiesFromSession(t *testing.T, session *TestSession) bool { diff --git a/tests/integration/setting_test.go b/tests/integration/setting_test.go index a824bd7f2f..9dad9ca716 100644 --- a/tests/integration/setting_test.go +++ b/tests/integration/setting_test.go @@ -24,7 +24,7 @@ func TestSettingShowUserEmailExplore(t *testing.T) { resp := session.MakeRequest(t, req, http.StatusOK) htmlDoc := NewHTMLParser(t, resp.Body) assert.Contains(t, - htmlDoc.doc.Find(".ui.user.list").Text(), + htmlDoc.doc.Find(".explore.users").Text(), "user34@example.com", ) @@ -34,7 +34,7 @@ func TestSettingShowUserEmailExplore(t *testing.T) { resp = session.MakeRequest(t, req, http.StatusOK) htmlDoc = NewHTMLParser(t, resp.Body) assert.NotContains(t, - htmlDoc.doc.Find(".ui.user.list").Text(), + htmlDoc.doc.Find(".explore.users").Text(), "user34@example.com", ) diff --git a/web_src/css/actions.css b/web_src/css/actions.css index 31da79cabf..f081698c66 100644 --- a/web_src/css/actions.css +++ b/web_src/css/actions.css @@ -52,3 +52,18 @@ background-color: var(--color-yellow); color: var(--color-white); } + +.run-list-item-right { + flex: 0 0 15%; + display: flex; + flex-direction: column; + gap: 3px; + color: var(--color-text-light); +} + +.run-list-item-right .run-list-meta { + display: flex; + flex-wrap: nowrap; + gap: .25rem; + align-items: center; +} diff --git a/web_src/css/dashboard.css b/web_src/css/dashboard.css index 34428c5999..1eb480845b 100644 --- a/web_src/css/dashboard.css +++ b/web_src/css/dashboard.css @@ -96,61 +96,13 @@ } } -.feeds .news li { - display: flex; - align-items: baseline; - margin-top: 0.5rem; - margin-bottom: 0.5rem; -} - -.feeds .news li img { - align-self: flex-start; -} - -.feeds .news li > * + * { - margin-left: 0.35rem; -} - -.feeds .news > .ui.grid { - margin-left: auto; - margin-right: auto; -} - -.feeds .news .left .ui.avatar { - margin-top: 13px; -} - -.feeds .news .time-since { - font-size: 13px; -} - -.feeds .news .issue.title { - width: 80%; - margin: 0 0 1em; -} - -.feeds .news .push.news .content ul { - line-height: 18px; - font-size: 13px; - list-style: none; - padding-left: 10px; -} - -.feeds .news .push.news .content ul .text.truncate { - width: 80%; -} - -.feeds .news .commit-id { +.feeds .commit-id { font-family: var(--fonts-monospace); } -.feeds .news code { +.feeds code { padding: 2px 4px; border-radius: 3px; background-color: var(--color-markup-code-block); word-break: break-all; } - -.feeds .news:last-of-type .divider { - display: none !important; -} diff --git a/web_src/css/explore.css b/web_src/css/explore.css index 139dfcb19f..08858337c0 100644 --- a/web_src/css/explore.css +++ b/web_src/css/explore.css @@ -10,33 +10,6 @@ margin-right: 5px; } -.ui.repository.list .item { - padding-bottom: 1.5rem; -} - -.ui.repository.list .item:not(:first-child) { - border-top: 1px solid var(--color-secondary); - padding-top: 1.5rem; -} - -.ui.repository.list .item .ui.header { - font-size: 1.5rem; - margin-bottom: 0.5rem; -} - -.ui.repository.list .item .ui.header .name { - word-break: break-all; -} - -.ui.repository.list .item .time { - font-size: 12px; -} - -.ui.repository.list .repo-title .labels { - word-break: normal; - flex-shrink: 0; -} - .ui.repository.branches .info { font-size: 12px; color: var(--color-text-light); @@ -58,27 +31,3 @@ .ui.repository.branches table .ui.popup { text-align: left; } - -.ui.user.list .item { - padding-bottom: 25px; - display: flex; -} - -.ui.user.list .item:not(:first-child) { - border-top: 1px solid var(--color-secondary); - padding-top: 25px; -} - -.ui.user.list .item img.ui.avatar { - width: 40px; - height: 40px; - margin-right: 10px; -} - -.ui.user.list .item .description { - margin-top: 5px; -} - -.ui.user.list .item .description .svg:not(:first-child) { - margin-left: 5px; -} diff --git a/web_src/css/index.css b/web_src/css/index.css index 230e032ac0..55ea67453b 100644 --- a/web_src/css/index.css +++ b/web_src/css/index.css @@ -13,7 +13,7 @@ @import "./modules/svg.css"; @import "./modules/flexcontainer.css"; -@import "./shared/issuelist.css"; +@import "./shared/flex-list.css"; @import "./shared/milestone.css"; @import "./shared/repoorg.css"; @import "./shared/settings.css"; diff --git a/web_src/css/org.css b/web_src/css/org.css index 9e1fa38941..4bb3b0cd57 100644 --- a/web_src/css/org.css +++ b/web_src/css/org.css @@ -133,7 +133,6 @@ padding: 10px 15px; } -.organization.teams .members .ui.avatar, .organization.profile .members .ui.avatar { width: 48px; height: 48px; @@ -161,25 +160,6 @@ height: 100%; } -.organization.members .list .item { - margin-left: 0; - margin-right: 0; - border-bottom: 1px solid var(--color-secondary); -} - -.organization.members .list .item .ui.avatar { - width: 48px; - height: 48px; - margin-right: 1rem; - align-self: flex-start; -} - -.organization.members .list .item .meta { - line-height: 24px; - word-break: break-word; - min-width: 2em; -} - .organization.teams .detail .item { padding: 10px 15px; } @@ -188,22 +168,6 @@ border-bottom: 1px solid var(--color-secondary); } -.organization.teams .repositories .item, -.organization.teams .members .item { - padding: 10px 19px; -} - -.organization.teams .repositories .item:not(:last-child), -.organization.teams .members .item:not(:last-child) { - border-bottom: 1px solid var(--color-secondary); -} - -.organization.teams .repositories .item .button, -.organization.teams .members .item .button { - padding: 9px 10px; - margin: 0; -} - .org-team-navbar .active.item { background: var(--color-box-body) !important; } diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 04cb4eed2d..efa412dc53 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -584,15 +584,6 @@ min-width: 100px; } -.repository.options .danger .item { - padding: 20px 15px; -} - -.repository.options .danger .ui.divider { - margin: 0; - border-color: var(--color-error-border); -} - .repository.new.issue .comment.form .comment .avatar { width: 3em; } @@ -1927,15 +1918,6 @@ flex-wrap: wrap; } -.repository.settings.collaboration .collaborator.list { - padding: 0; -} - -.repository.settings.collaboration .collaborator.list > .item { - margin: 0; - line-height: 2; -} - .repository.settings.collaboration #repo-collab-form #search-user-box .results { left: 7px; } @@ -2389,15 +2371,6 @@ padding: 10px 0 0; } -.settings .list.key .meta { - padding-top: 5px; - color: var(--color-text-light-2); -} - -.settings .list.collaborator > .item { - padding: 0; -} - .ui.vertical.menu .header.item { font-size: 1.1em; background: var(--color-box-header); diff --git a/web_src/css/repo/issue-list.css b/web_src/css/repo/issue-list.css index 7769a16f5f..2a0a86c081 100644 --- a/web_src/css/repo/issue-list.css +++ b/web_src/css/repo/issue-list.css @@ -32,3 +32,36 @@ order: 2 !important; } } + +#issue-list .flex-item-body .branches { + display: inline-flex; +} + +#issue-list .flex-item-body .branches .branch { + background-color: var(--color-secondary-alpha-40); + border-radius: 3px; + padding: 0 4px; +} + +#issue-list .flex-item-body .branches .truncated-name { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + max-width: 10em; +} + +#issue-list .flex-item-body .checklist progress { + margin-left: 2px; + width: 80px; + height: 6px; + display: inline-block; + border-radius: 3px; +} + +#issue-list .flex-item-body .checklist progress::-webkit-progress-value { + background-color: var(--color-secondary-dark-4); +} + +#issue-list .flex-item-body .checklist progress::-moz-progress-bar { + background-color: var(--color-secondary-dark-4); +} \ No newline at end of file diff --git a/web_src/css/shared/flex-list.css b/web_src/css/shared/flex-list.css new file mode 100644 index 0000000000..7982241684 --- /dev/null +++ b/web_src/css/shared/flex-list.css @@ -0,0 +1,94 @@ +.flex-list { + list-style: none; +} + +.flex-item { + display: flex; + gap: 8px; + align-items: flex-start; +} + +.flex-item:not(:last-child) { + padding-bottom: 8px; +} + +.flex-item-baseline { + align-items: baseline; +} + +.flex-item-center { + align-items: center; +} + +.flex-item .flex-item-leading { + display: flex; + align-items: flex-start; +} + +.flex-item .flex-item-main { + display: flex; + flex-direction: column; + flex-grow: 1; + min-width: 0; +} + +.flex-item-header { + display: flex; + gap: .25rem; + justify-content: space-between; + flex-wrap: wrap; +} + +.flex-item a:not(.label, .button):hover { + color: var(--color-primary) !important; +} + +.flex-item .flex-item-icon svg { + margin-top: 1px; +} + +.flex-item .flex-item-trailing { + display: flex; + gap: 0.5rem; + align-items: center; + flex-grow: 0; + flex-wrap: wrap; + justify-content: end; + flex-shrink: 2; +} + +.flex-item .flex-item-title { + display: inline-flex; + flex-wrap: wrap; + align-items: center; + gap: .25rem; + max-width: 100%; + color: var(--color-text); + font-size: 16px; + min-width: 0; + font-weight: var(--font-weight-semibold); +} + +.flex-item .flex-item-title a { + color: var(--color-text); + overflow-wrap: anywhere; +} + +.flex-item .flex-item-body { + font-size: 13px; + display: flex; + align-items: center; + flex-wrap: wrap; + gap: .25rem; + color: var(--color-text-light-2); +} + +.flex-item .flex-item-body a { + color: inherit; + overflow-wrap: anywhere; +} + +.flex-list > .flex-item + .flex-item { + border-top: 1px solid var(--color-secondary); + padding-top: 8px; +} diff --git a/web_src/css/shared/issuelist.css b/web_src/css/shared/issuelist.css deleted file mode 100644 index 82fafedec0..0000000000 --- a/web_src/css/shared/issuelist.css +++ /dev/null @@ -1,134 +0,0 @@ -.issue.list { - list-style: none; - margin-top: 1rem; -} - -.issue.list .item { - display: flex; - align-items: baseline; - padding: 8px 0; -} - -.issue.list .item .issue-item-left { - display: flex; - align-items: flex-start; -} - -.issue.list .item .issue-item-main { - display: flex; - flex-direction: column; - width: 100%; -} - -.issue.list .item .issue-item-header { - display: flex; - justify-content: space-between; - align-items: center; - flex-wrap: wrap; -} - -.issue.list a:not(.label):hover { - color: var(--color-primary) !important; -} - -.issue.list > .item .issue-item-icon svg { - margin-right: 0.75rem; - margin-top: 1px; -} - -.issue.list .item .issue-item-right { - display: flex; - gap: 0.5rem; -} - -.issue.list > .action-item { - align-items: normal; -} - -.issue.list > .item .action-item-center { - display: flex; - align-items: center; - padding-left: 4px; - padding-right: 12px; -} - -.issue.list > .item .action-item-right { - flex: 0 0 15%; - display: flex; - flex-direction: column; - gap: 3px; - color: var(--color-text-light); -} - -.issue.list > .item .issue-item-title { - max-width: 100%; - color: var(--color-text); - font-size: 16px; - min-width: 0; - font-weight: var(--font-weight-semibold); -} - -.issue.list > .item .issue-item-title a.index { - max-width: fit-content; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 2; - overflow: hidden; - word-break: break-all; -} - -.issue.list > .item .title { - color: var(--color-text); - overflow-wrap: anywhere; -} - -.issue.list > .item .issue-item-body { - font-size: 13px; - display: flex; - align-items: center; - flex-wrap: wrap; - gap: .25rem; - color: var(--color-text-light-2); -} - -.issue.list > .item .issue-item-body a { - color: inherit; - word-break: break-word; -} - -.issue.list > .item .issue-item-body .checklist progress { - margin-left: 2px; - width: 80px; - height: 6px; - display: inline-block; - border-radius: 3px; -} - -.issue.list > .item .issue-item-body .checklist progress::-webkit-progress-value { - background-color: var(--color-secondary-dark-4); -} - -.issue.list > .item .issue-item-body .checklist progress::-moz-progress-bar { - background-color: var(--color-secondary-dark-4); -} - -.issue.list .branches { - display: inline-flex; -} - -.issue.list .branches .branch { - background-color: var(--color-secondary-alpha-40); - border-radius: 3px; - padding: 0 4px; -} - -.issue.list .branches .truncated-name { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - max-width: 10em; -} - -.issue.list > .item + .item { - border-top: 1px solid var(--color-secondary); -} diff --git a/web_src/css/user.css b/web_src/css/user.css index ab94c826b2..33e64bbb7c 100644 --- a/web_src/css/user.css +++ b/web_src/css/user.css @@ -58,15 +58,6 @@ } } -.user.profile .ui.repository.list { - margin-top: 25px; -} - -.user.profile .ui.repository.list .repo-title .labels { - word-break: normal; - flex-shrink: 0; -} - .user.profile #loading-heatmap { margin-bottom: 1em; }