From 001da674bbde1fc5504daca9a84750385b0d092a Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 7 Jul 2023 14:22:01 +0200 Subject: [PATCH 01/12] fix shared styles, additional fixes --- templates/repo/issue/labels/edit_delete_label.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl index b4eb6be7fcd1d..ae36c0e209315 100644 --- a/templates/repo/issue/labels/edit_delete_label.tmpl +++ b/templates/repo/issue/labels/edit_delete_label.tmpl @@ -30,7 +30,7 @@
{{.locale.Tr "repo.issues.label_exclusive_desc" | Safe}} -
+
{{svg "octicon-alert"}} {{.locale.Tr "repo.issues.label_exclusive_warning" | Safe}}
From 650a2261b5c8be2a513dcd039fa1c749dcb8b389 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 7 Jul 2023 14:43:24 +0200 Subject: [PATCH 02/12] restore accidentially removed class --- templates/repo/issue/labels/edit_delete_label.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl index ae36c0e209315..b4eb6be7fcd1d 100644 --- a/templates/repo/issue/labels/edit_delete_label.tmpl +++ b/templates/repo/issue/labels/edit_delete_label.tmpl @@ -30,7 +30,7 @@
{{.locale.Tr "repo.issues.label_exclusive_desc" | Safe}} -
+
{{svg "octicon-alert"}} {{.locale.Tr "repo.issues.label_exclusive_warning" | Safe}}
From 607257a7ce9f0d455b9725811c44a1401649248b Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sun, 9 Jul 2023 19:18:01 +0200 Subject: [PATCH 03/12] introduce flex-card style --- templates/devtest/gitea-ui.tmpl | 58 +++++ templates/explore/organizations.tmpl | 39 +-- templates/explore/repo_list.tmpl | 98 ++++---- 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 | 28 +-- templates/repo/settings/options.tmpl | 163 ++++++------ 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 | 234 +++++++++--------- 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 | 34 +-- templates/user/settings/keys_principal.tmpl | 24 +- templates/user/settings/keys_ssh.tmpl | 39 ++- templates/user/settings/organization.tmpl | 19 +- .../user/settings/security/accountlinks.tmpl | 26 +- templates/user/settings/security/openid.tmpl | 29 +-- .../user/settings/security/webauthn.tmpl | 17 +- 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/shared/flex-list.css | 128 ++++++++++ web_src/css/shared/issuelist.css | 134 ---------- web_src/css/user.css | 9 - 42 files changed, 931 insertions(+), 995 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 8b31957f2e0c4..b534bdd265ba0 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 Card + + 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 a20dd755ea5b0..ea788b149ba2c 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-clock"}} {{$.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 47e9921332a65..738f50ab653c0 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"}} - {{else}} - {{if .Owner.Visibility.IsPrivate}} - {{$.locale.Tr "repo.desc.internal_template"}} - {{end}} +
+
+ {{$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}} - {{else}} - {{if .IsPrivate}} - {{$.locale.Tr "repo.desc.private"}} + {{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"}} + {{if .IsPrivate}} + {{$.locale.Tr "repo.desc.private"}} + {{else}} + {{if .Owner.Visibility.IsPrivate}} + {{$.locale.Tr "repo.desc.internal"}} + {{end}} {{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 1f3b944f5eda3..6201fed4b9fd8 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/nameheader" .}} + {{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-clock"}} {{$.locale.Tr "user.joined_on" (DateTime "short" .CreatedUnix) | Safe}} + {{svg "octicon-clock"}}{{$.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 3d5b3beebd0f0..38dbdfb70e812 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/nameheader" .}} + {{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 6bd258955d45a..a9a3ac44832f6 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/nameheader" .}} +
+
+
+ {{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 83e238016a628..42ad2e19f0a42 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 485bff562e3f8..aa776679e0e0a 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 79a2d885fb37b..808333c0b43ae 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 feba8ef14579a..afd5da86fdf92 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 87b5ed69de155..a7ce63f62ed97 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 b119c31948916..865f3ba4a7a35 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 e9567451531a5..a37197d42af48 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 f8a0270db3897..24158f13f5e74 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 84f23ee0bdea4..14c367c965b59 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/nameheader" .}}
    +
    +
    + {{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 621e1fa01e22a..8f3068d7d2262 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}} +
    +
    + {{svg "octicon-key" 32}}
    -
    - {{.Name}} -
    +
    +
    {{.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}} +
    + {{$.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 4aff754e2ccd6..fe33b74633528 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -697,103 +697,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}} -
    -
    - + {{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}} +
    -
    -
    {{.locale.Tr "repo.settings.convert_fork"}}
    -

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

    +
    + {{if .RepoTransfer}} +
    + {{.CsrfTokenHtml}} + + +
    + {{else}} + + {{end}}
    -
    - {{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}} -
    - -
    -
    - + {{if .Permission.CanRead $.UnitTypeWiki}} +
    +
    +
    {{.locale.Tr "repo.settings.wiki_delete"}}
    +
    {{.locale.Tr "repo.settings.wiki_delete_desc"}}
    +
    +
    + +
    -
    -
    {{.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"}}
    +
    +
    +
    - {{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}} +
    {{end}}
    diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index 7d80e0473670a..1779d5a6688d1 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 ce5351d22b455..4c56c1f9104ef 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 3ffe317512b07..fdf3e72fdb052 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 b769020c629a4..d8f9653929627 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 ecbcf265ffcf2..d14bf565d6a56 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -39,40 +39,40 @@
    -
    -
    +
    +
    {{.locale.Tr "settings.gpg_desc"}}
    {{range .GPGKeys}} -
    -
    - - {{if and (not .Verified) (ne $.VerifyingID .KeyID)}} - {{$.locale.Tr "settings.gpg_key_verify"}} - {{end}} -
    -
    +
    +
    {{svg "octicon-key" 32}}
    -
    +
    {{if .Verified}} - {{svg "octicon-verified"}} {{$.locale.Tr "settings.gpg_key_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}} + {{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) (ne $.VerifyingID .KeyID)}} + {{$.locale.Tr "settings.gpg_key_verify"}} + {{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 7dda6665bdf01..99dccaf6ea3dc 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}}
    - {{svg "octicon-key" 36}} -
    - {{.Name}} -
    +
    +
    {{.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 0a47c44bd834a..7448bf22f1ae5 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -27,41 +27,40 @@
    -
    -
    +
    +
    {{.locale.Tr "settings.ssh_desc"}}
    {{if .DisableSSH}} -
    +
    {{.locale.Tr "settings.ssh_signonly"}}
    {{end}} {{range $index, $key := .Keys}} -
    -
    - - {{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"}} +
    {{svg "octicon-verified"}}{{$.locale.Tr "settings.ssh_key_verified"}}
    {{end}} - {{.Name}} -
    +
    {{.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.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}} +
    {{if and (not .Verified) (eq $.VerifyingFingerprint .Fingerprint)}}
    diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl index 9b6d0f66c5eb8..52a37d1567d3b 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"}} +
    +
    + {{.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 515806d7a883e..3586f778a48a5 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}} -
    -
    - +
    + {{$providerData := index $.OAuth2Providers $loginSource.Name}} +
    + {{$providerData.IconHTML}} +
    +
    + {{$loginSource.Name}} - {{if $loginSource.IsActive}}{{$.locale.Tr "repo.settings.active"}}{{end}} + {{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 dae49dcd89d60..8523745ff4517 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 16551307c1ee1..ed9743766adeb 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/setting_test.go b/tests/integration/setting_test.go index a824bd7f2fc95..9dad9ca716a06 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 31da79cabff4d..f081698c66de7 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 34428c5999d15..1eb480845b0d4 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 139dfcb19ff4b..08858337c0da3 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 fa918f49dad25..f42f17d64f919 100644 --- a/web_src/css/index.css +++ b/web_src/css/index.css @@ -12,7 +12,7 @@ @import "./modules/divider.css"; @import "./modules/svg.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 d579443ce14ab..424de335ed677 100644 --- a/web_src/css/org.css +++ b/web_src/css/org.css @@ -135,7 +135,6 @@ padding: 10px 15px; } -.organization.teams .members .ui.avatar, .organization.profile .members .ui.avatar { width: 48px; height: 48px; @@ -163,25 +162,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; } @@ -190,22 +170,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 da5cd06b3e8a4..373fd5554df99 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -583,15 +583,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; } @@ -1919,15 +1910,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; } @@ -2381,15 +2363,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/shared/flex-list.css b/web_src/css/shared/flex-list.css new file mode 100644 index 0000000000000..d9aa6b87b2e10 --- /dev/null +++ b/web_src/css/shared/flex-list.css @@ -0,0 +1,128 @@ +.flex-list { + list-style: none; +} + +.flex-card { + display: flex; + gap: 8px; + align-items: flex-start; +} + +.flex-card:not(:last-child) { + padding-bottom: 8px; +} + +.flex-card-baseline { + align-items: baseline; +} + +.flex-card-center { + align-items: center; +} + +.flex-card .flex-card-leading { + display: flex; + align-items: flex-start; +} + +.flex-card .flex-card-main { + display: flex; + flex-direction: column; + flex-grow: 1; + min-width: 0; +} + +.flex-card-header { + display: flex; + gap: .25rem; + justify-content: space-between; + flex-wrap: wrap; +} + +.flex-card a:not(.label, .button):hover { + color: var(--color-primary) !important; +} + +.flex-card .flex-card-icon svg { + margin-top: 1px; +} + +.flex-card .flex-card-trailing { + display: flex; + gap: 0.5rem; + align-items: center; + flex-grow: 0; + flex-wrap: wrap; + justify-content: end; + flex-shrink: 2; +} + + +.flex-card .flex-card-title { + display: 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-card .flex-card-title a { + color: var(--color-text); + overflow-wrap: anywhere; +} + +.flex-card .flex-card-body { + font-size: 13px; + display: flex; + align-items: center; + flex-wrap: wrap; + gap: .25rem; + color: var(--color-text-light-2); +} + +.flex-card .flex-card-body a { + color: inherit; + overflow-wrap: anywhere; +} + +.flex-card .flex-card-body .checklist progress { + margin-left: 2px; + width: 80px; + height: 6px; + display: inline-block; + border-radius: 3px; +} + +.flex-card .flex-card-body .checklist progress::-webkit-progress-value { + background-color: var(--color-secondary-dark-4); +} + +.flex-card .flex-card-body .checklist progress::-moz-progress-bar { + background-color: var(--color-secondary-dark-4); +} + +.flex-list .branches { + display: inline-flex; +} + +.flex-list .branches .branch { + background-color: var(--color-secondary-alpha-40); + border-radius: 3px; + padding: 0 4px; +} + +.flex-list .branches .truncated-name { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + max-width: 10em; +} + +.flex-list > .flex-card + .flex-card { + 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 82fafedec00a8..0000000000000 --- 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 54a966e7cb471..b25af3483f66d 100644 --- a/web_src/css/user.css +++ b/web_src/css/user.css @@ -60,15 +60,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; } From 86d9c1188dbbff4d82b94f11d5f528ff1dd6eac9 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sun, 9 Jul 2023 21:34:15 +0200 Subject: [PATCH 04/12] fixes --- templates/explore/users.tmpl | 2 +- templates/org/member/members.tmpl | 2 +- templates/org/team/members.tmpl | 2 +- templates/repo/settings/collaboration.tmpl | 2 +- templates/shared/secrets/add_list.tmpl | 2 +- templates/shared/variables/variable_list.tmpl | 2 +- templates/user/settings/applications.tmpl | 4 ++-- templates/user/settings/organization.tmpl | 2 +- web_src/css/shared/flex-list.css | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl index 6201fed4b9fd8..0f9219b231fa1 100644 --- a/templates/explore/users.tmpl +++ b/templates/explore/users.tmpl @@ -12,7 +12,7 @@
    - {{template "shared/user/nameheader" .}} + {{template "shared/user/name" .}} {{if .Visibility.IsPrivate}} {{$.locale.Tr "repo.desc.private"}} {{end}} diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index 38dbdfb70e812..f52306d52773b 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -13,7 +13,7 @@
    - {{template "shared/user/nameheader" .}} + {{template "shared/user/name" .}} {{if not $isPublic}} {{$.locale.Tr "org.members.private"}} {{end}} diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index a9a3ac44832f6..217e0d6cb487b 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -30,7 +30,7 @@
    - {{template "shared/user/nameheader" .}} + {{template "shared/user/name" .}}
    diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 14c367c965b59..ab1eca00e5995 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -13,7 +13,7 @@
    - {{template "shared/user/nameheader" .}} + {{template "shared/user/name" .}}
    diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl index 4c56c1f9104ef..de0343f582e40 100644 --- a/templates/shared/secrets/add_list.tmpl +++ b/templates/shared/secrets/add_list.tmpl @@ -14,7 +14,7 @@ {{if .Secrets}}
    {{range .Secrets}} -
    +
    {{svg "octicon-key" 32}}
    diff --git a/templates/shared/variables/variable_list.tmpl b/templates/shared/variables/variable_list.tmpl index a33877d614538..3572ce200f453 100644 --- a/templates/shared/variables/variable_list.tmpl +++ b/templates/shared/variables/variable_list.tmpl @@ -16,7 +16,7 @@ {{if .Variables}}
    {{range .Variables}} -
    +
    {{svg "octicon-pencil" 32}}
    diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl index 4ea8ed6bc119b..648c225af8dcc 100644 --- a/templates/user/settings/applications.tmpl +++ b/templates/user/settings/applications.tmpl @@ -16,8 +16,8 @@
    -
    - {{.Name}} +
    + {{.Name}}

    {{$.locale.Tr "settings.repo_and_org_access"}}: {{if .DisplayPublicOnly}} diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl index 52a37d1567d3b..660dee1115b52 100644 --- a/templates/user/settings/organization.tmpl +++ b/templates/user/settings/organization.tmpl @@ -17,7 +17,7 @@ {{avatar $.Context . 28 "mini"}}

    - {{.Name}} +
    {{template "shared/user/name" .}}
    {{.Description}}
    diff --git a/web_src/css/shared/flex-list.css b/web_src/css/shared/flex-list.css index d9aa6b87b2e10..d54d6bc0c4e8d 100644 --- a/web_src/css/shared/flex-list.css +++ b/web_src/css/shared/flex-list.css @@ -59,7 +59,7 @@ .flex-card .flex-card-title { - display: flex; + display: inline-flex; flex-wrap: wrap; align-items: center; gap: .25rem; From 62449e9835cf3f26eb88e2fedec154cba941a3a0 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sun, 9 Jul 2023 22:20:37 +0200 Subject: [PATCH 05/12] fix issues, reduce feed spacing --- templates/devtest/gitea-ui.tmpl | 2 +- templates/org/member/members.tmpl | 2 +- templates/shared/user/name.tmpl | 2 +- templates/user/dashboard/feeds.tmpl | 6 +++--- web_src/css/shared/flex-list.css | 1 - 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/templates/devtest/gitea-ui.tmpl b/templates/devtest/gitea-ui.tmpl index b534bdd265ba0..a47f292fbbc76 100644 --- a/templates/devtest/gitea-ui.tmpl +++ b/templates/devtest/gitea-ui.tmpl @@ -266,7 +266,7 @@ Flex Card with label - +
    consists of leading/main/trailing part diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index f52306d52773b..60b1e824fa9f1 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -39,7 +39,7 @@
    {{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}} - {{if $isPublic }} + {{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"}} diff --git a/templates/shared/user/name.tmpl b/templates/shared/user/name.tmpl index f47b03634153d..343c76240748f 100644 --- a/templates/shared/user/name.tmpl +++ b/templates/shared/user/name.tmpl @@ -2,4 +2,4 @@ {{.FullName}} ({{.Name}}) {{else}} {{.Name}} -{{end}} \ No newline at end of file +{{end}} diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index e530fa6cfb3b5..b6351e75bb80d 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -4,8 +4,8 @@
    {{avatarByAction $.Context .}}
    -
    -
    +
    +
    {{if gt .ActUser.ID 0}} {{.GetDisplayName}} {{else}} @@ -117,7 +117,7 @@
    {{$.locale.Tr "action.review_dismissed_reason"}}
    {{index .GetIssueInfos 2 | RenderEmoji $.Context}}
    {{end}} -
    {{TimeSince .GetCreate $.locale}}
    +
    {{TimeSince .GetCreate $.locale}}
    {{svg (printf "octicon-%s" (ActionIcon .GetOpType)) 32}} diff --git a/web_src/css/shared/flex-list.css b/web_src/css/shared/flex-list.css index d54d6bc0c4e8d..56478061e77bf 100644 --- a/web_src/css/shared/flex-list.css +++ b/web_src/css/shared/flex-list.css @@ -57,7 +57,6 @@ flex-shrink: 2; } - .flex-card .flex-card-title { display: inline-flex; flex-wrap: wrap; From fd6cce325fdf56676bd886549d369cf211aa6105 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sun, 9 Jul 2023 22:37:56 +0200 Subject: [PATCH 06/12] fix tests --- templates/explore/repo_list.tmpl | 2 +- templates/user/dashboard/feeds.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index 738f50ab653c0..a7cf813c751d4 100644 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -12,7 +12,7 @@
    - + {{if or $.PageIsExplore $.PageIsProfileStarList}}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}} diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index b6351e75bb80d..8c5d8d7818e56 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -1,6 +1,6 @@
    {{range .Feeds}} -
    +
    {{avatarByAction $.Context .}}
    From 759223cce09094232db1ea343b32cba1af8b35f7 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Mon, 10 Jul 2023 00:56:57 +0200 Subject: [PATCH 07/12] Update issue_test.go --- tests/integration/issue_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go index ab2986906bfd4..151c2de7fd83d 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(".flex-list") assert.EqualValues(t, 1, issueList.Length()) - return issueList.Find("li").Find(".title") + return issueList.Find(".flex-card").Find(".issue-title") } func getIssue(t *testing.T, repoID int64, issueSelection *goquery.Selection) *issues_model.Issue { From e059aab3c5b5c65fd606e9f89f1d42acb5b74136 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Mon, 10 Jul 2023 09:27:49 +0200 Subject: [PATCH 08/12] fix tests --- generate-ini-sqlite | 0 templates/shared/issuelist.tmpl | 2 +- templates/user/dashboard/feeds.tmpl | 4 ++-- templates/user/settings/keys_ssh.tmpl | 2 +- tests/integration/auth_ldap_test.go | 2 +- tests/integration/issue_test.go | 2 +- tests/integration/privateactivity_test.go | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 generate-ini-sqlite diff --git a/generate-ini-sqlite b/generate-ini-sqlite new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index 1779d5a6688d1..9983064338c3c 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -1,4 +1,4 @@ -
    +
    {{$approvalCounts := .ApprovalCounts}} {{range .Issues}}
    diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 8c5d8d7818e56..dd3ca3acb6e99 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -1,6 +1,6 @@ -
    +
    {{range .Feeds}} -
    +
    {{avatarByAction $.Context .}}
    diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl index 7448bf22f1ae5..4f07c70adb185 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -27,7 +27,7 @@
    -
    +
    {{.locale.Tr "settings.ssh_desc"}}
    diff --git a/tests/integration/auth_ldap_test.go b/tests/integration/auth_ldap_test.go index d2160a3dbea2c..a31abfcce0770 100644 --- a/tests/integration/auth_ldap_test.go +++ b/tests/integration/auth_ldap_test.go @@ -412,7 +412,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-card .flex-card-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 151c2de7fd83d..2f4fc7ca5f3bd 100644 --- a/tests/integration/issue_test.go +++ b/tests/integration/issue_test.go @@ -30,7 +30,7 @@ import ( ) func getIssuesSelection(t testing.TB, htmlDoc *HTMLDoc) *goquery.Selection { - issueList := htmlDoc.doc.Find(".flex-list") + issueList := htmlDoc.doc.Find("#issue-list") assert.EqualValues(t, 1, issueList.Length()) return issueList.Find(".flex-card").Find(".issue-title") } diff --git a/tests/integration/privateactivity_test.go b/tests/integration/privateactivity_test.go index 5d3291bfe395a..0ebc7a044371b 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-card").Length() > 0 } func testPrivateActivityHelperHasVisibleActivitiesFromSession(t *testing.T, session *TestSession) bool { From d731a23edefab705d1d0994c2bdfe5dbccd0b9fa Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Mon, 10 Jul 2023 09:29:44 +0200 Subject: [PATCH 09/12] rename flex-card to flex-item --- templates/devtest/gitea-ui.tmpl | 30 ++++----- templates/explore/repo_list.tmpl | 16 ++--- templates/explore/users.tmpl | 12 ++-- templates/org/member/members.tmpl | 14 ++-- templates/org/team/members.tmpl | 12 ++-- templates/org/team/repositories.tmpl | 12 ++-- .../package/shared/cleanup_rules/list.tmpl | 20 +++--- templates/package/shared/list.tmpl | 8 +-- templates/package/shared/versionlist.tmpl | 8 +-- templates/repo/actions/runs_list.tmpl | 12 ++-- templates/repo/settings/branches.tmpl | 10 +-- templates/repo/settings/collaboration.tmpl | 22 +++---- templates/repo/settings/deploy_keys.tmpl | 14 ++-- templates/repo/settings/options.tmpl | 64 +++++++++---------- templates/shared/issuelist.tmpl | 16 ++--- templates/shared/secrets/add_list.tmpl | 12 ++-- templates/shared/variables/variable_list.tmpl | 12 ++-- templates/user/dashboard/feeds.tmpl | 22 +++---- templates/user/settings/applications.tmpl | 14 ++-- .../settings/applications_oauth2_list.tmpl | 14 ++-- templates/user/settings/grants_oauth2.tmpl | 14 ++-- templates/user/settings/keys_gpg.tmpl | 14 ++-- templates/user/settings/keys_principal.tmpl | 14 ++-- templates/user/settings/keys_ssh.tmpl | 20 +++--- templates/user/settings/organization.tmpl | 10 +-- .../user/settings/security/accountlinks.tmpl | 12 ++-- templates/user/settings/security/openid.tmpl | 12 ++-- .../user/settings/security/webauthn.tmpl | 12 ++-- tests/integration/auth_ldap_test.go | 2 +- tests/integration/issue_test.go | 2 +- tests/integration/privateactivity_test.go | 2 +- web_src/css/shared/flex-list.css | 36 +++++------ 32 files changed, 247 insertions(+), 247 deletions(-) diff --git a/templates/devtest/gitea-ui.tmpl b/templates/devtest/gitea-ui.tmpl index a47f292fbbc76..9e15e3c1bc858 100644 --- a/templates/devtest/gitea-ui.tmpl +++ b/templates/devtest/gitea-ui.tmpl @@ -257,25 +257,25 @@

    Flex List

    -
    -
    +
    +
    {{svg "octicon-info" 32}}
    -
    -
    - Flex Card +
    +
    + Flex Item with label
    -
    +
    consists of leading/main/trailing part
    -
    +
    main part contains title and (multiple) body lines
    -
    +
    @@ -284,19 +284,19 @@
    -
    -
    +
    +
    {{svg "octicon-repo" 32}}
    -
    -
    -
    +
    +
    +
    gitea-org / gitea {{svg "octicon-repo-forked"}}
    -
    +
    Go @@ -304,7 +304,7 @@ {{svg "octicon-git-branch" 16}}1234
    -
    +
    when inside header, the trailing part will wrap below the title
    diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index a7cf813c751d4..44f79003270d9 100644 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -1,7 +1,7 @@
    {{range .Repos}} -
    -
    +
    +
    {{$avatar := (repoAvatar . 32)}} {{if $avatar}} {{$avatar}} @@ -9,9 +9,9 @@ {{template "repo/icon" .}} {{end}}
    -
    -
    -
    +
    +
    +
    {{if or $.PageIsExplore $.PageIsProfileStarList}}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}} @@ -43,7 +43,7 @@ {{svg "octicon-mirror"}} {{end}}
    -
    +
    {{if .PrimaryLanguage}} {{.PrimaryLanguage.Language}} @@ -57,7 +57,7 @@
    {{$description := .DescriptionHTML $.Context}} {{if $description}} -
    {{$description}}
    +
    {{$description}}
    {{end}} {{if .Topics}}
    @@ -66,7 +66,7 @@ {{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 0f9219b231fa1..cb1a39cf0d226 100644 --- a/templates/explore/users.tmpl +++ b/templates/explore/users.tmpl @@ -6,18 +6,18 @@
    {{range .Users}} -
    -
    +
    +
    {{avatar $.Context . 48}}
    -
    -
    +
    +
    {{template "shared/user/name" .}} {{if .Visibility.IsPrivate}} {{$.locale.Tr "repo.desc.private"}} {{end}}
    -
    +
    {{if .Location}} {{svg "octicon-location"}}{{.Location}} {{end}} @@ -32,7 +32,7 @@
    {{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 60b1e824fa9f1..13b7d964f73a9 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -7,24 +7,24 @@
    {{range .Members}} {{$isPublic := index $.MembersIsPublicMember .ID}} -
    -
    +
    +
    {{avatar $.Context . 48}}
    -
    -
    +
    +
    {{template "shared/user/name" .}} {{if not $isPublic}} {{$.locale.Tr "org.members.private"}} {{end}}
    {{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 $.IsOrganizationOwner}} -
    +
    {{$.locale.Tr "admin.users.2fa"}} {{if index $.MembersTwoFaStatus .ID}} @@ -37,7 +37,7 @@ {{end}} {{end}}
    -
    +
    {{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}} {{if $isPublic}} {{svg "octicon-eye-closed" 12 "icon"}}{{$.locale.Tr "org.members.public_helper"}} diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index 217e0d6cb487b..4a97763d9aa22 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -24,16 +24,16 @@
    {{range .Team.Members}} -
    -
    +
    +
    {{avatar $.Context . 32}}
    -
    -
    +
    +
    {{template "shared/user/name" .}}
    -
    +
    {{if and $.IsOrganizationOwner (not (and ($.Team.IsOwnerTeam) (eq (len $.Team.Members) 1)))}}
    {{else}} -
    +
    {{$.locale.Tr "org.teams.members.none"}}
    {{end}} diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index 42ad2e19f0a42..698b0a91bae39 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -28,8 +28,8 @@
    {{range .Team.Repos}} -
    -
    +
    +
    {{$avatar := (repoAvatar . 32)}} {{if $avatar}} {{$avatar}} @@ -37,12 +37,12 @@ {{template "repo/icon" .}} {{end}}
    -
    - +
    + {{$.Org.Name}}/{{.Name}}
    -
    +
    {{if $canAddRemove}} {{$.CsrfTokenHtml}} @@ -52,7 +52,7 @@
    {{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 aa776679e0e0a..e2af344817a52 100644 --- a/templates/package/shared/cleanup_rules/list.tmpl +++ b/templates/package/shared/cleanup_rules/list.tmpl @@ -7,39 +7,39 @@
    {{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"}}
    diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index 808333c0b43ae..d2370b1208cb1 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -14,13 +14,13 @@
    {{range .PackageDescriptors}} -
    -
    -
    +
    +
    +
    {{.Package.Name}} {{svg .Package.Type.SVGName 16}} {{.Package.Type.Name}}
    -
    +
    {{$timeStr := TimeSinceUnix .Version.CreatedUnix $.locale}} {{$hasRepositoryAccess := false}} {{if .Repository}} diff --git a/templates/package/shared/versionlist.tmpl b/templates/package/shared/versionlist.tmpl index afd5da86fdf92..897f4d716ae86 100644 --- a/templates/package/shared/versionlist.tmpl +++ b/templates/package/shared/versionlist.tmpl @@ -20,10 +20,10 @@
    {{range .PackageDescriptors}} -
    -
    - {{.Version.LowerVersion}} -
    +
    +
    + {{.Version.LowerVersion}} +
    {{$.locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix $.locale) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}}
    diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index a7ce63f62ed97..1a45733b77ca4 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -6,15 +6,15 @@
    {{end}} {{range .Runs}} -
    -
    +
    +
    {{template "repo/actions/status" (dict "status" .Status.String "locale" $.locale)}}
    -
    - +
    + {{- .Title -}} -
    +
    {{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}} : {{$.locale.Tr "actions.runs.commit"}} {{ShortSha .CommitSHA}} @@ -22,7 +22,7 @@ {{.TriggerUser.GetDisplayName}}
    -
    +
    {{if .RefLink}} {{.PrettyRef}} {{else}} diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl index 24158f13f5e74..fcc3615ced563 100644 --- a/templates/repo/settings/branches.tmpl +++ b/templates/repo/settings/branches.tmpl @@ -41,13 +41,13 @@
    {{range .ProtectedBranches}} -
    -
    -
    +
    +
    +
    {{.RuleName}}
    -
    +
    {{$.locale.Tr "repo.settings.edit_protected_branch"}}
    {{else}} -
    +
    {{.locale.Tr "repo.settings.no_protected_branch"}}
    {{end}} diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index ab1eca00e5995..0716489291dad 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -7,16 +7,16 @@
    {{range .Collaborators}} -
    -
    +
    +
    {{avatar $.Context . 32}}
    -
    -
    +
    +
    {{template "shared/user/name" .}}
    -
    +
    {{svg "octicon-shield-lock"}}
    @@ -61,24 +61,24 @@
    {{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 $allowedToChangeTeams}} -
    +
    diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index 8f3068d7d2262..10e79f6b82ac4 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -45,20 +45,20 @@ {{if .Deploykeys}}
    {{range .Deploykeys}} -
    -
    +
    +
    {{svg "octicon-key" 32}}
    -
    -
    {{.Name}}
    -
    +
    +
    {{.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}}
    -
    +
    diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 01e3086997807..f0b030dc54bad 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -695,31 +695,31 @@
    {{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"}}
    +
    +
    +
    {{.locale.Tr "repo.settings.convert_fork"}}
    +
    {{.locale.Tr "repo.settings.convert_fork_desc"}}
    -
    +
    {{end}} -
    -
    -
    {{.locale.Tr "repo.settings.transfer"}}
    -
    +
    +
    +
    {{.locale.Tr "repo.settings.transfer"}}
    +
    {{if .RepoTransfer}} {{.locale.Tr "repo.settings.transfer_started" .RepoTransfer.Recipient.DisplayName}} {{else}} @@ -727,7 +727,7 @@ {{end}}
    -
    +
    {{if .RepoTransfer}}
    {{.CsrfTokenHtml}} @@ -740,37 +740,37 @@
    {{if .Permission.CanRead $.UnitTypeWiki}} -
    -
    -
    {{.locale.Tr "repo.settings.wiki_delete"}}
    -
    {{.locale.Tr "repo.settings.wiki_delete_desc"}}
    +
    +
    +
    {{.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"}}
    +
    +
    +
    {{.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"}}
    +
    {{.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"}}
    +
    {{.locale.Tr "repo.settings.archive.header"}}
    +
    {{.locale.Tr "repo.settings.archive.text"}}
    {{end}}
    -
    +
    -
    +
    {{.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}}
    -
    +
    diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl index 99dccaf6ea3dc..42c21373d53c1 100644 --- a/templates/user/settings/keys_principal.tmpl +++ b/templates/user/settings/keys_principal.tmpl @@ -11,21 +11,21 @@
    -
    +
    {{.locale.Tr "settings.principal_desc"}}
    {{range .Principals}} -
    -
    +
    +
    {{svg "octicon-key" 32}}
    -
    -
    {{.Name}}
    -
    +
    +
    {{.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}}
    -
    +
    diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl index 4f07c70adb185..0d2916d30cd5d 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -28,32 +28,32 @@
    -
    +
    {{.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"}}
    +
    {{svg "octicon-verified"}}{{$.locale.Tr "settings.ssh_key_verified"}}
    {{end}} -
    {{.Name}}
    -
    +
    {{.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}}
    -
    +
    diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl index 660dee1115b52..7a4ea17cb2c1b 100644 --- a/templates/user/settings/organization.tmpl +++ b/templates/user/settings/organization.tmpl @@ -12,17 +12,17 @@ {{if .Orgs}}
    {{range .Orgs}} -
    -
    +
    +
    {{avatar $.Context . 28 "mini"}}
    -
    -
    {{template "shared/user/name" .}}
    +
    +
    {{template "shared/user/name" .}}
    {{.Description}}
    -
    +
    {{$.CsrfTokenHtml}} diff --git a/templates/user/settings/security/openid.tmpl b/templates/user/settings/security/openid.tmpl index 8523745ff4517..86cb161bcefe3 100644 --- a/templates/user/settings/security/openid.tmpl +++ b/templates/user/settings/security/openid.tmpl @@ -3,18 +3,18 @@
    -
    +
    {{.locale.Tr "settings.openid_desc"}}
    {{range .OpenIDs}} -
    -
    +
    +
    {{svg "fontawesome-openid" 20}}
    -
    -
    {{.URI}}
    +
    +
    {{.URI}}
    -
    +
    {{$.CsrfTokenHtml}} diff --git a/templates/user/settings/security/webauthn.tmpl b/templates/user/settings/security/webauthn.tmpl index ed9743766adeb..676754df5973c 100644 --- a/templates/user/settings/security/webauthn.tmpl +++ b/templates/user/settings/security/webauthn.tmpl @@ -4,15 +4,15 @@ {{template "user/auth/webauthn_error" .}}
    {{range .WebAuthnCredentials}} -
    -
    +
    +
    {{svg "octicon-key" 32}}
    -
    -
    {{.Name}}
    - {{TimeSinceUnix .CreatedUnix $.locale}} +
    +
    {{.Name}}
    + {{TimeSinceUnix .CreatedUnix $.locale}}
    -
    +
    diff --git a/tests/integration/auth_ldap_test.go b/tests/integration/auth_ldap_test.go index a31abfcce0770..f67b8496514b7 100644 --- a/tests/integration/auth_ldap_test.go +++ b/tests/integration/auth_ldap_test.go @@ -412,7 +412,7 @@ func TestLDAPUserSSHKeySync(t *testing.T) { htmlDoc := NewHTMLParser(t, resp.Body) - divs := htmlDoc.doc.Find("#keys-ssh .flex-card .flex-card-body:not(:last-child)") + 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 2f4fc7ca5f3bd..3e1c1d9e7507d 100644 --- a/tests/integration/issue_test.go +++ b/tests/integration/issue_test.go @@ -32,7 +32,7 @@ import ( func getIssuesSelection(t testing.TB, htmlDoc *HTMLDoc) *goquery.Selection { issueList := htmlDoc.doc.Find("#issue-list") assert.EqualValues(t, 1, issueList.Length()) - return issueList.Find(".flex-card").Find(".issue-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 0ebc7a044371b..8c95d7c8a6430 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("#activity-feed").Find(".flex-card").Length() > 0 + return htmlDoc.doc.Find("#activity-feed").Find(".flex-item").Length() > 0 } func testPrivateActivityHelperHasVisibleActivitiesFromSession(t *testing.T, session *TestSession) bool { diff --git a/web_src/css/shared/flex-list.css b/web_src/css/shared/flex-list.css index 56478061e77bf..a0e220245de77 100644 --- a/web_src/css/shared/flex-list.css +++ b/web_src/css/shared/flex-list.css @@ -2,52 +2,52 @@ list-style: none; } -.flex-card { +.flex-item { display: flex; gap: 8px; align-items: flex-start; } -.flex-card:not(:last-child) { +.flex-item:not(:last-child) { padding-bottom: 8px; } -.flex-card-baseline { +.flex-item-baseline { align-items: baseline; } -.flex-card-center { +.flex-item-center { align-items: center; } -.flex-card .flex-card-leading { +.flex-item .flex-item-leading { display: flex; align-items: flex-start; } -.flex-card .flex-card-main { +.flex-item .flex-item-main { display: flex; flex-direction: column; flex-grow: 1; min-width: 0; } -.flex-card-header { +.flex-item-header { display: flex; gap: .25rem; justify-content: space-between; flex-wrap: wrap; } -.flex-card a:not(.label, .button):hover { +.flex-item a:not(.label, .button):hover { color: var(--color-primary) !important; } -.flex-card .flex-card-icon svg { +.flex-item .flex-item-icon svg { margin-top: 1px; } -.flex-card .flex-card-trailing { +.flex-item .flex-item-trailing { display: flex; gap: 0.5rem; align-items: center; @@ -57,7 +57,7 @@ flex-shrink: 2; } -.flex-card .flex-card-title { +.flex-item .flex-item-title { display: inline-flex; flex-wrap: wrap; align-items: center; @@ -69,12 +69,12 @@ font-weight: var(--font-weight-semibold); } -.flex-card .flex-card-title a { +.flex-item .flex-item-title a { color: var(--color-text); overflow-wrap: anywhere; } -.flex-card .flex-card-body { +.flex-item .flex-item-body { font-size: 13px; display: flex; align-items: center; @@ -83,12 +83,12 @@ color: var(--color-text-light-2); } -.flex-card .flex-card-body a { +.flex-item .flex-item-body a { color: inherit; overflow-wrap: anywhere; } -.flex-card .flex-card-body .checklist progress { +.flex-item .flex-item-body .checklist progress { margin-left: 2px; width: 80px; height: 6px; @@ -96,11 +96,11 @@ border-radius: 3px; } -.flex-card .flex-card-body .checklist progress::-webkit-progress-value { +.flex-item .flex-item-body .checklist progress::-webkit-progress-value { background-color: var(--color-secondary-dark-4); } -.flex-card .flex-card-body .checklist progress::-moz-progress-bar { +.flex-item .flex-item-body .checklist progress::-moz-progress-bar { background-color: var(--color-secondary-dark-4); } @@ -121,7 +121,7 @@ max-width: 10em; } -.flex-list > .flex-card + .flex-card { +.flex-list > .flex-item + .flex-item { border-top: 1px solid var(--color-secondary); padding-top: 8px; } From 792961ed207408fbfd686d19c9ccc35f4aa26055 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Mon, 10 Jul 2023 11:24:47 +0200 Subject: [PATCH 10/12] Delete generate-ini-sqlite --- generate-ini-sqlite | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 generate-ini-sqlite diff --git a/generate-ini-sqlite b/generate-ini-sqlite deleted file mode 100644 index e69de29bb2d1d..0000000000000 From 3798d8e5ce06172f56d086c845bbd4f32d21029d Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Mon, 31 Jul 2023 08:26:57 +0200 Subject: [PATCH 11/12] Update organizations.tmpl --- templates/explore/organizations.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/explore/organizations.tmpl b/templates/explore/organizations.tmpl index 6a59801855e07..ea788b149ba2c 100644 --- a/templates/explore/organizations.tmpl +++ b/templates/explore/organizations.tmpl @@ -1 +1 @@ -{{template "explore/users" .}} \ No newline at end of file +{{template "explore/users" .}} From f5e5aa9a89b5ce7261c68cb839769f09ae1a1ffd Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Mon, 31 Jul 2023 13:49:32 +0200 Subject: [PATCH 12/12] move issue-list-specific styles from flex-list to issue-list --- web_src/css/repo/issue-list.css | 33 ++++++++++++++++++++++++++++++++ web_src/css/shared/flex-list.css | 33 -------------------------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/web_src/css/repo/issue-list.css b/web_src/css/repo/issue-list.css index 7769a16f5f781..2a0a86c0817cb 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 index a0e220245de77..7982241684ef7 100644 --- a/web_src/css/shared/flex-list.css +++ b/web_src/css/shared/flex-list.css @@ -88,39 +88,6 @@ overflow-wrap: anywhere; } -.flex-item .flex-item-body .checklist progress { - margin-left: 2px; - width: 80px; - height: 6px; - display: inline-block; - border-radius: 3px; -} - -.flex-item .flex-item-body .checklist progress::-webkit-progress-value { - background-color: var(--color-secondary-dark-4); -} - -.flex-item .flex-item-body .checklist progress::-moz-progress-bar { - background-color: var(--color-secondary-dark-4); -} - -.flex-list .branches { - display: inline-flex; -} - -.flex-list .branches .branch { - background-color: var(--color-secondary-alpha-40); - border-radius: 3px; - padding: 0 4px; -} - -.flex-list .branches .truncated-name { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - max-width: 10em; -} - .flex-list > .flex-item + .flex-item { border-top: 1px solid var(--color-secondary); padding-top: 8px;