Skip to content

Commit 6e33dbf

Browse files
wxiaoguangwxiaoguang
authored
Merge branch 'main' into git-code-search
2 parents 12d488a + 3ccda41 commit 6e33dbf

File tree

137 files changed

+352
-356
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+352
-356
lines changed

‎.eslintrc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ rules:
119119
"@stylistic/js/arrow-spacing": [2, {before: true, after: true}]
120120
"@stylistic/js/block-spacing": [0]
121121
"@stylistic/js/brace-style": [2, 1tbs, {allowSingleLine: true}]
122-
"@stylistic/js/comma-dangle": [2, only-multiline]
122+
"@stylistic/js/comma-dangle": [2, always-multiline]
123123
"@stylistic/js/comma-spacing": [2, {before: false, after: true}]
124124
"@stylistic/js/comma-style": [2, last]
125125
"@stylistic/js/computed-property-spacing": [2, never]

‎playwright.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export default {
2020
* Maximum time expect() should wait for the condition to be met.
2121
* For example in `await expect(locator).toHaveText();`
2222
*/
23-
timeout: 2000
23+
timeout: 2000,
2424
},
2525

2626
/* Fail the build on CI if you accidentally left test.only in the source code. */

‎templates/admin/emails/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{{ctx.Locale.Tr "admin.emails.email_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}})
55
</h4>
66
<div class="ui attached segment">
7-
<div class="ui secondary filter menu tw-content-center gt-mx-0">
7+
<div class="ui secondary filter menu tw-items-center gt-mx-0">
88
<form class="ui form ignore-dirty tw-flex-1">
99
{{template "shared/search/combo" dict "Value" .Keyword}}
1010
</form>

‎templates/admin/layout_head.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{template "base/head" .ctxData}}
22
<div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
3-
<div class="ui container gt-mb-4">
3+
<div class="ui container">
44
{{template "base/alert" .ctxData}}
55
</div>
66
<div class="ui container fluid padded flex-container">

‎templates/admin/org/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</div>
88
</h4>
99
<div class="ui attached segment">
10-
<div class="ui secondary filter menu tw-content-center gt-mx-0">
10+
<div class="ui secondary filter menu tw-items-center gt-mx-0">
1111
<form class="ui form ignore-dirty tw-flex-1">
1212
{{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.org_kind")}}
1313
</form>

‎templates/admin/repo/unadopted.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{{if .Dirs}}
2121
<div class="ui aligned divided list">
2222
{{range $dirI, $dir := .Dirs}}
23-
<div class="item tw-flex tw-content-center">
23+
<div class="item tw-flex tw-items-center">
2424
<span class="tw-flex-1"> {{svg "octicon-file-directory-fill"}} {{$dir}}</span>
2525
<div>
2626
<button class="ui button primary show-modal gt-p-3" data-modal="#adopt-unadopted-modal-{{$dirI}}">{{svg "octicon-plus"}} {{ctx.Locale.Tr "repo.adopt_preexisting_label"}}</button>

‎templates/admin/stacktrace-row.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="item">
2-
<div class="tw-flex tw-content-center">
2+
<div class="tw-flex tw-items-center">
33
<div class="icon gt-ml-3 gt-mr-3">
44
{{if eq .Process.Type "request"}}
55
{{svg "octicon-globe" 16}}
@@ -40,7 +40,7 @@
4040
</summary>
4141
<div class="list">
4242
{{range .Entry}}
43-
<div class="item tw-flex tw-content-center">
43+
<div class="item tw-flex tw-items-center">
4444
<span class="icon gt-mr-4">{{svg "octicon-dot-fill" 16}}</span>
4545
<div class="content tw-flex-1">
4646
<div class="header"><code>{{.Function}}</code></div>

‎templates/admin/stacktrace.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}}
22
<div class="admin-setting-content">
33

4-
<div class="tw-flex tw-content-center">
4+
<div class="tw-flex tw-items-center">
55
<div class="tw-flex-1">
66
<div class="ui compact small menu">
77
<a class="{{if eq .ShowGoroutineList "process"}}active {{end}}item" href="?show=process">{{ctx.Locale.Tr "admin.monitor.process"}}</a>

‎templates/base/head_navbar.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<div class="navbar-right ui secondary menu">
5757
{{if and .IsSigned .MustChangePassword}}
5858
<div class="ui dropdown jump item" data-tooltip-content="{{ctx.Locale.Tr "user_profile_and_more"}}">
59-
<span class="text tw-flex tw-content-center">
59+
<span class="text tw-flex tw-items-center">
6060
{{ctx.AvatarUtils.Avatar .SignedUser 24 "gt-mr-2"}}
6161
<span class="only-mobile gt-ml-3">{{.SignedUser.Name}}</span>
6262
<span class="not-mobile">{{svg "octicon-triangle-down"}}</span>
@@ -83,8 +83,8 @@
8383
<span class="only-mobile gt-ml-3">{{ctx.Locale.Tr "active_stopwatch"}}</span>
8484
</a>
8585
<div class="active-stopwatch-popup item tippy-target gt-p-3">
86-
<div class="tw-flex tw-content-center">
87-
<a class="stopwatch-link tw-flex tw-content-center" href="{{.ActiveStopwatch.IssueLink}}">
86+
<div class="tw-flex tw-items-center">
87+
<a class="stopwatch-link tw-flex tw-items-center" href="{{.ActiveStopwatch.IssueLink}}">
8888
{{svg "octicon-issue-opened" 16 "gt-mr-3"}}
8989
<span class="stopwatch-issue">{{.ActiveStopwatch.RepoSlug}}#{{.ActiveStopwatch.IssueIndex}}</span>
9090
<span class="ui primary label stopwatch-time gt-my-0 gt-mx-4" data-seconds="{{.ActiveStopwatch.Seconds}}">
@@ -142,7 +142,7 @@
142142
</div><!-- end dropdown menu create new -->
143143

144144
<div class="ui dropdown jump item gt-mx-0 gt-pr-3" data-tooltip-content="{{ctx.Locale.Tr "user_profile_and_more"}}">
145-
<span class="text tw-flex tw-content-center">
145+
<span class="text tw-flex tw-items-center">
146146
{{ctx.AvatarUtils.Avatar .SignedUser 24 "gt-mr-2"}}
147147
<span class="only-mobile gt-ml-3">{{.SignedUser.Name}}</span>
148148
<span class="not-mobile">{{svg "octicon-triangle-down"}}</span>

‎templates/explore/navbar.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<overflow-menu class="ui secondary pointing tabular top attached borderless menu navbar">
1+
<overflow-menu class="ui secondary pointing tabular top attached borderless menu secondary-nav">
22
<div class="overflow-menu-items tw-justify-center">
33
<a class="{{if .PageIsExploreRepositories}}active {{end}}item" href="{{AppSubUrl}}/explore/repos">
44
{{svg "octicon-repo"}} {{ctx.Locale.Tr "explore.repos"}}

‎templates/explore/search.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="ui small secondary filter menu tw-content-center gt-mx-0">
1+
<div class="ui small secondary filter menu tw-items-center gt-mx-0">
22
<form class="ui form ignore-dirty tw-flex-1">
33
{{if .PageIsExploreUsers}}
44
{{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.user_kind")}}

‎templates/explore/user_list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="flex-list">
22
{{range .Users}}
3-
<div class="flex-item tw-content-center">
3+
<div class="flex-item tw-items-center">
44
<div class="flex-item-leading">
55
{{ctx.AvatarUtils.Avatar . 48}}
66
</div>

‎templates/org/header.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{{if .Org.Visibility.IsLimited}}<span class="ui large basic horizontal label">{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}</span>{{end}}
88
{{if .Org.Visibility.IsPrivate}}<span class="ui large basic horizontal label">{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}</span>{{end}}
99
</span>
10-
<span class="tw-flex tw-content-center gt-gap-2 tw-ml-auto gt-font-16 tw-whitespace-nowrap">
10+
<span class="tw-flex tw-items-center gt-gap-2 tw-ml-auto gt-font-16 tw-whitespace-nowrap">
1111
{{if .EnableFeed}}
1212
<a class="ui basic label button gt-mr-0" href="{{.Org.HomeLink}}.rss" data-tooltip-content="{{ctx.Locale.Tr "rss_feed"}}">
1313
{{svg "octicon-rss" 24}}

‎templates/org/home.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
{{if .NumMembers}}
2828
<h4 class="ui top attached header tw-flex">
2929
<strong class="tw-flex-1">{{ctx.Locale.Tr "org.members"}}</strong>
30-
<a class="text grey tw-flex tw-content-center" href="{{.OrgLink}}/members"><span>{{.NumMembers}}</span> {{svg "octicon-chevron-right"}}</a>
30+
<a class="text grey tw-flex tw-items-center" href="{{.OrgLink}}/members"><span>{{.NumMembers}}</span> {{svg "octicon-chevron-right"}}</a>
3131
</h4>
3232
<div class="ui attached segment members">
3333
{{$isMember := .IsOrganizationMember}}
@@ -41,7 +41,7 @@
4141
{{if .IsOrganizationMember}}
4242
<div class="ui top attached header tw-flex">
4343
<strong class="tw-flex-1">{{ctx.Locale.Tr "org.teams"}}</strong>
44-
<a class="text grey tw-flex tw-content-center" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right"}}</a>
44+
<a class="text grey tw-flex tw-items-center" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right"}}</a>
4545
</div>
4646
<div class="ui attached table segment teams">
4747
{{range .Teams}}

‎templates/org/member/members.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="flex-list">
88
{{range .Members}}
99
{{$isPublic := index $.MembersIsPublicMember .ID}}
10-
<div class="flex-item {{if $.PublicOnly}}tw-content-center{{end}}">
10+
<div class="flex-item {{if $.PublicOnly}}tw-items-center{{end}}">
1111
<div class="flex-item-leading">
1212
<a href="{{.HomeLink}}">{{ctx.AvatarUtils.Avatar . 48}}</a>
1313
</div>

‎templates/org/settings/labels.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings labels")}}
22
<div class="org-setting-content">
3-
<div class="tw-flex tw-content-center">
3+
<div class="tw-flex tw-items-center">
44
<div class="tw-flex-1">
55
{{ctx.Locale.Tr "org.settings.labels_desc"}}
66
</div>

‎templates/org/team/members.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<div class="ui attached segment">
2525
<div class="flex-list">
2626
{{range .Team.Members}}
27-
<div class="flex-item tw-content-center">
27+
<div class="flex-item tw-items-center">
2828
<div class="flex-item-leading">
2929
<a href="{{.HomeLink}}">{{ctx.AvatarUtils.Avatar . 32}}</a>
3030
</div>
@@ -56,7 +56,7 @@
5656
<div class="ui attached segment">
5757
<div class="flex-list">
5858
{{range .Invites}}
59-
<div class="flex-item tw-content-center">
59+
<div class="flex-item tw-items-center">
6060
<div class="flex-item-main">
6161
{{.Email}}
6262
</div>

‎templates/org/team/repositories.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<div class="ui attached segment">
2929
<div class="flex-list">
3030
{{range .Team.Repos}}
31-
<div class="flex-item tw-content-center">
31+
<div class="flex-item tw-items-center">
3232
<div class="flex-item-leading">
3333
{{template "repo/icon" .}}
3434
</div>

‎templates/projects/view.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{$canWriteProject := and .CanWriteProjects (or (not .Repository) (not .Repository.IsArchived))}}
22

33
<div class="ui container">
4-
<div class="tw-flex tw-justify-between tw-content-center gt-mb-4">
4+
<div class="tw-flex tw-justify-between tw-items-center gt-mb-4">
55
<h2 class="gt-mb-0">{{.Project.Title}}</h2>
66
{{if $canWriteProject}}
77
<div class="ui compact mini menu">

‎templates/repo/actions/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</div>
2626
</div>
2727
<div class="twelve wide column content">
28-
<div class="ui secondary filter menu tw-justify-end tw-flex tw-content-center">
28+
<div class="ui secondary filter menu tw-justify-end tw-flex tw-items-center">
2929
<!-- Actor -->
3030
<div class="ui{{if not .Actors}} disabled{{end}} dropdown jump item">
3131
<span class="text">{{ctx.Locale.Tr "actions.runs.actor"}}</span>

‎templates/repo/actions/runs_list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</div>
77
{{end}}
88
{{range .Runs}}
9-
<div class="flex-item tw-content-center">
9+
<div class="flex-item tw-items-center">
1010
<div class="flex-item-leading">
1111
{{template "repo/actions/status" (dict "status" .Status.String)}}
1212
</div>

‎templates/repo/actions/status.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
{{- $className = .className -}}
1313
{{- end -}}
1414

15-
<span class="tw-flex tw-content-center" data-tooltip-content="{{ctx.Locale.Tr (printf "actions.status.%s" .status)}}">
15+
<span class="tw-flex tw-items-center" data-tooltip-content="{{ctx.Locale.Tr (printf "actions.status.%s" .status)}}">
1616
{{if eq .status "success"}}
1717
{{svg "octicon-check-circle-fill" $size (printf "text green %s" $className)}}
1818
{{else if eq .status "skipped"}}

‎templates/repo/blame.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
{{end}}
1212
{{end}}
1313
<div class="{{TabSizeClass .Editorconfig .FileName}} non-diff-file-content">
14-
<h4 class="file-header ui top attached header tw-flex tw-content-center tw-justify-between tw-flex-wrap">
15-
<div class="file-header-left tw-flex tw-content-center gt-py-3 gt-pr-4">
14+
<h4 class="file-header ui top attached header tw-flex tw-items-center tw-justify-between tw-flex-wrap">
15+
<div class="file-header-left tw-flex tw-items-center gt-py-3 gt-pr-4">
1616
{{template "repo/file_info" .}}
1717
</div>
18-
<div class="file-header-right file-actions tw-flex tw-content-center tw-flex-wrap">
18+
<div class="file-header-right file-actions tw-flex tw-items-center tw-flex-wrap">
1919
<div class="ui buttons">
2020
<a class="ui tiny button" href="{{$.RawFileLink}}">{{ctx.Locale.Tr "repo.file_raw"}}</a>
2121
{{if not .IsViewCommit}}

‎templates/repo/branch/list.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<button class="btn interact-fg gt-px-2" data-clipboard-text="{{.DefaultBranchBranch.DBBranch.Name}}">{{svg "octicon-copy" 14}}</button>
2626
{{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DefaultBranchBranch.DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DefaultBranchBranch.DBBranch.CommitID)}}
2727
</div>
28-
<p class="info tw-flex tw-content-center gt-my-2">{{svg "octicon-git-commit" 16 "gt-mr-2"}}<a href="{{.RepoLink}}/commit/{{PathEscape .DefaultBranchBranch.DBBranch.CommitID}}">{{ShortSha .DefaultBranchBranch.DBBranch.CommitID}}</a> · <span class="commit-message">{{RenderCommitMessage $.Context .DefaultBranchBranch.DBBranch.CommitMessage (.Repository.ComposeMetas ctx)}}</span> · {{ctx.Locale.Tr "org.repo_updated"}} {{TimeSince .DefaultBranchBranch.DBBranch.CommitTime.AsTime ctx.Locale}}{{if .DefaultBranchBranch.DBBranch.Pusher}} &nbsp;{{template "shared/user/avatarlink" dict "user" .DefaultBranchBranch.DBBranch.Pusher}}{{template "shared/user/namelink" .DefaultBranchBranch.DBBranch.Pusher}}{{end}}</p>
28+
<p class="info tw-flex tw-items-center gt-my-2">{{svg "octicon-git-commit" 16 "gt-mr-2"}}<a href="{{.RepoLink}}/commit/{{PathEscape .DefaultBranchBranch.DBBranch.CommitID}}">{{ShortSha .DefaultBranchBranch.DBBranch.CommitID}}</a> · <span class="commit-message">{{RenderCommitMessage $.Context .DefaultBranchBranch.DBBranch.CommitMessage (.Repository.ComposeMetas ctx)}}</span> · {{ctx.Locale.Tr "org.repo_updated"}} {{TimeSince .DefaultBranchBranch.DBBranch.CommitTime.AsTime ctx.Locale}}{{if .DefaultBranchBranch.DBBranch.Pusher}} &nbsp;{{template "shared/user/avatarlink" dict "user" .DefaultBranchBranch.DBBranch.Pusher}}{{template "shared/user/namelink" .DefaultBranchBranch.DBBranch.Pusher}}{{end}}</p>
2929
</td>
3030
<td class="right aligned middle aligned overflow-visible">
3131
{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}}
@@ -67,8 +67,8 @@
6767
</div>
6868
{{end}}
6969

