diff options
77 files changed, 165 insertions, 165 deletions
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl index 0b5249fbd9..b72aef8f35 100644 --- a/templates/admin/emails/list.tmpl +++ b/templates/admin/emails/list.tmpl @@ -4,7 +4,7 @@ {{ctx.Locale.Tr "admin.emails.email_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}}) </h4> <div class="ui attached segment"> - <div class="ui secondary filter menu tw-content-center gt-mx-0"> + <div class="ui secondary filter menu tw-items-center gt-mx-0"> <form class="ui form ignore-dirty tw-flex-1"> {{template "shared/search/combo" dict "Value" .Keyword}} </form> diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index abd43d297e..ca0ee30092 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -7,7 +7,7 @@ </div> </h4> <div class="ui attached segment"> - <div class="ui secondary filter menu tw-content-center gt-mx-0"> + <div class="ui secondary filter menu tw-items-center gt-mx-0"> <form class="ui form ignore-dirty tw-flex-1"> {{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.org_kind")}} </form> diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl index eb8188de14..9166a844a7 100644 --- a/templates/admin/repo/unadopted.tmpl +++ b/templates/admin/repo/unadopted.tmpl @@ -20,7 +20,7 @@ {{if .Dirs}} <div class="ui aligned divided list"> {{range $dirI, $dir := .Dirs}} - <div class="item tw-flex tw-content-center"> + <div class="item tw-flex tw-items-center"> <span class="tw-flex-1"> {{svg "octicon-file-directory-fill"}} {{$dir}}</span> <div> <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> diff --git a/templates/admin/stacktrace-row.tmpl b/templates/admin/stacktrace-row.tmpl index fdce81eda7..3f639ba161 100644 --- a/templates/admin/stacktrace-row.tmpl +++ b/templates/admin/stacktrace-row.tmpl @@ -1,5 +1,5 @@ <div class="item"> - <div class="tw-flex tw-content-center"> + <div class="tw-flex tw-items-center"> <div class="icon gt-ml-3 gt-mr-3"> {{if eq .Process.Type "request"}} {{svg "octicon-globe" 16}} @@ -40,7 +40,7 @@ </summary> <div class="list"> {{range .Entry}} - <div class="item tw-flex tw-content-center"> + <div class="item tw-flex tw-items-center"> <span class="icon gt-mr-4">{{svg "octicon-dot-fill" 16}}</span> <div class="content tw-flex-1"> <div class="header"><code>{{.Function}}</code></div> diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl index 3c13c1e9dd..e324570c96 100644 --- a/templates/admin/stacktrace.tmpl +++ b/templates/admin/stacktrace.tmpl @@ -1,7 +1,7 @@ {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}} <div class="admin-setting-content"> - <div class="tw-flex tw-content-center"> + <div class="tw-flex tw-items-center"> <div class="tw-flex-1"> <div class="ui compact small menu"> <a class="{{if eq .ShowGoroutineList "process"}}active {{end}}item" href="?show=process">{{ctx.Locale.Tr "admin.monitor.process"}}</a> diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 1c2a7b2d9a..50ca744457 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -56,7 +56,7 @@ <div class="navbar-right ui secondary menu"> {{if and .IsSigned .MustChangePassword}} <div class="ui dropdown jump item" data-tooltip-content="{{ctx.Locale.Tr "user_profile_and_more"}}"> - <span class="text tw-flex tw-content-center"> + <span class="text tw-flex tw-items-center"> {{ctx.AvatarUtils.Avatar .SignedUser 24 "gt-mr-2"}} <span class="only-mobile gt-ml-3">{{.SignedUser.Name}}</span> <span class="not-mobile">{{svg "octicon-triangle-down"}}</span> @@ -83,8 +83,8 @@ <span class="only-mobile gt-ml-3">{{ctx.Locale.Tr "active_stopwatch"}}</span> </a> <div class="active-stopwatch-popup item tippy-target gt-p-3"> - <div class="tw-flex tw-content-center"> - <a class="stopwatch-link tw-flex tw-content-center" href="{{.ActiveStopwatch.IssueLink}}"> + <div class="tw-flex tw-items-center"> + <a class="stopwatch-link tw-flex tw-items-center" href="{{.ActiveStopwatch.IssueLink}}"> {{svg "octicon-issue-opened" 16 "gt-mr-3"}} <span class="stopwatch-issue">{{.ActiveStopwatch.RepoSlug}}#{{.ActiveStopwatch.IssueIndex}}</span> <span class="ui primary label stopwatch-time gt-my-0 gt-mx-4" data-seconds="{{.ActiveStopwatch.Seconds}}"> @@ -142,7 +142,7 @@ </div><!-- end dropdown menu create new --> <div class="ui dropdown jump item gt-mx-0 gt-pr-3" data-tooltip-content="{{ctx.Locale.Tr "user_profile_and_more"}}"> - <span class="text tw-flex tw-content-center"> + <span class="text tw-flex tw-items-center"> {{ctx.AvatarUtils.Avatar .SignedUser 24 "gt-mr-2"}} <span class="only-mobile gt-ml-3">{{.SignedUser.Name}}</span> <span class="not-mobile">{{svg "octicon-triangle-down"}}</span> diff --git a/templates/explore/search.tmpl b/templates/explore/search.tmpl index 505fc64548..c12ff325f9 100644 --- a/templates/explore/search.tmpl +++ b/templates/explore/search.tmpl @@ -1,4 +1,4 @@ -<div class="ui small secondary filter menu tw-content-center gt-mx-0"> +<div class="ui small secondary filter menu tw-items-center gt-mx-0"> <form class="ui form ignore-dirty tw-flex-1"> {{if .PageIsExploreUsers}} {{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.user_kind")}} diff --git a/templates/explore/user_list.tmpl b/templates/explore/user_list.tmpl index e49ca1d069..f2cf939ffb 100644 --- a/templates/explore/user_list.tmpl +++ b/templates/explore/user_list.tmpl @@ -1,6 +1,6 @@ <div class="flex-list"> {{range .Users}} - <div class="flex-item tw-content-center"> + <div class="flex-item tw-items-center"> <div class="flex-item-leading"> {{ctx.AvatarUtils.Avatar . 48}} </div> diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl index c8a0ad3ab0..204ba7e3c1 100644 --- a/templates/org/header.tmpl +++ b/templates/org/header.tmpl @@ -7,7 +7,7 @@ {{if .Org.Visibility.IsLimited}}<span class="ui large basic horizontal label">{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}</span>{{end}} {{if .Org.Visibility.IsPrivate}}<span class="ui large basic horizontal label">{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}</span>{{end}} </span> - <span class="tw-flex tw-content-center gt-gap-2 tw-ml-auto gt-font-16 tw-whitespace-nowrap"> + <span class="tw-flex tw-items-center gt-gap-2 tw-ml-auto gt-font-16 tw-whitespace-nowrap"> {{if .EnableFeed}} <a class="ui basic label button gt-mr-0" href="{{.Org.HomeLink}}.rss" data-tooltip-content="{{ctx.Locale.Tr "rss_feed"}}"> {{svg "octicon-rss" 24}} diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index 04c6a65608..1277665804 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -27,7 +27,7 @@ {{if .NumMembers}} <h4 class="ui top attached header tw-flex"> <strong class="tw-flex-1">{{ctx.Locale.Tr "org.members"}}</strong> - <a class="text grey tw-flex tw-content-center" href="{{.OrgLink}}/members"><span>{{.NumMembers}}</span> {{svg "octicon-chevron-right"}}</a> + <a class="text grey tw-flex tw-items-center" href="{{.OrgLink}}/members"><span>{{.NumMembers}}</span> {{svg "octicon-chevron-right"}}</a> </h4> <div class="ui attached segment members"> {{$isMember := .IsOrganizationMember}} @@ -41,7 +41,7 @@ {{if .IsOrganizationMember}} <div class="ui top attached header tw-flex"> <strong class="tw-flex-1">{{ctx.Locale.Tr "org.teams"}}</strong> - <a class="text grey tw-flex tw-content-center" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right"}}</a> + <a class="text grey tw-flex tw-items-center" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right"}}</a> </div> <div class="ui attached table segment teams"> {{range .Teams}} diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index cb9e60da29..4388dc9520 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -7,7 +7,7 @@ <div class="flex-list"> {{range .Members}} {{$isPublic := index $.MembersIsPublicMember .ID}} - <div class="flex-item {{if $.PublicOnly}}tw-content-center{{end}}"> + <div class="flex-item {{if $.PublicOnly}}tw-items-center{{end}}"> <div class="flex-item-leading"> <a href="{{.HomeLink}}">{{ctx.AvatarUtils.Avatar . 48}}</a> </div> diff --git a/templates/org/settings/labels.tmpl b/templates/org/settings/labels.tmpl index 19a7d5355e..25a562c975 100644 --- a/templates/org/settings/labels.tmpl +++ b/templates/org/settings/labels.tmpl @@ -1,6 +1,6 @@ {{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings labels")}} <div class="org-setting-content"> - <div class="tw-flex tw-content-center"> + <div class="tw-flex tw-items-center"> <div class="tw-flex-1"> {{ctx.Locale.Tr "org.settings.labels_desc"}} </div> diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index d86aeb7ce4..65430cbda3 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -24,7 +24,7 @@ <div class="ui attached segment"> <div class="flex-list"> {{range .Team.Members}} - <div class="flex-item tw-content-center"> + <div class="flex-item tw-items-center"> <div class="flex-item-leading"> <a href="{{.HomeLink}}">{{ctx.AvatarUtils.Avatar . 32}}</a> </div> @@ -56,7 +56,7 @@ <div class="ui attached segment"> <div class="flex-list"> {{range .Invites}} - <div class="flex-item tw-content-center"> + <div class="flex-item tw-items-center"> <div class="flex-item-main"> {{.Email}} </div> diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index 9efe8f9f09..0c59eafbe1 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -28,7 +28,7 @@ <div class="ui attached segment"> <div class="flex-list"> {{range .Team.Repos}} - <div class="flex-item tw-content-center"> + <div class="flex-item tw-items-center"> <div class="flex-item-leading"> {{template "repo/icon" .}} </div> diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index d36ecdfc85..93c2cdbb57 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -1,7 +1,7 @@ {{$canWriteProject := and .CanWriteProjects (or (not .Repository) (not .Repository.IsArchived))}} <div class="ui container"> - <div class="tw-flex tw-justify-between tw-content-center gt-mb-4"> + <div class="tw-flex tw-justify-between tw-items-center gt-mb-4"> <h2 class="gt-mb-0">{{.Project.Title}}</h2> {{if $canWriteProject}} <div class="ui compact mini menu"> diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl index f4215829ba..916949d4f9 100644 --- a/templates/repo/actions/list.tmpl +++ b/templates/repo/actions/list.tmpl @@ -25,7 +25,7 @@ </div> </div> <div class="twelve wide column content"> - <div class="ui secondary filter menu tw-justify-end tw-flex tw-content-center"> + <div class="ui secondary filter menu tw-justify-end tw-flex tw-items-center"> <!-- Actor --> <div class="ui{{if not .Actors}} disabled{{end}} dropdown jump item"> <span class="text">{{ctx.Locale.Tr "actions.runs.actor"}}</span> diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index b898837a26..d393df6539 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -6,7 +6,7 @@ </div> {{end}} {{range .Runs}} - <div class="flex-item tw-content-center"> + <div class="flex-item tw-items-center"> <div class="flex-item-leading"> {{template "repo/actions/status" (dict "status" .Status.String)}} </div> diff --git a/templates/repo/actions/status.tmpl b/templates/repo/actions/status.tmpl index e42eafe8f6..a0e02cf8d7 100644 --- a/templates/repo/actions/status.tmpl +++ b/templates/repo/actions/status.tmpl @@ -12,7 +12,7 @@ {{- $className = .className -}} {{- end -}} -<span class="tw-flex tw-content-center" data-tooltip-content="{{ctx.Locale.Tr (printf "actions.status.%s" .status)}}"> +<span class="tw-flex tw-items-center" data-tooltip-content="{{ctx.Locale.Tr (printf "actions.status.%s" .status)}}"> {{if eq .status "success"}} {{svg "octicon-check-circle-fill" $size (printf "text green %s" $className)}} {{else if eq .status "skipped"}} diff --git a/templates/repo/blame.tmpl b/templates/repo/blame.tmpl index 5bc9a1375e..05cdf53b44 100644 --- a/templates/repo/blame.tmpl +++ b/templates/repo/blame.tmpl @@ -11,11 +11,11 @@ {{end}} {{end}} <div class="{{TabSizeClass .Editorconfig .FileName}} non-diff-file-content"> - <h4 class="file-header ui top attached header tw-flex tw-content-center tw-justify-between tw-flex-wrap"> - <div class="file-header-left tw-flex tw-content-center gt-py-3 gt-pr-4"> + <h4 class="file-header ui top attached header tw-flex tw-items-center tw-justify-between tw-flex-wrap"> + <div class="file-header-left tw-flex tw-items-center gt-py-3 gt-pr-4"> {{template "repo/file_info" .}} </div> - <div class="file-header-right file-actions tw-flex tw-content-center tw-flex-wrap"> + <div class="file-header-right file-actions tw-flex tw-items-center tw-flex-wrap"> <div class="ui buttons"> <a class="ui tiny button" href="{{$.RawFileLink}}">{{ctx.Locale.Tr "repo.file_raw"}}</a> {{if not .IsViewCommit}} diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 21121c4f09..7e061696e4 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -25,7 +25,7 @@ <button class="btn interact-fg gt-px-2" data-clipboard-text="{{.DefaultBranchBranch.DBBranch.Name}}">{{svg "octicon-copy" 14}}</button> {{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DefaultBranchBranch.DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DefaultBranchBranch.DBBranch.CommitID)}} </div> - <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}} {{template "shared/user/avatarlink" dict "user" .DefaultBranchBranch.DBBranch.Pusher}}{{template "shared/user/namelink" .DefaultBranchBranch.DBBranch.Pusher}}{{end}}</p> + <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}} {{template "shared/user/avatarlink" dict "user" .DefaultBranchBranch.DBBranch.Pusher}}{{template "shared/user/namelink" .DefaultBranchBranch.DBBranch.Pusher}}{{end}}</p> </td> <td class="right aligned middle aligned overflow-visible"> {{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}} @@ -67,8 +67,8 @@ </div> {{end}} - <h4 class="ui top attached header tw-flex tw-content-center tw-justify-between"> - <div class="tw-flex tw-content-center"> + <h4 class="ui top attached header tw-flex tw-items-center tw-justify-between"> + <div class="tw-flex tw-items-center"> {{ctx.Locale.Tr "repo.branches"}} </div> </h4> @@ -98,7 +98,7 @@ <button class="btn interact-fg gt-px-2" data-clipboard-text="{{.DBBranch.Name}}">{{svg "octicon-copy" 14}}</button> {{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DBBranch.CommitID)}} </div> - <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}} {{template "shared/user/avatarlink" dict "user" .DBBranch.Pusher}} {{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}</p> + <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}} {{template "shared/user/avatarlink" dict "user" .DBBranch.Pusher}} {{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}</p> {{end}} </td> <td class="two wide ui"> diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl index 328429dd9e..418006a0f6 100644 --- a/templates/repo/branch_dropdown.tmpl +++ b/templates/repo/branch_dropdown.tmpl @@ -71,7 +71,7 @@ {{/* show dummy elements before Vue componment is mounted, this code must match the code in BranchTagSelector.vue */}} <div class="ui dropdown custom"> <button class="branch-dropdown-button gt-ellipsis ui basic small compact button tw-flex gt-m-0"> - <span class="text tw-flex tw-content-center gt-mr-2"> + <span class="text tw-flex tw-items-center gt-mr-2"> {{if .release}} {{ctx.Locale.Tr "repo.release.compare"}} {{else}} diff --git a/templates/repo/code/recently_pushed_new_branches.tmpl b/templates/repo/code/recently_pushed_new_branches.tmpl index 4d11d3f603..840a0e32ec 100644 --- a/templates/repo/code/recently_pushed_new_branches.tmpl +++ b/templates/repo/code/recently_pushed_new_branches.tmpl @@ -1,5 +1,5 @@ {{range .RecentlyPushedNewBranches}} - <div class="ui positive message tw-flex tw-content-center"> + <div class="ui positive message tw-flex tw-items-center"> <div class="tw-flex-1"> {{$timeSince := TimeSince .CommitTime.AsTime ctx.Locale}} {{$branchLink := HTMLFormat `<a href="%s/src/branch/%s">%s</a>` $.RepoLink (PathEscapeSegments .Name) .Name}} diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 1670781e24..345c28f475 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -139,8 +139,8 @@ {{end}} {{template "repo/commit_load_branches_and_tags" .}} </div> - <div class="ui attached segment tw-flex tw-content-center tw-justify-between gt-py-2 commit-header-row tw-flex-wrap {{$class}}"> - <div class="tw-flex tw-content-center author"> + <div class="ui attached segment tw-flex tw-items-center tw-justify-between gt-py-2 commit-header-row tw-flex-wrap {{$class}}"> + <div class="tw-flex tw-items-center author"> {{if .Author}} {{ctx.AvatarUtils.Avatar .Author 28 "gt-mr-3"}} {{if .Author.FullName}} @@ -164,7 +164,7 @@ {{end}} {{end}} </div> - <div class="ui horizontal list tw-flex tw-content-center"> + <div class="ui horizontal list tw-flex tw-items-center"> {{if .Parents}} <div class="item"> <span>{{ctx.Locale.Tr "repo.diff.parent"}}</span> @@ -184,8 +184,8 @@ </div> </div> {{if .Commit.Signature}} - <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}}"> - <div class="tw-flex tw-content-center"> + <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}}"> + <div class="tw-flex tw-items-center"> {{if .Verification.Verified}} {{if ne .Verification.SigningUser.ID 0}} {{svg "gitea-lock" 16 "gt-mr-3"}} @@ -209,7 +209,7 @@ <span class="ui text">{{ctx.Locale.Tr .Verification.Reason}}</span> {{end}} </div> - <div class="tw-flex tw-content-center"> + <div class="tw-flex tw-items-center"> {{if .Verification.Verified}} {{if ne .Verification.SigningUser.ID 0}} {{svg "octicon-verified" 16 "gt-mr-3"}} diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl index 210f73d456..ea173da7a5 100644 --- a/templates/repo/commits.tmpl +++ b/templates/repo/commits.tmpl @@ -4,7 +4,7 @@ <div class="ui container"> {{template "repo/sub_menu" .}} <div class="repo-button-row"> - <div class="tw-flex tw-content-center"> + <div class="tw-flex tw-items-center"> {{template "repo/branch_dropdown" dict "root" . "ContainerClasses" "gt-mr-2"}} <a href="{{.RepoLink}}/graph" class="ui basic small compact button"> {{svg "octicon-git-branch"}} diff --git a/templates/repo/commits_list_small.tmpl b/templates/repo/commits_list_small.tmpl index 53834f7acb..b195f06483 100644 --- a/templates/repo/commits_list_small.tmpl +++ b/templates/repo/commits_list_small.tmpl @@ -13,7 +13,7 @@ {{$commitLink:= printf "%s/commit/%s" $.comment.Issue.PullRequest.BaseRepo.Link (PathEscape .ID.String)}} - <span class="shabox tw-flex tw-content-center tw-float-right"> + <span class="shabox tw-flex tw-items-center tw-float-right"> {{template "repo/commit_statuses" dict "Status" .Status "Statuses" .Statuses}} {{$class := "ui sha label"}} {{if .Signature}} diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index 330130ac0d..48e9368c65 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -1,5 +1,5 @@ -<h4 class="ui top attached header commits-table tw-flex tw-content-center tw-justify-between"> - <div class="commits-table-left tw-flex tw-content-center"> +<h4 class="ui top attached header commits-table tw-flex tw-items-center tw-justify-between"> + <div class="commits-table-left tw-flex tw-items-center"> {{if or .PageIsCommits (gt .CommitCount 0)}} {{.CommitCount}} {{ctx.Locale.Tr "repo.commits.commits"}} {{else if .IsNothingToCompare}} diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index d71ad1b2ad..42eaf9d30e 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -1,7 +1,7 @@ {{$showFileTree := (and (not .DiffNotAvailable) (gt .Diff.NumFiles 1))}} <div> <div class="diff-detail-box diff-box"> - <div class="tw-flex tw-content-center tw-flex-wrap gt-gap-3 gt-ml-1"> + <div class="tw-flex tw-items-center tw-flex-wrap gt-gap-3 gt-ml-1"> {{if $showFileTree}} <button class="diff-toggle-file-tree-button not-mobile btn interact-fg" data-show-text="{{ctx.Locale.Tr "repo.diff.show_file_tree"}}" data-hide-text="{{ctx.Locale.Tr "repo.diff.hide_file_tree"}}"> {{/* the icon meaning is reversed here, "octicon-sidebar-collapse" means show the file tree */}} @@ -18,14 +18,14 @@ </script> {{end}} {{if not .DiffNotAvailable}} - <div class="diff-detail-stats tw-flex tw-content-center tw-flex-wrap"> + <div class="diff-detail-stats tw-flex tw-items-center tw-flex-wrap"> {{svg "octicon-diff" 16 "gt-mr-2"}}{{ctx.Locale.Tr "repo.diff.stats_desc" .Diff.NumFiles .Diff.TotalAddition .Diff.TotalDeletion}} </div> {{end}} </div> <div class="diff-detail-actions"> {{if and .PageIsPullFiles $.SignedUserID (not .IsArchived) (not .DiffNotAvailable)}} - <div class="not-mobile tw-flex tw-content-center tw-flex-col tw-whitespace-nowrap gt-mr-2"> + <div class="not-mobile tw-flex tw-items-center tw-flex-col tw-whitespace-nowrap gt-mr-2"> <label for="viewed-files-summary" id="viewed-files-summary-label" data-text-changed-template="{{ctx.Locale.Tr "repo.pulls.viewed_files_label"}}"> {{ctx.Locale.Tr "repo.pulls.viewed_files_label" .Diff.NumViewedFiles .Diff.NumFiles}} </label> @@ -110,8 +110,8 @@ {{$isExpandable := or (gt $file.Addition 0) (gt $file.Deletion 0) $file.IsBin}} {{$isReviewFile := and $.IsSigned $.PageIsPullFiles (not $.IsArchived) $.IsShowingAllCommits}} <div class="diff-file-box diff-box file-content {{TabSizeClass $.Editorconfig $file.Name}} gt-mt-0" id="diff-{{$file.NameHash}}" data-old-filename="{{$file.OldName}}" data-new-filename="{{$file.Name}}" {{if or ($file.ShouldBeHidden) (not $isExpandable)}}data-folded="true"{{end}}> - <h4 class="diff-file-header sticky-2nd-row ui top attached normal header tw-flex tw-content-center tw-justify-between tw-flex-wrap"> - <div class="diff-file-name tw-flex tw-content-center gt-gap-2 tw-flex-wrap"> + <h4 class="diff-file-header sticky-2nd-row ui top attached normal header tw-flex tw-items-center tw-justify-between tw-flex-wrap"> + <div class="diff-file-name tw-flex tw-items-center gt-gap-2 tw-flex-wrap"> <button class="fold-file btn interact-bg gt-p-2{{if not $isExpandable}} tw-invisible{{end}}"> {{if $file.ShouldBeHidden}} {{svg "octicon-chevron-right" 18}} @@ -119,7 +119,7 @@ {{svg "octicon-chevron-down" 18}} {{end}} </button> - <div class="gt-font-semibold tw-flex tw-content-center gt-mono"> + <div class="gt-font-semibold tw-flex tw-items-center gt-mono"> {{if $file.IsBin}} <span class="gt-ml-1 gt-mr-3"> {{ctx.Locale.Tr "repo.diff.bin"}} @@ -144,7 +144,7 @@ <span class="gt-ml-4 gt-mono">{{ctx.Locale.Tr ($file.ModeTranslationKey $file.Mode)}}</span> {{end}} </div> - <div class="diff-file-header-actions tw-flex tw-content-center gt-gap-2 tw-flex-wrap"> + <div class="diff-file-header-actions tw-flex tw-items-center gt-gap-2 tw-flex-wrap"> {{if $showFileViewToggle}} <div class="ui compact icon buttons"> <button class="ui tiny basic button file-view-toggle" data-toggle-selector="#diff-source-{{$file.NameHash}}" data-tooltip-content="{{ctx.Locale.Tr "repo.file_view_source"}}">{{svg "octicon-code"}}</button> @@ -218,7 +218,7 @@ {{if .Diff.IsIncomplete}} <div class="diff-file-box diff-box file-content gt-mt-3" id="diff-incomplete"> - <h4 class="ui top attached normal header tw-flex tw-content-center tw-justify-between"> + <h4 class="ui top attached normal header tw-flex tw-items-center tw-justify-between"> {{ctx.Locale.Tr "repo.diff.too_many_files"}} <a class="ui basic tiny button" id="diff-show-more-files" data-href="?skip-to={{.Diff.End}}&file-only=true">{{ctx.Locale.Tr "repo.diff.show_more"}}</a> </h4> diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl index aed01ef5fb..4b626ba2b0 100644 --- a/templates/repo/diff/comments.tmpl +++ b/templates/repo/diff/comments.tmpl @@ -8,8 +8,8 @@ {{template "shared/user/avatarlink" dict "user" .Poster}} {{end}} <div class="content comment-container"> - <div class="ui top attached header comment-header tw-flex tw-content-center tw-justify-between"> - <div class="comment-header-left tw-flex tw-content-center"> + <div class="ui top attached header comment-header tw-flex tw-items-center tw-justify-between"> + <div class="comment-header-left tw-flex tw-items-center"> {{if .OriginalAuthor}} <span class="text black gt-font-semibold gt-mr-2"> {{svg (MigrationIcon $.root.Repository.GetOriginalURLHostname)}} @@ -30,7 +30,7 @@ </span> {{end}} </div> - <div class="comment-header-right actions tw-flex tw-content-center"> + <div class="comment-header-right actions tw-flex tw-items-center"> {{if .Invalidated}} {{$referenceUrl := printf "%s#%s" $.root.Issue.Link .HashTag}} <a href="{{$referenceUrl}}" class="ui label basic small" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.outdated_description"}}"> diff --git a/templates/repo/diff/conversation.tmpl b/templates/repo/diff/conversation.tmpl index 1bc018e8e2..85bfe4923a 100644 --- a/templates/repo/diff/conversation.tmpl +++ b/templates/repo/diff/conversation.tmpl @@ -8,8 +8,8 @@ {{$referenceUrl := printf "%s#%s" $.Issue.Link $comment.HashTag}} <div class="conversation-holder" data-path="{{$comment.TreePath}}" data-side="{{if lt $comment.Line 0}}left{{else}}right{{end}}" data-idx="{{$comment.UnsignedLine}}"> {{if $resolved}} - <div class="ui attached header resolved-placeholder tw-flex tw-content-center tw-justify-between"> - <div class="ui grey text tw-flex tw-content-center tw-flex-wrap gt-gap-2"> + <div class="ui attached header resolved-placeholder tw-flex tw-items-center tw-justify-between"> + <div class="ui grey text tw-flex tw-items-center tw-flex-wrap gt-gap-2"> {{svg "octicon-check" 16 "icon gt-mr-2"}} <b>{{$resolveDoer.Name}}</b> {{ctx.Locale.Tr "repo.issues.review.resolved_by"}} {{if $invalid}} @@ -22,12 +22,12 @@ </a> {{end}} </div> - <div class="tw-flex tw-content-center gt-gap-3"> - <button id="show-outdated-{{$comment.ID}}" data-comment="{{$comment.ID}}" class="ui tiny labeled button show-outdated tw-flex tw-content-center"> + <div class="tw-flex tw-items-center gt-gap-3"> + <button id="show-outdated-{{$comment.ID}}" data-comment="{{$comment.ID}}" class="ui tiny labeled button show-outdated tw-flex tw-items-center"> {{svg "octicon-unfold" 16 "gt-mr-3"}} {{ctx.Locale.Tr "repo.issues.review.show_resolved"}} </button> - <button id="hide-outdated-{{$comment.ID}}" data-comment="{{$comment.ID}}" class="ui tiny labeled button hide-outdated tw-flex tw-content-center gt-hidden"> + <button id="hide-outdated-{{$comment.ID}}" data-comment="{{$comment.ID}}" class="ui tiny labeled button hide-outdated tw-flex tw-items-center gt-hidden"> {{svg "octicon-fold" 16 "gt-mr-3"}} {{ctx.Locale.Tr "repo.issues.review.hide_resolved"}} </button> @@ -40,7 +40,7 @@ {{template "repo/diff/comments" dict "root" $ "comments" .comments}} </ui> </div> - <div class="tw-flex tw-justify-end tw-content-center tw-flex-wrap gt-mt-3"> + <div class="tw-flex tw-justify-end tw-items-center tw-flex-wrap gt-mt-3"> <div class="ui buttons gt-mr-2"> <button class="ui icon tiny basic button previous-conversation"> {{svg "octicon-arrow-up" 12 "icon"}} {{ctx.Locale.Tr "repo.issues.previous"}} diff --git a/templates/repo/diff/new_review.tmpl b/templates/repo/diff/new_review.tmpl index 9d1eef712d..9c824db0ad 100644 --- a/templates/repo/diff/new_review.tmpl +++ b/templates/repo/diff/new_review.tmpl @@ -10,7 +10,7 @@ <form class="ui form form-fetch-action" action="{{.Link}}/reviews/submit" method="post"> {{.CsrfTokenHtml}} <input type="hidden" name="commit_id" value="{{.AfterCommitID}}"> - <div class="field tw-flex tw-content-center"> + <div class="field tw-flex tw-items-center"> <div class="tw-flex-1">{{ctx.Locale.Tr "repo.diff.review.header"}}</div> <a class="muted close">{{svg "octicon-x" 16}}</a> </div> diff --git a/templates/repo/find/files.tmpl b/templates/repo/find/files.tmpl index de2c34a158..eebdcb2b1b 100644 --- a/templates/repo/find/files.tmpl +++ b/templates/repo/find/files.tmpl @@ -2,7 +2,7 @@ <div role="main" aria-label="{{.Title}}" class="page-content repository"> {{template "repo/header" .}} <div class="ui container"> - <div class="tw-flex tw-content-center"> + <div class="tw-flex tw-items-center"> <a href="{{$.RepoLink}}">{{.RepoName}}</a> <span class="gt-mx-3">/</span> <div class="ui input tw-flex-1"> diff --git a/templates/repo/forks.tmpl b/templates/repo/forks.tmpl index 0a4b369cdb..6acb89f367 100644 --- a/templates/repo/forks.tmpl +++ b/templates/repo/forks.tmpl @@ -6,7 +6,7 @@ {{ctx.Locale.Tr "repo.forks"}} </h2> {{range .Forks}} - <div class="tw-flex tw-content-center gt-py-3"> + <div class="tw-flex tw-items-center gt-py-3"> <span class="gt-mr-2">{{ctx.AvatarUtils.Avatar .Owner}}</span> <a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a> / <a href="{{.Link}}">{{.Name}}</a> </div> diff --git a/templates/repo/graph/commits.tmpl b/templates/repo/graph/commits.tmpl index fc7cf925ab..b22527c8ef 100644 --- a/templates/repo/graph/commits.tmpl +++ b/templates/repo/graph/commits.tmpl @@ -31,7 +31,7 @@ <span class="message tw-inline-block gt-ellipsis gt-mr-3"> <span>{{RenderCommitMessage $.Context $commit.Subject ($.Repository.ComposeMetas ctx)}}</span> </span> - <span class="commit-refs tw-flex tw-content-center gt-mr-2"> + <span class="commit-refs tw-flex tw-items-center gt-mr-2"> {{range $commit.Refs}} {{$refGroup := .RefGroup}} {{if eq $refGroup "pull"}} @@ -58,7 +58,7 @@ {{end}} {{end}} </span> - <span class="author tw-flex tw-content-center gt-mr-3"> + <span class="author tw-flex tw-items-center gt-mr-3"> {{$userName := $commit.Commit.Author.Name}} {{if $commit.User}} {{if $commit.User.FullName}} @@ -71,7 +71,7 @@ {{$userName}} {{end}} </span> - <span class="time tw-flex tw-content-center">{{DateTime "full" $commit.Date}}</span> + <span class="time tw-flex tw-items-center">{{DateTime "full" $commit.Date}}</span> {{end}} </li> {{end}} diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index b7ee38ae83..6edfee6c7c 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -2,7 +2,7 @@ {{with .Repository}} <div class="ui container"> <div class="repo-header"> - <div class="flex-item tw-content-center"> + <div class="flex-item tw-items-center"> <div class="flex-item-leading"> {{template "repo/icon" .}} </div> diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 7dfc6cfd73..5a9e02ca60 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -27,7 +27,7 @@ </div> {{end}} </div> - <div class="tw-flex tw-content-center tw-flex-wrap gt-gap-2" id="repo-topics"> + <div class="tw-flex tw-items-center tw-flex-wrap gt-gap-2" id="repo-topics"> {{range .Topics}}<a class="ui repo-topic large label topic gt-m-0" href="{{AppSubUrl}}/explore/repos?q={{.Name}}&topic=1">{{.Name}}</a>{{end}} {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}<button id="manage_topic" class="btn interact-fg gt-font-12">{{ctx.Locale.Tr "repo.topic.manage_topics"}}</button>{{end}} </div> @@ -61,7 +61,7 @@ {{end}} {{template "repo/sub_menu" .}} <div class="repo-button-row"> - <div class="tw-flex tw-content-center tw-flex-wrap gt-gap-y-3"> + <div class="tw-flex tw-items-center tw-flex-wrap gt-gap-y-3"> {{template "repo/branch_dropdown" dict "root" . "ContainerClasses" "gt-mr-2"}} {{if and .CanCompareOrPull .IsViewBranch (not .Repository.IsArchived)}} {{$cmpBranch := ""}} @@ -121,7 +121,7 @@ </span> {{end}} </div> - <div class="tw-flex tw-content-center"> + <div class="tw-flex tw-items-center"> <!-- Only show clone panel in repository home page --> {{if eq $n 0}} <div class="clone-panel ui action tiny input"> diff --git a/templates/repo/issue/card.tmpl b/templates/repo/issue/card.tmpl index 47c44af9b8..d25a36c456 100644 --- a/templates/repo/issue/card.tmpl +++ b/templates/repo/issue/card.tmpl @@ -13,7 +13,7 @@ </div> <a class="issue-card-title muted issue-title" href="{{.Link}}">{{.Title | RenderEmoji ctx | RenderCodeBlock}}</a> {{if and $.isPinnedIssueCard $.Page.IsRepoAdmin}} - <a role="button" class="issue-card-unpin muted tw-flex tw-content-center" data-tooltip-content={{ctx.Locale.Tr "repo.issues.unpin_issue"}} data-issue-id="{{.ID}}" data-unpin-url="{{$.Page.Link}}/unpin/{{.Index}}"> + <a role="button" class="issue-card-unpin muted tw-flex tw-items-center" data-tooltip-content={{ctx.Locale.Tr "repo.issues.unpin_issue"}} data-issue-id="{{.ID}}" data-unpin-url="{{$.Page.Link}}/unpin/{{.Index}}"> {{svg "octicon-x" 16}} </a> {{end}} diff --git a/templates/repo/issue/filter_list.tmpl b/templates/repo/issue/filter_list.tmpl index b5c950b121..f1fc61bccb 100644 --- a/templates/repo/issue/filter_list.tmpl +++ b/templates/repo/issue/filter_list.tmpl @@ -32,7 +32,7 @@ <div class="divider"></div> {{end}} {{$previousExclusiveScope = $exclusiveScope}} - <a class="item label-filter-item tw-flex tw-content-center" {{if .IsArchived}}data-is-archived{{end}} href="?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.QueryString}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}{{if $.ShowArchivedLabels}}&archived=true{{end}}" data-label-id="{{.ID}}"> + <a class="item label-filter-item tw-flex tw-items-center" {{if .IsArchived}}data-is-archived{{end}} href="?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.QueryString}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}{{if $.ShowArchivedLabels}}&archived=true{{end}}" data-label-id="{{.ID}}"> {{if .IsExcluded}} {{svg "octicon-circle-slash"}} {{else if .IsSelected}} diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index e029bf6031..2028375c03 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -29,7 +29,7 @@ <div class="tw-flex tw-flex-col gt-gap-3"> <progress class="milestone-progress-big" value="{{.Milestone.Completeness}}" max="100"></progress> <div class="tw-flex gt-gap-4"> - <div classs="tw-flex tw-content-center"> + <div classs="tw-flex tw-items-center"> {{$closedDate:= TimeSinceUnix .Milestone.ClosedDateUnix ctx.Locale}} {{if .IsClosed}} {{svg "octicon-clock"}} {{ctx.Locale.Tr "repo.milestones.closed" $closedDate}} diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index af7dd70193..57b697d8fd 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -23,7 +23,7 @@ {{svg "octicon-milestone" 16}} <a class="muted" href="{{$.RepoLink}}/milestone/{{.ID}}">{{.Name}}</a> </h3> - <div class="tw-flex tw-content-center"> + <div class="tw-flex tw-items-center"> <span class="gt-mr-3">{{.Completeness}}%</span> <progress value="{{.Completeness}}" max="100"></progress> </div> diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index ff06d8c5bd..7966fc7e1c 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -20,8 +20,8 @@ </a> {{end}} <div class="content comment-container"> - <div class="ui top attached header comment-header tw-flex tw-content-center tw-justify-between" role="heading" aria-level="3"> - <div class="comment-header-left tw-flex tw-content-center"> + <div class="ui top attached header comment-header tw-flex tw-items-center tw-justify-between" role="heading" aria-level="3"> + <div class="comment-header-left tw-flex tw-items-center"> {{if .Issue.OriginalAuthor}} <span class="text black gt-font-semibold"> {{svg (MigrationIcon .Repository.GetOriginalURLHostname)}} @@ -43,7 +43,7 @@ </span> {{end}} </div> - <div class="comment-header-right actions tw-flex tw-content-center"> + <div class="comment-header-right actions tw-flex tw-items-center"> {{template "repo/issue/view_content/show_role" dict "ShowRole" .Issue.ShowRole "IgnorePoster" true}} {{if not $.Repository.IsArchived}} {{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/issues/%d/reactions" $.RepoLink .Issue.Index)}} diff --git a/templates/repo/issue/view_content/attachments.tmpl b/templates/repo/issue/view_content/attachments.tmpl index 151131366f..0635a201be 100644 --- a/templates/repo/issue/view_content/attachments.tmpl +++ b/templates/repo/issue/view_content/attachments.tmpl @@ -18,7 +18,7 @@ <span><strong>{{.Name}}</strong></span> </a> </div> - <div class="gt-p-3 tw-flex tw-content-center"> + <div class="gt-p-3 tw-flex tw-items-center"> <span class="ui text grey">{{.Size | FileSize}}</span> </div> </div> diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 2e2ce0fc28..c0c4df925b 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -25,8 +25,8 @@ </a> {{end}} <div class="content comment-container"> - <div class="ui top attached header comment-header tw-flex tw-content-center tw-justify-between" role="heading" aria-level="3"> - <div class="comment-header-left tw-flex tw-content-center"> + <div class="ui top attached header comment-header tw-flex tw-items-center tw-justify-between" role="heading" aria-level="3"> + <div class="comment-header-left tw-flex tw-items-center"> {{if .OriginalAuthor}} <span class="text black gt-font-semibold gt-mr-2"> {{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}} @@ -50,7 +50,7 @@ </span> {{end}} </div> - <div class="comment-header-right actions tw-flex tw-content-center"> + <div class="comment-header-right actions tw-flex tw-items-center"> {{template "repo/issue/view_content/show_role" dict "ShowRole" .ShowRole}} {{if not $.Repository.IsArchived}} {{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID)}} @@ -402,8 +402,8 @@ {{if or .Content .Attachments}} <div class="timeline-item comment"> <div class="content comment-container"> - <div class="ui top attached header comment-header tw-flex tw-content-center tw-justify-between"> - <div class="comment-header-left tw-flex tw-content-center"> + <div class="ui top attached header comment-header tw-flex tw-items-center tw-justify-between"> + <div class="comment-header-left tw-flex tw-items-center"> {{if gt .Poster.ID 0}} <a class="inline-timeline-avatar" href="{{.Poster.HomeLink}}"> {{ctx.AvatarUtils.Avatar .Poster 24}} @@ -424,7 +424,7 @@ {{ctx.Locale.Tr "repo.issues.review.left_comment"}} </span> </div> - <div class="comment-header-right actions tw-flex tw-content-center"> + <div class="comment-header-right actions tw-flex tw-items-center"> {{template "repo/issue/view_content/show_role" dict "ShowRole" .ShowRole}} {{if not $.Repository.IsArchived}} {{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID)}} @@ -623,7 +623,7 @@ {{if .Content}} <div class="timeline-item comment"> <div class="content"> - <div class="ui top attached header comment-header-left tw-flex tw-content-center arrow-top"> + <div class="ui top attached header comment-header-left tw-flex tw-items-center arrow-top"> {{if gt .Poster.ID 0}} <a class="inline-timeline-avatar" href="{{.Poster.HomeLink}}"> {{ctx.AvatarUtils.Avatar .Poster 24}} diff --git a/templates/repo/issue/view_content/conversation.tmpl b/templates/repo/issue/view_content/conversation.tmpl index 83c8fc6ca3..c0ffec36c3 100644 --- a/templates/repo/issue/view_content/conversation.tmpl +++ b/templates/repo/issue/view_content/conversation.tmpl @@ -6,8 +6,8 @@ {{$hasReview := and $comment.Review}} {{$isReviewPending := and $hasReview (eq $comment.Review.Type 0)}} <div class="ui segments conversation-holder"> - <div class="ui segment collapsible-comment-box gt-py-3 tw-flex tw-content-center tw-justify-between"> - <div class="tw-flex tw-content-center"> + <div class="ui segment collapsible-comment-box gt-py-3 tw-flex tw-items-center tw-justify-between"> + <div class="tw-flex tw-items-center"> <a href="{{$comment.CodeCommentLink ctx}}" class="file-comment gt-ml-3 gt-word-break">{{$comment.TreePath}}</a> {{if $invalid}} <span class="ui label basic small gt-ml-3" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.outdated_description"}}"> @@ -17,7 +17,7 @@ </div> <div> {{if or $invalid $resolved}} - <button id="show-outdated-{{$comment.ID}}" data-comment="{{$comment.ID}}" class="{{if not $resolved}}gt-hidden {{end}}ui compact labeled button show-outdated tw-flex tw-content-center"> + <button id="show-outdated-{{$comment.ID}}" data-comment="{{$comment.ID}}" class="{{if not $resolved}}gt-hidden {{end}}ui compact labeled button show-outdated tw-flex tw-items-center"> {{svg "octicon-unfold" 16 "gt-mr-3"}} {{if $resolved}} {{ctx.Locale.Tr "repo.issues.review.show_resolved"}} @@ -25,7 +25,7 @@ {{ctx.Locale.Tr "repo.issues.review.show_outdated"}} {{end}} </button> - <button id="hide-outdated-{{$comment.ID}}" data-comment="{{$comment.ID}}" class="{{if $resolved}}gt-hidden {{end}}ui compact labeled button hide-outdated tw-flex tw-content-center"> + <button id="hide-outdated-{{$comment.ID}}" data-comment="{{$comment.ID}}" class="{{if $resolved}}gt-hidden {{end}}ui compact labeled button hide-outdated tw-flex tw-items-center"> {{svg "octicon-fold" 16 "gt-mr-3"}} {{if $resolved}} {{ctx.Locale.Tr "repo.issues.review.hide_resolved"}} @@ -58,7 +58,7 @@ <div class="comment code-comment gt-pb-4" id="{{.HashTag}}"> <div class="content"> <div class="header comment-header"> - <div class="comment-header-left tw-flex tw-content-center"> + <div class="comment-header-left tw-flex tw-items-center"> {{if not .OriginalAuthor}} <a class="avatar"> {{ctx.AvatarUtils.Avatar .Poster 20}} @@ -79,7 +79,7 @@ {{ctx.Locale.Tr "repo.issues.commented_at" .HashTag $createdSubStr}} </span> </div> - <div class="comment-header-right actions tw-flex tw-content-center"> + <div class="comment-header-right actions tw-flex tw-items-center"> {{template "repo/issue/view_content/show_role" dict "ShowRole" .ShowRole}} {{if not $.Repository.IsArchived}} {{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID)}} @@ -109,7 +109,7 @@ </div> {{end}} </div> - <div class="code-comment-buttons tw-flex tw-content-center tw-flex-wrap gt-mt-3 gt-mb-2 gt-mx-3"> + <div class="code-comment-buttons tw-flex tw-items-center tw-flex-wrap gt-mt-3 gt-mb-2 gt-mx-3"> <div class="tw-flex-1"> {{if $resolved}} <div class="ui grey text"> diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index b8867c11e7..833b5aa92f 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -3,7 +3,7 @@ {{if .Issue.IsPull}} <input id="reviewer_id" name="reviewer_id" type="hidden" value="{{.reviewer_id}}"> <div class="ui {{if or (and (not .Reviewers) (not .TeamReviewers)) (not .CanChooseReviewer) .Repository.IsArchived}}disabled{{end}} floating jump select-reviewers-modify dropdown"> - <a class="text tw-flex tw-content-center muted"> + <a class="text tw-flex tw-items-center muted"> <strong>{{ctx.Locale.Tr "repo.issues.review.reviewers"}}</strong> {{if and .CanChooseReviewer (not .Repository.IsArchived)}} {{svg "octicon-gear" 16 "gt-ml-2"}} @@ -50,17 +50,17 @@ <span class="no-select item {{if or .OriginalReviews .PullReviewers}}gt-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_reviewers"}}</span> <div class="selected"> {{range .PullReviewers}} - <div class="item tw-flex tw-content-center gt-py-3"> - <div class="tw-flex tw-content-center tw-flex-1"> + <div class="item tw-flex tw-items-center gt-py-3"> + <div class="tw-flex tw-items-center tw-flex-1"> {{if .User}} <a class="muted sidebar-item-link" href="{{.User.HomeLink}}">{{ctx.AvatarUtils.Avatar .User 20 "gt-mr-3"}}{{.User.GetDisplayName}}</a> {{else if .Team}} <span class="text">{{svg "octicon-people" 20 "gt-mr-3"}}{{$.Issue.Repo.OwnerName}}/{{.Team.Name}}</span> {{end}} </div> - <div class="tw-flex tw-content-center gt-gap-3"> + <div class="tw-flex tw-items-center gt-gap-3"> {{if (and $.Permission.IsAdmin (or (eq .Review.Type 1) (eq .Review.Type 3)) (not $.Issue.IsClosed))}} - <a href="#" class="ui muted icon tw-flex tw-content-center show-modal" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.dismiss_review"}}" data-modal="#dismiss-review-modal-{{.Review.ID}}"> + <a href="#" class="ui muted icon tw-flex tw-items-center show-modal" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.dismiss_review"}}" data-modal="#dismiss-review-modal-{{.Review.ID}}"> {{svg "octicon-x" 20}} </a> <div class="ui small modal" id="dismiss-review-modal-{{.Review.ID}}"> @@ -99,14 +99,14 @@ </div> {{end}} {{range .OriginalReviews}} - <div class="item tw-flex tw-content-center gt-py-3"> - <div class="tw-flex tw-content-center tw-flex-1"> + <div class="item tw-flex tw-items-center gt-py-3"> + <div class="tw-flex tw-items-center tw-flex-1"> <a class="muted" href="{{$.Repository.OriginalURL}}" data-tooltip-content="{{ctx.Locale.Tr "repo.migrated_from_fake" $.Repository.GetOriginalURLHostname}}"> {{svg (MigrationIcon $.Repository.GetOriginalURLHostname) 20 "gt-mr-3"}} {{.OriginalAuthor}} </a> </div> - <div class="tw-flex tw-content-center gt-gap-3"> + <div class="tw-flex tw-items-center gt-gap-3"> {{svg (printf "octicon-%s" .Type.Icon) 16 (printf "text %s" (.HTMLTypeColorName))}} </div> </div> @@ -361,7 +361,7 @@ </div> {{if ne .Issue.DeadlineUnix 0}} <p> - <div class="tw-flex tw-justify-between tw-content-center"> + <div class="tw-flex tw-justify-between tw-items-center"> <div class="due-date {{if .Issue.IsOverdue}}text red{{end}}" {{if .Issue.IsOverdue}}data-tooltip-content="{{ctx.Locale.Tr "repo.issues.due_date_overdue"}}"{{end}}> {{svg "octicon-calendar" 16 "gt-mr-3"}} {{DateTime "long" .Issue.DeadlineUnix.FormatDate}} @@ -417,7 +417,7 @@ </span> <div class="ui relaxed divided list"> {{range .BlockingDependencies}} - <div class="item dependency{{if .Issue.IsClosed}} is-closed{{end}} tw-flex tw-content-center tw-justify-between"> + <div class="item dependency{{if .Issue.IsClosed}} is-closed{{end}} tw-flex tw-items-center tw-justify-between"> <div class="item-left tw-flex tw-justify-center tw-flex-col tw-flex-1 gt-ellipsis"> <a class="title muted" href="{{.Issue.Link}}" data-tooltip-content="#{{.Issue.Index}} {{.Issue.Title | RenderEmoji $.Context}}"> #{{.Issue.Index}} {{.Issue.Title | RenderEmoji $.Context}} @@ -426,7 +426,7 @@ {{.Repository.OwnerName}}/{{.Repository.Name}} </div> </div> - <div class="item-right tw-flex tw-content-center gt-m-2"> + <div class="item-right tw-flex tw-items-center gt-m-2"> {{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}} <a class="delete-dependency-button ci muted" data-id="{{.Issue.ID}}" data-type="blocking" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.dependency.remove_info"}}"> {{svg "octicon-trash" 16}} @@ -436,7 +436,7 @@ </div> {{end}} {{if .BlockingDependenciesNotPermitted}} - <div class="item tw-flex tw-content-center tw-justify-between gt-ellipsis"> + <div class="item tw-flex tw-items-center tw-justify-between gt-ellipsis"> <span>{{ctx.Locale.TrN (len .BlockingDependenciesNotPermitted) "repo.issues.dependency.no_permission_1" "repo.issues.dependency.no_permission_n" (len .BlockingDependenciesNotPermitted)}}</span> </div> {{end}} @@ -449,7 +449,7 @@ </span> <div class="ui relaxed divided list"> {{range .BlockedByDependencies}} - <div class="item dependency{{if .Issue.IsClosed}} is-closed{{end}} tw-flex tw-content-center tw-justify-between"> + <div class="item dependency{{if .Issue.IsClosed}} is-closed{{end}} tw-flex tw-items-center tw-justify-between"> <div class="item-left tw-flex tw-justify-center tw-flex-col tw-flex-1 gt-ellipsis"> <a class="title muted" href="{{.Issue.Link}}" data-tooltip-content="#{{.Issue.Index}} {{.Issue.Title | RenderEmoji $.Context}}"> #{{.Issue.Index}} {{.Issue.Title | RenderEmoji $.Context}} @@ -458,7 +458,7 @@ {{.Repository.OwnerName}}/{{.Repository.Name}} </div> </div> - <div class="item-right tw-flex tw-content-center gt-m-2"> + <div class="item-right tw-flex tw-items-center gt-m-2"> {{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}} <a class="delete-dependency-button ci muted" data-id="{{.Issue.ID}}" data-type="blockedBy" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.dependency.remove_info"}}"> {{svg "octicon-trash" 16}} @@ -469,7 +469,7 @@ {{end}} {{if $.CanCreateIssueDependencies}} {{range .BlockedByDependenciesNotPermitted}} - <div class="item dependency{{if .Issue.IsClosed}} is-closed{{end}} tw-flex tw-content-center tw-justify-between"> + <div class="item dependency{{if .Issue.IsClosed}} is-closed{{end}} tw-flex tw-items-center tw-justify-between"> <div class="item-left tw-flex tw-justify-center tw-flex-col tw-flex-1 gt-ellipsis"> <div class="gt-ellipsis"> <span data-tooltip-content="{{ctx.Locale.Tr "repo.issues.dependency.no_permission.can_remove"}}">{{svg "octicon-lock" 16}}</span> @@ -481,7 +481,7 @@ {{.Repository.OwnerName}}/{{.Repository.Name}} </div> </div> - <div class="item-right tw-flex tw-content-center gt-m-2"> + <div class="item-right tw-flex tw-items-center gt-m-2"> {{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}} <a class="delete-dependency-button ci muted" data-id="{{.Issue.ID}}" data-type="blocking" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.dependency.remove_info"}}"> {{svg "octicon-trash" 16}} @@ -491,7 +491,7 @@ </div> {{end}} {{else if .BlockedByDependenciesNotPermitted}} - <div class="item tw-flex tw-content-center tw-justify-between gt-ellipsis"> + <div class="item tw-flex tw-items-center tw-justify-between gt-ellipsis"> <span>{{ctx.Locale.TrN (len .BlockedByDependenciesNotPermitted) "repo.issues.dependency.no_permission_1" "repo.issues.dependency.no_permission_n" (len .BlockedByDependenciesNotPermitted)}}</span> </div> {{end}} @@ -548,7 +548,7 @@ <div class="divider"></div> <div class="ui equal width compact grid"> {{$issueReferenceLink := printf "%s#%d" .Issue.Repo.FullName .Issue.Index}} - <div class="row tw-content-center" data-tooltip-content="{{$issueReferenceLink}}"> + <div class="row tw-items-center" data-tooltip-content="{{$issueReferenceLink}}"> <span class="text column truncate">{{ctx.Locale.Tr "repo.issues.reference_link" $issueReferenceLink}}</span> <button class="ui two wide button column gt-p-3" data-clipboard-text="{{$issueReferenceLink}}">{{svg "octicon-copy" 14}}</button> </div> diff --git a/templates/repo/migrate/migrate.tmpl b/templates/repo/migrate/migrate.tmpl index c0336b9b97..32465bc394 100644 --- a/templates/repo/migrate/migrate.tmpl +++ b/templates/repo/migrate/migrate.tmpl @@ -5,7 +5,7 @@ {{template "repo/migrate/helper" .}} <div class="ui cards migrate-entries"> {{range .Services}} - <a class="ui card migrate-entry tw-flex tw-content-center" href="{{AppSubUrl}}/repo/migrate?service_type={{.}}&org={{$.Org}}&mirror={{$.Mirror}}"> + <a class="ui card migrate-entry tw-flex tw-items-center" href="{{AppSubUrl}}/repo/migrate?service_type={{.}}&org={{$.Org}}&mirror={{$.Mirror}}"> {{if eq .Name "github"}} {{svg "octicon-mark-github" 184 "gt-p-4"}} {{else if eq .Name "gitlab"}} diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index b227ce4439..eea1057a50 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -2,7 +2,7 @@ <div role="main" aria-label="{{.Title}}" class="page-content repository projects view-project"> {{template "repo/header" .}} <div class="ui container padded"> - <div class="tw-flex tw-justify-between tw-content-center gt-mb-4"> + <div class="tw-flex tw-justify-between tw-items-center gt-mb-4"> {{template "repo/issue/navbar" .}} <a class="ui small primary button" href="{{.RepoLink}}/issues/new/choose?project={{.Project.ID}}">{{ctx.Locale.Tr "repo.issues.new"}}</a> </div> diff --git a/templates/repo/pulls/tab_menu.tmpl b/templates/repo/pulls/tab_menu.tmpl index fb00acde32..2a653c7c69 100644 --- a/templates/repo/pulls/tab_menu.tmpl +++ b/templates/repo/pulls/tab_menu.tmpl @@ -15,7 +15,7 @@ {{ctx.Locale.Tr "repo.pulls.tab_files"}} <span class="ui small label">{{if .NumFiles}}{{.NumFiles}}{{else}}-{{end}}</span> </a> - <span class="item tw-ml-auto gt-pr-0 gt-font-bold tw-flex tw-content-center gt-gap-3"> + <span class="item tw-ml-auto gt-pr-0 gt-font-bold tw-flex tw-items-center gt-gap-3"> <span><span class="text green">{{if .Diff.TotalAddition}}+{{.Diff.TotalAddition}}{{end}}</span> <span class="text red">{{if .Diff.TotalDeletion}}-{{.Diff.TotalDeletion}}{{end}}</span></span> <span class="diff-stats-bar"> <div class="diff-stats-add-bar" style="width: {{Eval 100 "*" .Diff.TotalAddition "/" "(" .Diff.TotalAddition "+" .Diff.TotalDeletion "+" 0.0 ")"}}%"></div> diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 29059ea4a4..6c77ee12f7 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -16,7 +16,7 @@ {{end}} </div> <div class="ui twelve wide column detail"> - <div class="tw-flex tw-content-center tw-justify-between tw-flex-wrap gt-mb-3"> + <div class="tw-flex tw-items-center tw-justify-between tw-flex-wrap gt-mb-3"> <h4 class="release-list-title gt-word-break"> {{if $.PageIsSingleTag}}{{$release.Title}}{{else}}<a href="{{$.RepoLink}}/releases/tag/{{$release.TagName | PathEscapeSegments}}">{{$release.Title}}</a>{{end}} {{template "repo/commit_statuses" dict "Status" $info.CommitStatus "Statuses" $info.CommitStatuses "AdditionalClasses" "tw-flex"}} diff --git a/templates/repo/release_tag_header.tmpl b/templates/repo/release_tag_header.tmpl index 18a3c8c6b8..cc69cecd6d 100644 --- a/templates/repo/release_tag_header.tmpl +++ b/templates/repo/release_tag_header.tmpl @@ -3,7 +3,7 @@ {{if $canReadReleases}} <div class="tw-flex"> - <div class="tw-flex-1 tw-flex tw-content-center"> + <div class="tw-flex-1 tw-flex tw-items-center"> <h2 class="ui compact small menu header small-menu-items"> <a class="{{if and .PageIsReleaseList (not .PageIsSingleTag)}}active {{end}}item" href="{{.RepoLink}}/releases">{{ctx.Locale.PrettyNumber .NumReleases}} {{ctx.Locale.TrN .NumReleases "repo.release" "repo.releases"}}</a> {{if $canReadCode}} diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl index 2610ae02fe..ee6bdfbf2f 100644 --- a/templates/repo/settings/branches.tmpl +++ b/templates/repo/settings/branches.tmpl @@ -41,7 +41,7 @@ <div class="ui attached segment"> <div class="flex-list"> {{range .ProtectedBranches}} - <div class="flex-item tw-content-center"> + <div class="flex-item tw-items-center"> <div class="flex-item-main"> <div class="flex-item-title"> <div class="ui basic primary label">{{.RuleName}}</div> diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 8783de2544..2a4ec577e7 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -7,7 +7,7 @@ <div class="ui attached segment"> <div class="flex-list"> {{range .Collaborators}} - <div class="flex-item tw-content-center"> + <div class="flex-item tw-items-center"> <div class="flex-item-leading"> <a href="{{.HomeLink}}">{{ctx.AvatarUtils.Avatar . 32}}</a> </div> diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index aa40a1cd1b..6fa7184265 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -837,7 +837,7 @@ </div> </div> {{if not .Repository.IsMirror}} - <div class="flex-item tw-content-center"> + <div class="flex-item tw-items-center"> <div class="flex-item-main"> {{if .Repository.IsArchived}} <div class="flex-item-title">{{ctx.Locale.Tr "repo.settings.unarchive.header"}}</div> diff --git a/templates/repo/tag/list.tmpl b/templates/repo/tag/list.tmpl index 0348334623..06c02c5f75 100644 --- a/templates/repo/tag/list.tmpl +++ b/templates/repo/tag/list.tmpl @@ -5,7 +5,7 @@ {{template "base/alert" .}} {{template "repo/release_tag_header" .}} <h4 class="ui top attached header"> - <div class="five wide column tw-flex tw-content-center"> + <div class="five wide column tw-flex tw-items-center"> {{svg "octicon-tag" 16 "gt-mr-2"}}{{ctx.Locale.Tr "repo.release.tags"}} </div> </h4> @@ -18,12 +18,12 @@ <td class="tag"> <h3 class="release-tag-name gt-mb-3"> {{if $canReadReleases}} - <a class="tw-flex tw-content-center" href="{{$.RepoLink}}/releases/tag/{{.TagName | PathEscapeSegments}}" rel="nofollow">{{.TagName}}</a> + <a class="tw-flex tw-items-center" href="{{$.RepoLink}}/releases/tag/{{.TagName | PathEscapeSegments}}" rel="nofollow">{{.TagName}}</a> {{else}} - <a class="tw-flex tw-content-center" href="{{$.RepoLink}}/src/tag/{{.TagName | PathEscapeSegments}}" rel="nofollow">{{.TagName}}</a> + <a class="tw-flex tw-items-center" href="{{$.RepoLink}}/src/tag/{{.TagName | PathEscapeSegments}}" rel="nofollow">{{.TagName}}</a> {{end}} </h3> - <div class="download tw-flex tw-content-center"> + <div class="download tw-flex tw-items-center"> {{if $.Permission.CanRead $.UnitTypeCode}} {{if .CreatedUnix}} <span class="gt-mr-3">{{svg "octicon-clock" 16 "gt-mr-2"}}{{TimeSinceUnix .CreatedUnix ctx.Locale}}</span> diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index d8ef710400..ebe82ff161 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -25,8 +25,8 @@ </div> {{end}} - <h4 class="file-header ui top attached header tw-flex tw-content-center tw-justify-between tw-flex-wrap"> - <div class="file-header-left tw-flex tw-content-center gt-py-3 gt-pr-4"> + <h4 class="file-header ui top attached header tw-flex tw-items-center tw-justify-between tw-flex-wrap"> + <div class="file-header-left tw-flex tw-items-center gt-py-3 gt-pr-4"> {{if .ReadmeInList}} {{svg "octicon-book" 16 "gt-mr-3"}} <strong><a class="default-link muted" href="#readme">{{.FileName}}</a></strong> @@ -34,7 +34,7 @@ {{template "repo/file_info" .}} {{end}} </div> - <div class="file-header-right file-actions tw-flex tw-content-center tw-flex-wrap"> + <div class="file-header-right file-actions tw-flex tw-items-center tw-flex-wrap"> {{if .HasSourceRenderedToggle}} <div class="ui compact icon buttons"> <a href="?display=source" class="ui mini basic button {{if .IsDisplayingSource}}active{{end}}" data-tooltip-content="{{ctx.Locale.Tr "repo.file_view_source"}}">{{svg "octicon-code" 15}}</a> diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl index fa7352e510..52bf165e38 100644 --- a/templates/repo/wiki/pages.tmpl +++ b/templates/repo/wiki/pages.tmpl @@ -2,7 +2,7 @@ <div role="main" aria-label="{{.Title}}" class="page-content repository wiki pages"> {{template "repo/header" .}} <div class="ui container"> - <h2 class="ui header tw-flex tw-content-center tw-justify-between"> + <h2 class="ui header tw-flex tw-items-center tw-justify-between"> <span>{{ctx.Locale.Tr "repo.wiki.pages"}}</span> <span> {{if and .CanWriteWiki (not .Repository.IsMirror)}} diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index aa05a97fb0..b5ae36f4f0 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -4,7 +4,7 @@ {{$title := .title}} <div class="ui container"> <div class="repo-button-row"> - <div class="tw-flex tw-content-center"> + <div class="tw-flex tw-items-center"> <div class="ui floating filter dropdown" data-no-results="{{ctx.Locale.Tr "no_results_found"}}"> <div class="ui basic small button"> <span class="text"> diff --git a/templates/shared/searchbottom.tmpl b/templates/shared/searchbottom.tmpl index b920e10bb2..43d6092e8d 100644 --- a/templates/shared/searchbottom.tmpl +++ b/templates/shared/searchbottom.tmpl @@ -1,5 +1,5 @@ -<div class="ui bottom attached table segment tw-flex tw-content-center tw-justify-between"> - <div class="tw-flex tw-content-center gt-ml-4"> +<div class="ui bottom attached table segment tw-flex tw-items-center tw-justify-between"> + <div class="tw-flex tw-items-center gt-ml-4"> {{if .result.Language}} <i class="color-icon gt-mr-3" style="background-color: {{.result.Color}}"></i>{{.result.Language}} {{end}} diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl index ea36d0cec2..c943a1944d 100644 --- a/templates/shared/secrets/add_list.tmpl +++ b/templates/shared/secrets/add_list.tmpl @@ -14,7 +14,7 @@ {{if .Secrets}} <div class="flex-list"> {{range .Secrets}} - <div class="flex-item tw-content-center"> + <div class="flex-item tw-items-center"> <div class="flex-item-leading"> {{svg "octicon-key" 32}} </div> diff --git a/templates/shared/user/org_profile_avatar.tmpl b/templates/shared/user/org_profile_avatar.tmpl index 07e7b8aed5..2ff1e40ca8 100644 --- a/templates/shared/user/org_profile_avatar.tmpl +++ b/templates/shared/user/org_profile_avatar.tmpl @@ -2,7 +2,7 @@ <div class="ui container"> <div class="ui vertically grid head"> <div class="column"> - <div class="ui header tw-flex tw-content-center gt-word-break"> + <div class="ui header tw-flex tw-items-center gt-word-break"> {{ctx.AvatarUtils.Avatar . 100}} <span class="text thin grey"><a href="{{.HomeLink}}">{{.DisplayName}}</a></span> <span class="org-visibility"> diff --git a/templates/shared/variables/variable_list.tmpl b/templates/shared/variables/variable_list.tmpl index dc8c7d7a80..fc2ac98e29 100644 --- a/templates/shared/variables/variable_list.tmpl +++ b/templates/shared/variables/variable_list.tmpl @@ -16,7 +16,7 @@ {{if .Variables}} <div class="flex-list"> {{range .Variables}} - <div class="flex-item tw-content-center"> + <div class="flex-item tw-items-center"> <div class="flex-item-leading"> {{svg "octicon-pencil" 32}} </div> diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl index f8eb81423c..1950f750ce 100644 --- a/templates/user/auth/signin_inner.tmpl +++ b/templates/user/auth/signin_inner.tmpl @@ -55,9 +55,9 @@ </div> <div id="oauth2-login-navigator" class="gt-py-2"> <div class="tw-flex tw-flex-col tw-justify-center"> - <div id="oauth2-login-navigator-inner" class="tw-flex tw-flex-col tw-flex-wrap tw-content-center gt-gap-3"> + <div id="oauth2-login-navigator-inner" class="tw-flex tw-flex-col tw-flex-wrap tw-items-center gt-gap-3"> {{range $provider := .OAuth2Providers}} - <a class="{{$provider.Name}} ui button tw-flex tw-content-center tw-justify-center gt-py-3 tw-w-full oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}"> + <a class="{{$provider.Name}} ui button tw-flex tw-items-center tw-justify-center gt-py-3 tw-w-full oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}"> {{$provider.IconHTML 28}} {{ctx.Locale.Tr "sign_in_with_provider" $provider.DisplayName}} </a> diff --git a/templates/user/auth/signup_inner.tmpl b/templates/user/auth/signup_inner.tmpl index a911537996..b96e9bfb02 100644 --- a/templates/user/auth/signup_inner.tmpl +++ b/templates/user/auth/signup_inner.tmpl @@ -60,9 +60,9 @@ </div> <div id="oauth2-login-navigator" class="gt-py-2"> <div class="tw-flex tw-flex-col tw-justify-center"> - <div id="oauth2-login-navigator-inner" class="tw-flex tw-flex-col tw-flex-wrap tw-content-center gt-gap-3"> + <div id="oauth2-login-navigator-inner" class="tw-flex tw-flex-col tw-flex-wrap tw-items-center gt-gap-3"> {{range $provider := .OAuth2Providers}} - <a class="{{$provider.Name}} ui button tw-flex tw-content-center tw-justify-center gt-py-3 tw-w-full oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}"> + <a class="{{$provider.Name}} ui button tw-flex tw-items-center tw-justify-center gt-py-3 tw-w-full oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}"> {{$provider.IconHTML 28}} {{ctx.Locale.Tr "sign_in_with_provider" $provider.DisplayName}} </a> diff --git a/templates/user/auth/webauthn.tmpl b/templates/user/auth/webauthn.tmpl index 375ebba9ae..7c543cb16d 100644 --- a/templates/user/auth/webauthn.tmpl +++ b/templates/user/auth/webauthn.tmpl @@ -10,7 +10,7 @@ {{template "base/alert" .}} <p>{{ctx.Locale.Tr "webauthn_sign_in"}}</p> </div> - <div class="ui attached segment tw-flex tw-content-center tw-justify-center gt-gap-2 gt-py-3"> + <div class="ui attached segment tw-flex tw-items-center tw-justify-center gt-gap-2 gt-py-3"> <div class="is-loading" style="width: 40px; height: 40px"></div> {{ctx.Locale.Tr "webauthn_press_button"}} </div> diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 05f2b30efb..3a260c3d10 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -79,7 +79,7 @@ {{svg "octicon-milestone" 16}} <a class="muted" href="{{.Repo.Link}}/milestone/{{.ID}}">{{.Name}}</a> </h3> - <div class="tw-flex tw-content-center"> + <div class="tw-flex tw-items-center"> <span class="gt-mr-3">{{.Completeness}}%</span> <progress value="{{.Completeness}}" max="100"></progress> </div> diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl index 9da9e16d93..371da129ce 100644 --- a/templates/user/notification/notification_div.tmpl +++ b/templates/user/notification/notification_div.tmpl @@ -1,7 +1,7 @@ <div role="main" aria-label="{{.Title}}" class="page-content user notification" id="notification_div" data-sequence-number="{{.SequenceNumber}}"> <div class="ui container"> {{$notificationUnreadCount := call .NotificationUnreadCount}} - <div class="tw-flex tw-content-center tw-justify-between gt-mb-4"> + <div class="tw-flex tw-items-center tw-justify-between gt-mb-4"> <div class="small-menu-items ui compact tiny menu"> <a class="{{if eq .Status 1}}active {{end}}item" href="{{AppSubUrl}}/notifications?q=unread"> {{ctx.Locale.Tr "notification.unread"}} @@ -25,7 +25,7 @@ <div class="gt-p-0"> <div id="notification_table"> {{if not .Notifications}} - <div class="tw-flex tw-content-center tw-flex-col gt-p-4"> + <div class="tw-flex tw-items-center tw-flex-col gt-p-4"> {{svg "octicon-inbox" 56 "gt-mb-4"}} {{if eq .Status 1}} {{ctx.Locale.Tr "notification.no_unread"}} @@ -35,7 +35,7 @@ </div> {{else}} {{range $notification := .Notifications}} - <div class="notifications-item tw-flex tw-content-center tw-flex-wrap gt-gap-3 gt-p-3" id="notification_{{.ID}}" data-status="{{.Status}}"> + <div class="notifications-item tw-flex tw-items-center tw-flex-wrap gt-gap-3 gt-p-3" id="notification_{{.ID}}" data-status="{{.Status}}"> <div class="notifications-icon gt-ml-3 gt-mr-2 tw-self-start gt-mt-2"> {{if .Issue}} {{template "shared/issueicon" .Issue}} @@ -60,14 +60,14 @@ </span> </div> </a> - <div class="notifications-updated tw-content-center gt-mr-3"> + <div class="notifications-updated tw-items-center gt-mr-3"> {{if .Issue}} {{TimeSinceUnix .Issue.UpdatedUnix ctx.Locale}} {{else}} {{TimeSinceUnix .UpdatedUnix ctx.Locale}} {{end}} </div> - <div class="notifications-buttons tw-content-center tw-justify-end gt-gap-2 gt-px-2"> + <div class="notifications-buttons tw-items-center tw-justify-end gt-gap-2 gt-px-2"> {{if ne .Status 3}} <form action="{{AppSubUrl}}/notifications/status" method="post"> {{$.CsrfTokenHtml}} diff --git a/templates/user/settings/applications_oauth2_list.tmpl b/templates/user/settings/applications_oauth2_list.tmpl index 1125a66d47..bfbebb104d 100644 --- a/templates/user/settings/applications_oauth2_list.tmpl +++ b/templates/user/settings/applications_oauth2_list.tmpl @@ -4,7 +4,7 @@ {{ctx.Locale.Tr "settings.oauth2_application_create_description"}} </div> {{range .Applications}} - <div class="flex-item tw-content-center"> + <div class="flex-item tw-items-center"> <div class="flex-item-leading"> {{svg "octicon-apps" 32}} </div> diff --git a/templates/user/settings/security/openid.tmpl b/templates/user/settings/security/openid.tmpl index 63bc56ba9b..b0473c9df5 100644 --- a/templates/user/settings/security/openid.tmpl +++ b/templates/user/settings/security/openid.tmpl @@ -7,7 +7,7 @@ {{ctx.Locale.Tr "settings.openid_desc"}} </div> {{range .OpenIDs}} - <div class="flex-item tw-content-center"> + <div class="flex-item tw-items-center"> <div class="flex-item-leading"> {{svg "fontawesome-openid" 20}} </div> diff --git a/templates/webhook/new.tmpl b/templates/webhook/new.tmpl index e0d04c1767..8ef33df25b 100644 --- a/templates/webhook/new.tmpl +++ b/templates/webhook/new.tmpl @@ -1,7 +1,7 @@ <h4 class="ui top attached header"> {{.CustomHeaderTitle}} <div class="ui right type dropdown"> - <div class="text tw-flex tw-content-center"> + <div class="text tw-flex tw-items-center"> {{template "shared/webhook/icon" (dict "Size" 20 "HookType" .ctxData.HookType)}} {{ctx.Locale.Tr (print "repo.settings.web_hook_name_" .ctxData.HookType)}} </div> diff --git a/tests/integration/release_test.go b/tests/integration/release_test.go index b5af43e492..ce0c440167 100644 --- a/tests/integration/release_test.go +++ b/tests/integration/release_test.go @@ -234,7 +234,7 @@ func TestViewTagsList(t *testing.T) { tagNames := make([]string, 0, 5) tags.Each(func(i int, s *goquery.Selection) { - tagNames = append(tagNames, s.Find(".tag a.tw-flex.tw-content-center").Text()) + tagNames = append(tagNames, s.Find(".tag a.tw-flex.tw-items-center").Text()) }) assert.EqualValues(t, []string{"v1.0", "delete-tag", "v1.1"}, tagNames) diff --git a/web_src/js/components/ActionRunStatus.vue b/web_src/js/components/ActionRunStatus.vue index 4eccddffdf..7ada543fea 100644 --- a/web_src/js/components/ActionRunStatus.vue +++ b/web_src/js/components/ActionRunStatus.vue @@ -28,7 +28,7 @@ export default { }; </script> <template> - <span class="tw-flex tw-content-center" :data-tooltip-content="localeStatus" v-if="status"> + <span class="tw-flex tw-items-center" :data-tooltip-content="localeStatus" v-if="status"> <SvgIcon name="octicon-check-circle-fill" class="text green" :size="size" :class-name="className" v-if="status === 'success'"/> <SvgIcon name="octicon-skip" class="text grey" :size="size" :class-name="className" v-else-if="status === 'skipped'"/> <SvgIcon name="octicon-clock" class="text yellow" :size="size" :class-name="className" v-else-if="status === 'waiting'"/> diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue index f4edce955a..0f8b43b395 100644 --- a/web_src/js/components/DashboardRepoList.vue +++ b/web_src/js/components/DashboardRepoList.vue @@ -345,12 +345,12 @@ export default sfc; // activate the IDE's Vue plugin <a :class="{item: true, active: tab === 'organizations'}" @click="changeTab('organizations')">{{ textOrganization }}</a> </div> <div v-show="tab === 'repos'" class="ui tab active list dashboard-repos"> - <h4 class="ui top attached header tw-flex tw-content-center"> - <div class="tw-flex-1 tw-flex tw-content-center"> + <h4 class="ui top attached header tw-flex tw-items-center"> + <div class="tw-flex-1 tw-flex tw-items-center"> {{ textMyRepos }} <span class="ui grey label gt-ml-3">{{ reposTotalCount }}</span> </div> - <a class="tw-flex tw-content-center muted" :href="subUrl + '/repo/create' + (isOrganization ? '?org=' + organizationId : '')" :data-tooltip-content="textNewRepo"> + <a class="tw-flex tw-items-center muted" :href="subUrl + '/repo/create' + (isOrganization ? '?org=' + organizationId : '')" :data-tooltip-content="textNewRepo"> <svg-icon name="octicon-plus"/> </a> </h4> @@ -411,7 +411,7 @@ export default sfc; // activate the IDE's Vue plugin </div> <div v-if="repos.length" class="ui attached table segment tw-rounded-b"> <ul class="repo-owner-name-list"> - <li class="tw-flex tw-content-center gt-py-3" v-for="repo, index in repos" :class="{'active': index === activeIndex}" :key="repo.id"> + <li class="tw-flex tw-items-center gt-py-3" v-for="repo, index in repos" :class="{'active': index === activeIndex}" :key="repo.id"> <a class="repo-list-link muted" :href="repo.link"> <svg-icon :name="repoIcon(repo)" :size="16" class-name="repo-list-icon"/> <div class="text truncate">{{ repo.full_name }}</div> @@ -419,7 +419,7 @@ export default sfc; // activate the IDE's Vue plugin <svg-icon name="octicon-archive" :size="16"/> </div> </a> - <a class="tw-flex tw-content-center" v-if="repo.latest_commit_status_state" :href="repo.latest_commit_status_state_link" :data-tooltip-content="repo.locale_latest_commit_status_state"> + <a class="tw-flex tw-items-center" v-if="repo.latest_commit_status_state" :href="repo.latest_commit_status_state_link" :data-tooltip-content="repo.locale_latest_commit_status_state"> <!-- the commit status icon logic is taken from templates/repo/commit_status.tmpl --> <svg-icon :name="statusIcon(repo.latest_commit_status_state)" :class-name="'gt-ml-3 commit-status icon text ' + statusColor(repo.latest_commit_status_state)" :size="16"/> </a> @@ -458,18 +458,18 @@ export default sfc; // activate the IDE's Vue plugin </div> </div> <div v-if="!isOrganization" v-show="tab === 'organizations'" class="ui tab active list dashboard-orgs"> - <h4 class="ui top attached header tw-flex tw-content-center"> - <div class="tw-flex-1 tw-flex tw-content-center"> + <h4 class="ui top attached header tw-flex tw-items-center"> + <div class="tw-flex-1 tw-flex tw-items-center"> {{ textMyOrgs }} <span class="ui grey label gt-ml-3">{{ organizationsTotalCount }}</span> </div> - <a class="tw-flex tw-content-center muted" v-if="canCreateOrganization" :href="subUrl + '/org/create'" :data-tooltip-content="textNewOrg"> + <a class="tw-flex tw-items-center muted" v-if="canCreateOrganization" :href="subUrl + '/org/create'" :data-tooltip-content="textNewOrg"> <svg-icon name="octicon-plus"/> </a> </h4> <div v-if="organizations.length" class="ui attached table segment tw-rounded-b"> <ul class="repo-owner-name-list"> - <li class="tw-flex tw-content-center gt-py-3" v-for="org in organizations" :key="org.name"> + <li class="tw-flex tw-items-center gt-py-3" v-for="org in organizations" :key="org.name"> <a class="repo-list-link muted" :href="subUrl + '/' + encodeURIComponent(org.name)"> <svg-icon name="octicon-organization" :size="16" class-name="repo-list-icon"/> <div class="text truncate">{{ org.name }}</div> @@ -479,7 +479,7 @@ export default sfc; // activate the IDE's Vue plugin </span> </div> </a> - <div class="text light grey tw-flex tw-content-center gt-ml-3"> + <div class="text light grey tw-flex tw-items-center gt-ml-3"> {{ org.num_repos }} <svg-icon name="octicon-repo" :size="16" class-name="gt-ml-2 gt-mt-1"/> </div> diff --git a/web_src/js/components/DiffFileList.vue b/web_src/js/components/DiffFileList.vue index 64493b348a..3a0e287808 100644 --- a/web_src/js/components/DiffFileList.vue +++ b/web_src/js/components/DiffFileList.vue @@ -38,7 +38,7 @@ export default { <template> <ol class="diff-stats gt-m-0" ref="root" v-if="store.fileListIsVisible"> <li v-for="file in store.files" :key="file.NameHash"> - <div class="gt-font-semibold tw-flex tw-content-center pull-right"> + <div class="gt-font-semibold tw-flex tw-items-center pull-right"> <span v-if="file.IsBin" class="gt-ml-1 gt-mr-3">{{ store.binaryFileMessage }}</span> {{ file.IsBin ? '' : file.Addition + file.Deletion }} <span v-if="!file.IsBin" class="diff-stats-bar gt-mx-3" :data-tooltip-content="store.statisticsMessage.replace('%d', (file.Addition + file.Deletion)).replace('%d', file.Addition).replace('%d', file.Deletion)"> @@ -50,7 +50,7 @@ export default { <a class="file gt-mono" :href="'#diff-' + file.NameHash">{{ file.Name }}</a> </li> <li v-if="store.isIncomplete" class="gt-pt-2"> - <span class="file tw-flex tw-content-center tw-justify-between">{{ store.tooManyFilesMessage }} + <span class="file tw-flex tw-items-center tw-justify-between">{{ store.tooManyFilesMessage }} <a :class="['ui', 'basic', 'tiny', 'button', store.isLoadingNewData ? 'disabled' : '']" @click.stop="loadMoreData">{{ store.showMoreMessage }}</a> </span> </li> diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue index e3e0c13fb9..588c05990a 100644 --- a/web_src/js/components/RepoBranchTagSelector.vue +++ b/web_src/js/components/RepoBranchTagSelector.vue @@ -246,7 +246,7 @@ export default sfc; // activate IDE's Vue plugin <template> <div class="ui dropdown custom"> <button class="branch-dropdown-button gt-ellipsis ui basic small compact button tw-flex gt-m-0" @click="menuVisible = !menuVisible" @keyup.enter="menuVisible = !menuVisible"> - <span class="text tw-flex tw-content-center gt-mr-2"> + <span class="text tw-flex tw-items-center gt-mr-2"> <template v-if="release">{{ textReleaseCompare }}</template> <template v-else> <svg-icon v-if="isViewTag" name="octicon-tag"/> diff --git a/web_src/js/components/RepoCodeFrequency.vue b/web_src/js/components/RepoCodeFrequency.vue index 4e11d51a4a..f51dac0a6d 100644 --- a/web_src/js/components/RepoCodeFrequency.vue +++ b/web_src/js/components/RepoCodeFrequency.vue @@ -144,7 +144,7 @@ export default { </script> <template> <div> - <div class="ui header tw-flex tw-content-center tw-justify-between"> + <div class="ui header tw-flex tw-items-center tw-justify-between"> {{ isLoading ? locale.loadingTitle : errorText ? locale.loadingTitleFailed: `Code frequency over the history of ${repoLink.slice(1)}` }} </div> <div class="tw-flex ui segment main-graph"> diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue index 731b21bea3..adaf7f28f1 100644 --- a/web_src/js/components/RepoContributors.vue +++ b/web_src/js/components/RepoContributors.vue @@ -303,7 +303,7 @@ export default { </script> <template> <div> - <div class="ui header tw-flex tw-content-center tw-justify-between"> + <div class="ui header tw-flex tw-items-center tw-justify-between"> <div> <relative-time v-if="xAxisMin > 0" diff --git a/web_src/js/components/RepoRecentCommits.vue b/web_src/js/components/RepoRecentCommits.vue index 1818d57943..601252419a 100644 --- a/web_src/js/components/RepoRecentCommits.vue +++ b/web_src/js/components/RepoRecentCommits.vue @@ -121,7 +121,7 @@ export default { </script> <template> <div> - <div class="ui header tw-flex tw-content-center tw-justify-between"> + <div class="ui header tw-flex tw-items-center tw-justify-between"> {{ isLoading ? locale.loadingTitle : errorText ? locale.loadingTitleFailed: "Number of commits in the past year" }} </div> <div class="tw-flex ui segment main-graph"> diff --git a/web_src/js/features/repo-issue-content.js b/web_src/js/features/repo-issue-content.js index 33ea55f027..e7768b066e 100644 --- a/web_src/js/features/repo-issue-content.js +++ b/web_src/js/features/repo-issue-content.js @@ -16,7 +16,7 @@ function showContentHistoryDetail(issueBaseUrl, commentId, historyId, itemTitleH $dialog = $(` <div class="ui modal content-history-detail-dialog"> ${svg('octicon-x', 16, 'close icon inside')} - <div class="header tw-flex tw-content-center tw-justify-between"> + <div class="header tw-flex tw-items-center tw-justify-between"> <div>${itemTitleHtml}</div> <div class="ui dropdown dialog-header-options gt-mr-5 gt-hidden"> ${i18nTextOptions} |