70-
<h4 class="ui top attached header tw-flex tw-content-center tw-justify-between">
71-
<div class="tw-flex tw-content-center">
70+
<h4 class="ui top attached header tw-flex tw-items-center tw-justify-between">
71+
<div class="tw-flex tw-items-center">
7272
{{ctx.Locale.Tr "repo.branches"}}
7373
</div>
7474
</h4>
@@ -98,7 +98,7 @@
9898
<button class="btn interact-fg gt-px-2" data-clipboard-text="{{.DBBranch.Name}}">{{svg "octicon-copy" 14}}</button>
9999
{{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DBBranch.CommitID)}}
100100
</div>
101-
<p class="info tw-flex tw-content-center gt-my-2">{{svg "octicon-git-commit" 16 "gt-mr-2"}}<a href="{{$.RepoLink}}/commit/{{PathEscape .DBBranch.CommitID}}">{{ShortSha .DBBranch.CommitID}}</a> · <span class="commit-message">{{RenderCommitMessage $.Context .DBBranch.CommitMessage ($.Repository.ComposeMetas ctx)}}</span> · {{ctx.Locale.Tr "org.repo_updated"}} {{TimeSince .DBBranch.CommitTime.AsTime ctx.Locale}}{{if .DBBranch.Pusher}} &nbsp;{{template "shared/user/avatarlink" dict "user" .DBBranch.Pusher}} &nbsp;{{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}</p>
101+
<p class="info tw-flex tw-items-center gt-my-2">{{svg "octicon-git-commit" 16 "gt-mr-2"}}<a href="{{$.RepoLink}}/commit/{{PathEscape .DBBranch.CommitID}}">{{ShortSha .DBBranch.CommitID}}</a> · <span class="commit-message">{{RenderCommitMessage $.Context .DBBranch.CommitMessage ($.Repository.ComposeMetas ctx)}}</span> · {{ctx.Locale.Tr "org.repo_updated"}} {{TimeSince .DBBranch.CommitTime.AsTime ctx.Locale}}{{if .DBBranch.Pusher}} &nbsp;{{template "shared/user/avatarlink" dict "user" .DBBranch.Pusher}} &nbsp;{{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}</p>
102102
{{end}}
103103
</td>
104104
<td class="two wide ui">

‎templates/repo/branch_dropdown.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
{{/* show dummy elements before Vue componment is mounted, this code must match the code in BranchTagSelector.vue */}}
7272
<div class="ui dropdown custom">
7373
<button class="branch-dropdown-button gt-ellipsis ui basic small compact button tw-flex gt-m-0">
74-
<span class="text tw-flex tw-content-center gt-mr-2">
74+
<span class="text tw-flex tw-items-center gt-mr-2">
7575
{{if .release}}
7676
{{ctx.Locale.Tr "repo.release.compare"}}
7777
{{else}}

‎templates/repo/code/recently_pushed_new_branches.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{range .RecentlyPushedNewBranches}}
2-
<div class="ui positive message tw-flex tw-content-center">
2+
<div class="ui positive message tw-flex tw-items-center">
33
<div class="tw-flex-1">
44
{{$timeSince := TimeSince .CommitTime.AsTime ctx.Locale}}
55
{{$branchLink := HTMLFormat `<a href="%s/src/branch/%s">%s</a>` $.RepoLink (PathEscapeSegments .Name) .Name}}

‎templates/repo/commit_page.tmpl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@
139139
{{end}}
140140
{{template "repo/commit_load_branches_and_tags" .}}
141141
</div>
142-
<div class="ui attached segment tw-flex tw-content-center tw-justify-between gt-py-2 commit-header-row tw-flex-wrap {{$class}}">
143-
<div class="tw-flex tw-content-center author">
142+
<div class="ui attached segment tw-flex tw-items-center tw-justify-between gt-py-2 commit-header-row tw-flex-wrap {{$class}}">
143+
<div class="tw-flex tw-items-center author">
144144
{{if .Author}}
145145
{{ctx.AvatarUtils.Avatar .Author 28 "gt-mr-3"}}
146146
{{if .Author.FullName}}
@@ -164,7 +164,7 @@
164164
{{end}}
165165
{{end}}
166166
</div>
167-
<div class="ui horizontal list tw-flex tw-content-center">
167+
<div class="ui horizontal list tw-flex tw-items-center">
168168
{{if .Parents}}
169169
<div class="item">
170170
<span>{{ctx.Locale.Tr "repo.diff.parent"}}</span>
@@ -184,8 +184,8 @@
184184
</div>
185185
</div>
186186
{{if .Commit.Signature}}
187-
<div class="ui bottom attached message tw-text-left tw-flex tw-content-center tw-justify-between commit-header-row tw-flex-wrap gt-mb-0 {{$class}}">
188-
<div class="tw-flex tw-content-center">
187+
<div class="ui bottom attached message tw-text-left tw-flex tw-items-center tw-justify-between commit-header-row tw-flex-wrap gt-mb-0 {{$class}}">
188+
<div class="tw-flex tw-items-center">
189189
{{if .Verification.Verified}}
190190
{{if ne .Verification.SigningUser.ID 0}}
191191
{{svg "gitea-lock" 16 "gt-mr-3"}}
@@ -209,7 +209,7 @@
209209
<span class="ui text">{{ctx.Locale.Tr .Verification.Reason}}</span>
210210
{{end}}
211211
</div>
212-
<div class="tw-flex tw-content-center">
212+
<div class="tw-flex tw-items-center">
213213
{{if .Verification.Verified}}
214214
{{if ne .Verification.SigningUser.ID 0}}
215215
{{svg "octicon-verified" 16 "gt-mr-3"}}

‎templates/repo/commits.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="ui container">
55
{{template "repo/sub_menu" .}}
66
<div class="repo-button-row">
7-
<div class="tw-flex tw-content-center">
7+
<div class="tw-flex tw-items-center">
88
{{template "repo/branch_dropdown" dict "root" . "ContainerClasses" "gt-mr-2"}}
99
<a href="{{.RepoLink}}/graph" class="ui basic small compact button">
1010
{{svg "octicon-git-branch"}}

‎templates/repo/commits_list_small.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
{{$commitLink:= printf "%s/commit/%s" $.comment.Issue.PullRequest.BaseRepo.Link (PathEscape .ID.String)}}
1515

16-
<span class="shabox tw-flex tw-content-center tw-float-right">
16+
<span class="shabox tw-flex tw-items-center tw-float-right">
1717
{{template "repo/commit_statuses" dict "Status" .Status "Statuses" .Statuses}}
1818
{{$class := "ui sha label"}}
1919
{{if .Signature}}

‎templates/repo/commits_table.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<h4 class="ui top attached header commits-table tw-flex tw-content-center tw-justify-between">
2-
<div class="commits-table-left tw-flex tw-content-center">
1+
<h4 class="ui top attached header commits-table tw-flex tw-items-center tw-justify-between">
2+
<div class="commits-table-left tw-flex tw-items-center">
33
{{if or .PageIsCommits (gt .CommitCount 0)}}
44
{{.CommitCount}} {{ctx.Locale.Tr "repo.commits.commits"}}
55
{{else if .IsNothingToCompare}}

0 commit comments

Comments
 (0)