diff options
| author | silverwind <me@silverwind.io> | 2024-03-22 14:45:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-22 13:45:10 +0000 |
| commit | f88ad5424f381bf2a45fd863b551c5a72891bb68 (patch) | |
| tree | 05ec4c52474381e8c694c539e532a5dafd20d252 /templates | |
| parent | 0c55506b407731546c6bacd1442a785db68f55a7 (diff) | |
| download | gitea-f88ad5424f381bf2a45fd863b551c5a72891bb68.tar.gz gitea-f88ad5424f381bf2a45fd863b551c5a72891bb68.zip | |
Replace 10 more gt- classes with tw- (#29945)
Likely the biggest change of the tailwind refactors. Only thing of note
is that `tw-flex-1` resolves to `flex: 1 1 0%` while our `gt-f1` was
`flex: 1 1 0`, I don't think it will make any difference. Commands I've
ran:
```sh
perl -p -i -e 's#gt-vm#tw-align-middle#g' web_src/js/**/* templates/**/* models/**/*
perl -p -i -e 's#gt-fw#tw-flex-wrap#g' web_src/js/**/* templates/**/* models/**/*
perl -p -i -e 's#gt-f1#tw-flex-1#g' web_src/js/**/* templates/**/* models/**/*
perl -p -i -e 's#gt-fc#tw-flex-col#g' web_src/js/**/* templates/**/* models/**/*
perl -p -i -e 's#gt-sb#tw-justify-between#g' web_src/js/**/* templates/**/* models/**/*
perl -p -i -e 's#gt-je#tw-justify-end#g' web_src/js/**/* templates/**/* models/**/*
perl -p -i -e 's#gt-jc#tw-justify-center#g' web_src/js/**/* templates/**/* models/**/*
perl -p -i -e 's#gt-ac#tw-content-center#g' web_src/js/**/* templates/**/* models/**/* tests/**/*
perl -p -i -e 's#gt-df#tw-flex#g' web_src/js/**/* templates/**/* models/**/* tests/**/*
perl -p -i -e 's#gt-dib#tw-inline-block#g' web_src/js/**/* templates/**/* models/**/* tests/**/*
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'templates')
105 files changed, 275 insertions, 275 deletions
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl index 660df55999..0b5249fbd9 100644 --- a/templates/admin/emails/list.tmpl +++ b/templates/admin/emails/list.tmpl @@ -4,8 +4,8 @@ {{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 gt-ac gt-mx-0"> - <form class="ui form ignore-dirty gt-f1"> + <div class="ui secondary filter menu tw-content-center gt-mx-0"> + <form class="ui form ignore-dirty tw-flex-1"> {{template "shared/search/combo" dict "Value" .Keyword}} </form> <!-- Sort --> diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl index f7d77eab1d..c788ebc602 100644 --- a/templates/admin/notice.tmpl +++ b/templates/admin/notice.tmpl @@ -17,7 +17,7 @@ <tbody> {{range .Notices}} <tr> - <td><div class="ui checkbox gt-df" data-id="{{.ID}}"><input type="checkbox"></div></td> + <td><div class="ui checkbox tw-flex" data-id="{{.ID}}"><input type="checkbox"></div></td> <td>{{.ID}}</td> <td>{{ctx.Locale.Tr .TrStr}}</td> <td class="view-detail auto-ellipsis" style="width: 80%;"><span class="notice-description">{{.Description}}</span></td> diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index 4609d1b8b4..abd43d297e 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -7,8 +7,8 @@ </div> </h4> <div class="ui attached segment"> - <div class="ui secondary filter menu gt-ac gt-mx-0"> - <form class="ui form ignore-dirty gt-f1"> + <div class="ui secondary filter menu tw-content-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> <!-- Sort --> diff --git a/templates/admin/queue_manage.tmpl b/templates/admin/queue_manage.tmpl index 80214d1021..dd1682a000 100644 --- a/templates/admin/queue_manage.tmpl +++ b/templates/admin/queue_manage.tmpl @@ -30,7 +30,7 @@ - {{else}} {{$sum}} - <form action="{{$.Link}}/remove-all-items" method="post" class="gt-dib gt-ml-4"> + <form action="{{$.Link}}/remove-all-items" method="post" class="tw-inline-block gt-ml-4"> {{$.CsrfTokenHtml}} <button class="ui tiny basic red button">{{ctx.Locale.Tr "admin.monitor.queue.settings.remove_all_items"}}</button> </form> diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl index c65cfd9db4..eb8188de14 100644 --- a/templates/admin/repo/unadopted.tmpl +++ b/templates/admin/repo/unadopted.tmpl @@ -20,8 +20,8 @@ {{if .Dirs}} <div class="ui aligned divided list"> {{range $dirI, $dir := .Dirs}} - <div class="item gt-df gt-ac"> - <span class="gt-f1"> {{svg "octicon-file-directory-fill"}} {{$dir}}</span> + <div class="item tw-flex tw-content-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> <div class="ui g-modal-confirm modal" id="adopt-unadopted-modal-{{$dirI}}"> diff --git a/templates/admin/stacktrace-row.tmpl b/templates/admin/stacktrace-row.tmpl index ffb8bf812f..fdce81eda7 100644 --- a/templates/admin/stacktrace-row.tmpl +++ b/templates/admin/stacktrace-row.tmpl @@ -1,5 +1,5 @@ <div class="item"> - <div class="gt-df gt-ac"> + <div class="tw-flex tw-content-center"> <div class="icon gt-ml-3 gt-mr-3"> {{if eq .Process.Type "request"}} {{svg "octicon-globe" 16}} @@ -11,7 +11,7 @@ {{svg "octicon-code" 16}} {{end}} </div> - <div class="content gt-f1"> + <div class="content tw-flex-1"> <div class="header">{{.Process.Description}}</div> <div class="description">{{if ne .Process.Type "none"}}{{TimeSince .Process.Start ctx.Locale}}{{end}}</div> </div> @@ -40,9 +40,9 @@ </summary> <div class="list"> {{range .Entry}} - <div class="item gt-df gt-ac"> + <div class="item tw-flex tw-content-center"> <span class="icon gt-mr-4">{{svg "octicon-dot-fill" 16}}</span> - <div class="content gt-f1"> + <div class="content tw-flex-1"> <div class="header"><code>{{.Function}}</code></div> <div class="description"><code>{{.File}}:{{.Line}}</code></div> </div> diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl index 950aa0ea86..3c13c1e9dd 100644 --- a/templates/admin/stacktrace.tmpl +++ b/templates/admin/stacktrace.tmpl @@ -1,8 +1,8 @@ {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}} <div class="admin-setting-content"> - <div class="gt-df gt-ac"> - <div class="gt-f1"> + <div class="tw-flex tw-content-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> <a class="{{if eq .ShowGoroutineList "stacktrace"}}active {{end}}item" href="?show=stacktrace">{{ctx.Locale.Tr "admin.monitor.stacktrace"}}</a> diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index 091cbe7287..427eef7a78 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -103,7 +103,7 @@ <td><span>{{ctx.Locale.Tr "admin.users.never_login"}}</span></td> {{end}} <td> - <div class="gt-df gt-gap-3"> + <div class="tw-flex gt-gap-3"> <a href="{{$.Link}}/{{.ID}}" data-tooltip-content="{{ctx.Locale.Tr "admin.users.details"}}">{{svg "octicon-person"}}</a> <a href="{{$.Link}}/{{.ID}}/edit" data-tooltip-content="{{ctx.Locale.Tr "edit"}}">{{svg "octicon-pencil"}}</a> </div> diff --git a/templates/admin/user/view.tmpl b/templates/admin/user/view.tmpl index fd3017607c..21943a8382 100644 --- a/templates/admin/user/view.tmpl +++ b/templates/admin/user/view.tmpl @@ -2,7 +2,7 @@ <div class="admin-setting-content"> <div class="admin-responsive-columns"> - <div class="gt-f1"> + <div class="tw-flex-1"> <h4 class="ui top attached header"> {{.Title}} <div class="ui right"> @@ -13,7 +13,7 @@ {{template "admin/user/view_details" .}} </div> </div> - <div class="gt-f1"> + <div class="tw-flex-1"> <h4 class="ui top attached header"> {{ctx.Locale.Tr "admin.emails"}} <div class="ui right"> diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index ffa2ef844f..1c2a7b2d9a 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 gt-df gt-ac"> + <span class="text tw-flex tw-content-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="gt-df gt-ac"> - <a class="stopwatch-link gt-df gt-ac" href="{{.ActiveStopwatch.IssueLink}}"> + <div class="tw-flex tw-content-center"> + <a class="stopwatch-link tw-flex tw-content-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 gt-df gt-ac"> + <span class="text tw-flex tw-content-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/devtest/fomantic-modal.tmpl b/templates/devtest/fomantic-modal.tmpl index 0b4199a197..5cd36721a7 100644 --- a/templates/devtest/fomantic-modal.tmpl +++ b/templates/devtest/fomantic-modal.tmpl @@ -73,7 +73,7 @@ {{template "base/modal_actions_confirm" (dict "ModalButtonDangerText" "I know and must do this is dangerous operation")}} </div> - <div class="modal-buttons flex-text-block gt-fw"></div> + <div class="modal-buttons flex-text-block tw-flex-wrap"></div> <script type="module"> for (const el of $('.ui.modal')) { const $btn = $('<button>').text(`${el.id}`).on('click', () => { diff --git a/templates/devtest/tmplerr.tmpl b/templates/devtest/tmplerr.tmpl index 2fe3f1effd..09cf05fc1f 100644 --- a/templates/devtest/tmplerr.tmpl +++ b/templates/devtest/tmplerr.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}} <div class="page-content devtest"> - <div class="gt-df"> + <div class="tw-flex"> <div style="width: 80%; "> hello hello hello hello hello hello hello hello hello hello </div> diff --git a/templates/explore/search.tmpl b/templates/explore/search.tmpl index c1d114125e..505fc64548 100644 --- a/templates/explore/search.tmpl +++ b/templates/explore/search.tmpl @@ -1,5 +1,5 @@ -<div class="ui small secondary filter menu gt-ac gt-mx-0"> - <form class="ui form ignore-dirty gt-f1"> +<div class="ui small secondary filter menu tw-content-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")}} {{else}} diff --git a/templates/explore/user_list.tmpl b/templates/explore/user_list.tmpl index fb86fbbea2..e49ca1d069 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 gt-ac"> + <div class="flex-item tw-content-center"> <div class="flex-item-leading"> {{ctx.AvatarUtils.Avatar . 48}} </div> diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl index 1a55101c2e..c8a0ad3ab0 100644 --- a/templates/org/header.tmpl +++ b/templates/org/header.tmpl @@ -1,13 +1,13 @@ -<div class="ui container gt-df"> +<div class="ui container tw-flex"> {{ctx.AvatarUtils.Avatar .Org 100 "org-avatar"}} - <div id="org-info" class="gt-df gt-fc"> + <div id="org-info" class="tw-flex tw-flex-col"> <div class="ui header"> {{.Org.DisplayName}} <span class="org-visibility"> {{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="gt-df gt-ac gt-gap-2 tw-ml-auto gt-font-16 tw-whitespace-nowrap"> + <span class="tw-flex tw-content-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 ddd05b4738..04c6a65608 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -25,9 +25,9 @@ <div class="divider"></div> {{end}} {{if .NumMembers}} - <h4 class="ui top attached header gt-df"> - <strong class="gt-f1">{{ctx.Locale.Tr "org.members"}}</strong> - <a class="text grey gt-df gt-ac" href="{{.OrgLink}}/members"><span>{{.NumMembers}}</span> {{svg "octicon-chevron-right"}}</a> + <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> </h4> <div class="ui attached segment members"> {{$isMember := .IsOrganizationMember}} @@ -39,9 +39,9 @@ </div> {{end}} {{if .IsOrganizationMember}} - <div class="ui top attached header gt-df"> - <strong class="gt-f1">{{ctx.Locale.Tr "org.teams"}}</strong> - <a class="text grey gt-df gt-ac" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right"}}</a> + <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> </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 54f84450eb..cb9e60da29 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}}gt-ac{{end}}"> + <div class="flex-item {{if $.PublicOnly}}tw-content-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 8eb7b4584e..19a7d5355e 100644 --- a/templates/org/settings/labels.tmpl +++ b/templates/org/settings/labels.tmpl @@ -1,7 +1,7 @@ {{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings labels")}} <div class="org-setting-content"> - <div class="gt-df gt-ac"> - <div class="gt-f1"> + <div class="tw-flex tw-content-center"> + <div class="tw-flex-1"> {{ctx.Locale.Tr "org.settings.labels_desc"}} </div> <button class="ui small primary new-label button">{{ctx.Locale.Tr "repo.issues.new_label"}}</button> diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index 02220a917a..d86aeb7ce4 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -9,7 +9,7 @@ {{template "org/team/navbar" .}} {{if .IsOrganizationOwner}} <div class="ui attached segment"> - <form class="ui form ignore-dirty gt-df gt-fw gt-gap-3" action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/add" method="post"> + <form class="ui form ignore-dirty tw-flex tw-flex-wrap gt-gap-3" action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/add" method="post"> {{.CsrfTokenHtml}} <input type="hidden" name="uid" value="{{.SignedUser.ID}}"> <div id="search-user-box" class="ui search gt-mr-3"{{if .IsEmailInviteEnabled}} data-allow-email="true" data-allow-email-description="{{ctx.Locale.Tr "org.teams.invite_team_member" $.Team.Name}}"{{end}}> @@ -24,7 +24,7 @@ <div class="ui attached segment"> <div class="flex-list"> {{range .Team.Members}} - <div class="flex-item gt-ac"> + <div class="flex-item tw-content-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 gt-ac"> + <div class="flex-item tw-content-center"> <div class="flex-item-main"> {{.Email}} </div> diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index 50ef53b91b..d1e0dbe382 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -78,11 +78,11 @@ <tr> <th>{{ctx.Locale.Tr "units.unit"}}</th> <th class="center aligned">{{ctx.Locale.Tr "org.teams.none_access"}} - <span class="gt-vm" data-tooltip-content="{{ctx.Locale.Tr "org.teams.none_access_helper"}}">{{svg "octicon-question" 16 "gt-ml-2"}}</span></th> + <span class="tw-align-middle" data-tooltip-content="{{ctx.Locale.Tr "org.teams.none_access_helper"}}">{{svg "octicon-question" 16 "gt-ml-2"}}</span></th> <th class="center aligned">{{ctx.Locale.Tr "org.teams.read_access"}} - <span class="gt-vm" data-tooltip-content="{{ctx.Locale.Tr "org.teams.read_access_helper"}}">{{svg "octicon-question" 16 "gt-ml-2"}}</span></th> + <span class="tw-align-middle" data-tooltip-content="{{ctx.Locale.Tr "org.teams.read_access_helper"}}">{{svg "octicon-question" 16 "gt-ml-2"}}</span></th> <th class="center aligned">{{ctx.Locale.Tr "org.teams.write_access"}} - <span class="gt-vm" data-tooltip-content="{{ctx.Locale.Tr "org.teams.write_access_helper"}}">{{svg "octicon-question" 16 "gt-ml-2"}}</span></th> + <span class="tw-align-middle" data-tooltip-content="{{ctx.Locale.Tr "org.teams.write_access_helper"}}">{{svg "octicon-question" 16 "gt-ml-2"}}</span></th> </tr> </thead> <tbody> diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index bd38cda6d1..9efe8f9f09 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -9,8 +9,8 @@ {{template "org/team/navbar" .}} {{$canAddRemove := and $.IsOrganizationOwner (not $.Team.IncludesAllRepositories)}} {{if $canAddRemove}} - <div class="ui attached segment gt-df gt-fw gt-gap-3"> - <form class="ui form ignore-dirty gt-f1 gt-df" action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/repo/add" method="post"> + <div class="ui attached segment tw-flex tw-flex-wrap gt-gap-3"> + <form class="ui form ignore-dirty tw-flex-1 tw-flex" action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/repo/add" method="post"> {{.CsrfTokenHtml}} <div id="search-repo-box" data-uid="{{.Org.ID}}" class="ui search"> <div class="ui input"> @@ -19,7 +19,7 @@ </div> <button class="ui primary button gt-ml-3">{{ctx.Locale.Tr "add"}}</button> </form> - <div class="gt-dib"> + <div class="tw-inline-block"> <button class="ui primary button link-action" data-modal-confirm="{{ctx.Locale.Tr "org.teams.add_all_repos_desc"}}" data-url="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/repo/addall">{{ctx.Locale.Tr "add_all"}}</button> <button class="ui red button link-action" data-modal-confirm="{{ctx.Locale.Tr "org.teams.remove_all_repos_desc"}}" data-url="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/repo/removeall">{{ctx.Locale.Tr "remove_all"}}</button> </div> @@ -28,7 +28,7 @@ <div class="ui attached segment"> <div class="flex-list"> {{range .Team.Repos}} - <div class="flex-item gt-ac"> + <div class="flex-item tw-content-center"> <div class="flex-item-leading"> {{template "repo/icon" .}} </div> diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl index 54af71126f..e81a714895 100644 --- a/templates/package/view.tmpl +++ b/templates/package/view.tmpl @@ -90,8 +90,8 @@ <a class="tw-float-right" href="{{$.PackageDescriptor.PackageWebLink}}/versions">{{ctx.Locale.Tr "packages.versions.view_all"}}</a> <div class="ui relaxed list"> {{range .LatestVersions}} - <div class="item gt-df"> - <a class="gt-f1 gt-ellipsis" title="{{.Version}}" href="{{$.PackageDescriptor.PackageWebLink}}/{{PathEscape .LowerVersion}}">{{.Version}}</a> + <div class="item tw-flex"> + <a class="tw-flex-1 gt-ellipsis" title="{{.Version}}" href="{{$.PackageDescriptor.PackageWebLink}}/{{PathEscape .LowerVersion}}">{{.Version}}</a> <span class="text small">{{DateTime "short" .CreatedUnix}}</span> </div> {{end}} diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index d87e7e0663..f33f9180bb 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -1,5 +1,5 @@ {{if and $.CanWriteProjects (not $.Repository.IsArchived)}} - <div class="gt-df gt-sb gt-mb-4"> + <div class="tw-flex tw-justify-between gt-mb-4"> <div class="small-menu-items ui compact tiny menu list-header-toggle"> <a class="item{{if not .IsShowClosed}} active{{end}}" href="?state=open&q={{$.Keyword}}"> {{svg "octicon-project-symlink" 16 "gt-mr-3"}} diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index a6e84024bc..d36ecdfc85 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="gt-df gt-sb gt-ac gt-mb-4"> + <div class="tw-flex tw-justify-between tw-content-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 55c0494566..f4215829ba 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 gt-je gt-df gt-ac"> + <div class="ui secondary filter menu tw-justify-end tw-flex tw-content-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 580fb08a9e..b898837a26 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 gt-ac"> + <div class="flex-item tw-content-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 5016570142..e42eafe8f6 100644 --- a/templates/repo/actions/status.tmpl +++ b/templates/repo/actions/status.tmpl @@ -12,7 +12,7 @@ {{- $className = .className -}} {{- end -}} -<span class="gt-df gt-ac" data-tooltip-content="{{ctx.Locale.Tr (printf "actions.status.%s" .status)}}"> +<span class="tw-flex tw-content-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 4df7b18c44..5bc9a1375e 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 gt-df gt-ac gt-sb gt-fw"> - <div class="file-header-left gt-df gt-ac gt-py-3 gt-pr-4"> + <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"> {{template "repo/file_info" .}} </div> - <div class="file-header-right file-actions gt-df gt-ac gt-fw"> + <div class="file-header-right file-actions tw-flex tw-content-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 48c14cf343..21121c4f09 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 gt-df gt-ac 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-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> </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 gt-df gt-ac gt-sb"> - <div class="gt-df gt-ac"> + <h4 class="ui top attached header tw-flex tw-content-center tw-justify-between"> + <div class="tw-flex tw-content-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 gt-df gt-ac 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-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> {{end}} </td> <td class="two wide ui"> @@ -134,7 +134,7 @@ </a> {{end}} {{else}} - <a href="{{.LatestPullRequest.Issue.Link}}" class="gt-vm ref-issue">{{if not .LatestPullRequest.IsSameRepo}}{{.LatestPullRequest.BaseRepo.FullName}}{{end}}#{{.LatestPullRequest.Issue.Index}}</a> + <a href="{{.LatestPullRequest.Issue.Link}}" class="tw-align-middle ref-issue">{{if not .LatestPullRequest.IsSameRepo}}{{.LatestPullRequest.BaseRepo.FullName}}{{end}}#{{.LatestPullRequest.Issue.Index}}</a> {{if .LatestPullRequest.HasMerged}} <a href="{{.LatestPullRequest.Issue.Link}}" class="ui purple large label">{{svg "octicon-git-merge" 16 "gt-mr-2"}}{{ctx.Locale.Tr "repo.pulls.merged"}}</a> {{else if .LatestPullRequest.Issue.IsClosed}} diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl index 367c6aab98..328429dd9e 100644 --- a/templates/repo/branch_dropdown.tmpl +++ b/templates/repo/branch_dropdown.tmpl @@ -70,8 +70,8 @@ <div class="js-branch-tag-selector {{if .ContainerClasses}}{{.ContainerClasses}}{{end}}"> {{/* 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 gt-df gt-m-0"> - <span class="text gt-df gt-ac gt-mr-2"> + <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"> {{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 5e603eae81..4d11d3f603 100644 --- a/templates/repo/code/recently_pushed_new_branches.tmpl +++ b/templates/repo/code/recently_pushed_new_branches.tmpl @@ -1,6 +1,6 @@ {{range .RecentlyPushedNewBranches}} - <div class="ui positive message gt-df gt-ac"> - <div class="gt-f1"> + <div class="ui positive message tw-flex tw-content-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}} {{ctx.Locale.Tr "repo.pulls.recently_pushed_new_branches" $branchLink $timeSince}} diff --git a/templates/repo/commit_load_branches_and_tags.tmpl b/templates/repo/commit_load_branches_and_tags.tmpl index 883230ac29..49f7323845 100644 --- a/templates/repo/commit_load_branches_and_tags.tmpl +++ b/templates/repo/commit_load_branches_and_tags.tmpl @@ -7,13 +7,13 @@ <div class="branch-and-tag-detail gt-hidden"> <div class="divider"></div> <div>{{ctx.Locale.Tr "repo.commit.contained_in"}}</div> - <div class="gt-df gt-mt-3"> + <div class="tw-flex gt-mt-3"> <div class="gt-p-2">{{svg "octicon-git-branch"}}</div> - <div class="branch-area flex-text-block gt-fw gt-f1"></div> + <div class="branch-area flex-text-block tw-flex-wrap tw-flex-1"></div> </div> - <div class="gt-df gt-mt-3"> + <div class="tw-flex gt-mt-3"> <div class="gt-p-2">{{svg "octicon-tag"}}</div> - <div class="tag-area flex-text-block gt-fw gt-f1"></div> + <div class="tag-area flex-text-block tw-flex-wrap tw-flex-1"></div> </div> </div> </div> diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 80af73ce48..1670781e24 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -18,8 +18,8 @@ {{end}} {{end}} <div class="ui top attached header clearing segment tw-relative commit-header {{$class}}"> - <div class="gt-df gt-mb-4 gt-fw"> - <h3 class="gt-mb-0 gt-f1"><span class="commit-summary" title="{{.Commit.Summary}}">{{RenderCommitMessage $.Context .Commit.Message ($.Repository.ComposeMetas ctx)}}</span>{{template "repo/commit_statuses" dict "Status" .CommitStatus "Statuses" .CommitStatuses}}</h3> + <div class="tw-flex gt-mb-4 tw-flex-wrap"> + <h3 class="gt-mb-0 tw-flex-1"><span class="commit-summary" title="{{.Commit.Summary}}">{{RenderCommitMessage $.Context .Commit.Message ($.Repository.ComposeMetas ctx)}}</span>{{template "repo/commit_statuses" dict "Status" .CommitStatus "Statuses" .CommitStatuses}}</h3> {{if not $.PageIsWiki}} <div> <a class="ui primary tiny button" href="{{.SourcePath}}"> @@ -139,8 +139,8 @@ {{end}} {{template "repo/commit_load_branches_and_tags" .}} </div> - <div class="ui attached segment gt-df gt-ac gt-sb gt-py-2 commit-header-row gt-fw {{$class}}"> - <div class="gt-df gt-ac author"> + <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"> {{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 gt-df gt-ac"> + <div class="ui horizontal list tw-flex tw-content-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 gt-df gt-ac gt-sb commit-header-row gt-fw gt-mb-0 {{$class}}"> - <div class="gt-df gt-ac"> + <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"> {{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="gt-df gt-ac"> + <div class="tw-flex tw-content-center"> {{if .Verification.Verified}} {{if ne .Verification.SigningUser.ID 0}} {{svg "octicon-verified" 16 "gt-mr-3"}} diff --git a/templates/repo/commit_statuses.tmpl b/templates/repo/commit_statuses.tmpl index b035e74c2f..f451ac06a1 100644 --- a/templates/repo/commit_statuses.tmpl +++ b/templates/repo/commit_statuses.tmpl @@ -1,10 +1,10 @@ {{if .Statuses}} {{if and (eq (len .Statuses) 1) .Status.TargetURL}} - <a class="gt-vm {{.AdditionalClasses}} tw-no-underline" data-tippy="commit-statuses" href="{{.Status.TargetURL}}"> + <a class="tw-align-middle {{.AdditionalClasses}} tw-no-underline" data-tippy="commit-statuses" href="{{.Status.TargetURL}}"> {{template "repo/commit_status" .Status}} </a> {{else}} - <span class="gt-vm {{.AdditionalClasses}}" data-tippy="commit-statuses" tabindex="0"> + <span class="tw-align-middle {{.AdditionalClasses}}" data-tippy="commit-statuses" tabindex="0"> {{template "repo/commit_status" .Status}} </span> {{end}} diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl index 42004c2610..210f73d456 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="gt-df gt-ac"> + <div class="tw-flex tw-content-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 86e6b7225e..53834f7acb 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 gt-df gt-ac tw-float-right"> + <span class="shabox tw-flex tw-content-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 221ee8d99b..330130ac0d 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 gt-df gt-ac gt-sb"> - <div class="commits-table-left gt-df gt-ac"> +<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"> {{if or .PageIsCommits (gt .CommitCount 0)}} {{.CommitCount}} {{ctx.Locale.Tr "repo.commits.commits"}} {{else if .IsNothingToCompare}} diff --git a/templates/repo/diff/blob_excerpt.tmpl b/templates/repo/diff/blob_excerpt.tmpl index 353f6db705..201bff805a 100644 --- a/templates/repo/diff/blob_excerpt.tmpl +++ b/templates/repo/diff/blob_excerpt.tmpl @@ -3,7 +3,7 @@ <tr class="{{.GetHTMLDiffLineType}}-code nl-{{$k}} ol-{{$k}}"> {{if eq .GetType 4}} <td class="lines-num lines-num-old" data-line-num="{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}"> - <div class="gt-df"> + <div class="tw-flex"> {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5)}} <button class="code-expander-button" hx-target="closest tr" hx-get="{{$.RepoLink}}/blob_excerpt/{{PathEscape $.AfterCommitID}}?{{$line.GetBlobExcerptQuery}}&style=split&direction=down&wiki={{$.PageIsWiki}}&anchor={{$.Anchor}}"> {{svg "octicon-fold-down"}} @@ -49,7 +49,7 @@ <tr class="{{.GetHTMLDiffLineType}}-code nl-{{$k}} ol-{{$k}}"> {{if eq .GetType 4}} <td colspan="2" class="lines-num"> - <div class="gt-df"> + <div class="tw-flex"> {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5)}} <button class="code-expander-button" hx-target="closest tr" hx-get="{{$.RepoLink}}/blob_excerpt/{{PathEscape $.AfterCommitID}}?data-query={{$line.GetBlobExcerptQuery}}&style=unified&direction=down&wiki={{$.PageIsWiki}}&anchor={{$.Anchor}}"> {{svg "octicon-fold-down"}} diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index d2ee5db1b8..d71ad1b2ad 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="gt-df gt-ac gt-fw gt-gap-3 gt-ml-1"> + <div class="tw-flex tw-content-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 gt-df gt-ac gt-fw"> + <div class="diff-detail-stats tw-flex tw-content-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 gt-df gt-ac gt-fc tw-whitespace-nowrap gt-mr-2"> + <div class="not-mobile tw-flex tw-content-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 gt-df gt-ac gt-sb gt-fw"> - <div class="diff-file-name gt-df gt-ac gt-gap-2 gt-fw"> + <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"> <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 gt-df gt-ac gt-mono"> + <div class="gt-font-semibold tw-flex tw-content-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 gt-df gt-ac gt-gap-2 gt-fw"> + <div class="diff-file-header-actions tw-flex tw-content-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 gt-df gt-ac gt-sb"> + <h4 class="ui top attached normal header tw-flex tw-content-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 227dcc49d0..aed01ef5fb 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 gt-df gt-ac gt-sb"> - <div class="comment-header-left gt-df gt-ac"> + <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"> {{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 gt-df gt-ac"> + <div class="comment-header-right actions tw-flex tw-content-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 507f17fd94..1bc018e8e2 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 gt-df gt-ac gt-sb"> - <div class="ui grey text gt-df gt-ac gt-fw gt-gap-2"> + <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"> {{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="gt-df gt-ac gt-gap-3"> - <button id="show-outdated-{{$comment.ID}}" data-comment="{{$comment.ID}}" class="ui tiny labeled button show-outdated gt-df gt-ac"> + <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"> {{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 gt-df gt-ac gt-hidden"> + <button id="hide-outdated-{{$comment.ID}}" data-comment="{{$comment.ID}}" class="ui tiny labeled button hide-outdated tw-flex tw-content-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="gt-df gt-je gt-ac gt-fw gt-mt-3"> + <div class="tw-flex tw-justify-end tw-content-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 ae7182c930..9d1eef712d 100644 --- a/templates/repo/diff/new_review.tmpl +++ b/templates/repo/diff/new_review.tmpl @@ -1,5 +1,5 @@ <div id="review-box"> - <button class="ui tiny primary button gt-pr-2 gt-df js-btn-review {{if not $.IsShowingAllCommits}}disabled{{end}}" {{if not $.IsShowingAllCommits}}data-tooltip-content="{{ctx.Locale.Tr "repo.pulls.review_only_possible_for_full_diff"}}"{{end}}> + <button class="ui tiny primary button gt-pr-2 tw-flex js-btn-review {{if not $.IsShowingAllCommits}}disabled{{end}}" {{if not $.IsShowingAllCommits}}data-tooltip-content="{{ctx.Locale.Tr "repo.pulls.review_only_possible_for_full_diff"}}"{{end}}> {{ctx.Locale.Tr "repo.diff.review"}} <span class="ui small label review-comments-counter" data-pending-comment-number="{{.PendingCodeCommentNumber}}">{{.PendingCodeCommentNumber}}</span> {{svg "octicon-triangle-down" 14 "dropdown icon"}} @@ -10,8 +10,8 @@ <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 gt-df gt-ac"> - <div class="gt-f1">{{ctx.Locale.Tr "repo.diff.review.header"}}</div> + <div class="field tw-flex tw-content-center"> + <div class="tw-flex-1">{{ctx.Locale.Tr "repo.diff.review.header"}}</div> <a class="muted close">{{svg "octicon-x" 16}}</a> </div> <div class="field"> @@ -31,7 +31,7 @@ <div class="divider"></div> {{$showSelfTooltip := (and $.IsSigned ($.Issue.IsPoster $.SignedUser.ID))}} {{if $showSelfTooltip}} - <span class="gt-dib" data-tooltip-content="{{ctx.Locale.Tr "repo.diff.review.self_approve"}}"> + <span class="tw-inline-block" data-tooltip-content="{{ctx.Locale.Tr "repo.diff.review.self_approve"}}"> <button type="submit" name="type" value="approve" disabled class="ui submit primary tiny button btn-submit">{{ctx.Locale.Tr "repo.diff.review.approve"}}</button> </span> {{else}} @@ -39,7 +39,7 @@ {{end}} <button type="submit" name="type" value="comment" class="ui submit tiny basic button btn-submit">{{ctx.Locale.Tr "repo.diff.review.comment"}}</button> {{if $showSelfTooltip}} - <span class="gt-dib" data-tooltip-content="{{ctx.Locale.Tr "repo.diff.review.self_reject"}}"> + <span class="tw-inline-block" data-tooltip-content="{{ctx.Locale.Tr "repo.diff.review.self_reject"}}"> <button type="submit" name="type" value="reject" disabled class="ui submit red tiny button btn-submit">{{ctx.Locale.Tr "repo.diff.review.reject"}}</button> </span> {{else}} diff --git a/templates/repo/diff/section_split.tmpl b/templates/repo/diff/section_split.tmpl index 0999d36f20..5af5da09b4 100644 --- a/templates/repo/diff/section_split.tmpl +++ b/templates/repo/diff/section_split.tmpl @@ -16,7 +16,7 @@ <tr class="{{.GetHTMLDiffLineType}}-code nl-{{$k}} ol-{{$k}}" data-line-type="{{.GetHTMLDiffLineType}}"> {{if eq .GetType 4}} <td class="lines-num lines-num-old"> - <div class="gt-df"> + <div class="tw-flex"> {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5)}} <button class="code-expander-button" hx-target="closest tr" hx-get="{{$.root.RepoLink}}/blob_excerpt/{{PathEscape $.root.AfterCommitID}}?{{$line.GetBlobExcerptQuery}}&style=split&direction=down&wiki={{$.root.PageIsWiki}}&anchor=diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}"> {{svg "octicon-fold-down"}} diff --git a/templates/repo/diff/section_unified.tmpl b/templates/repo/diff/section_unified.tmpl index 2fc116a991..eb51c46d88 100644 --- a/templates/repo/diff/section_unified.tmpl +++ b/templates/repo/diff/section_unified.tmpl @@ -12,7 +12,7 @@ {{if eq .GetType 4}} {{if $.root.AfterCommitID}} <td colspan="2" class="lines-num"> - <div class="gt-df"> + <div class="tw-flex"> {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5)}} <button class="code-expander-button" hx-target="closest tr" hx-get="{{$.root.RepoLink}}/blob_excerpt/{{PathEscape $.root.AfterCommitID}}?{{$line.GetBlobExcerptQuery}}&style=unified&direction=down&wiki={{$.root.PageIsWiki}}&anchor=diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}"> {{svg "octicon-fold-down"}} diff --git a/templates/repo/find/files.tmpl b/templates/repo/find/files.tmpl index eac6ec2011..de2c34a158 100644 --- a/templates/repo/find/files.tmpl +++ b/templates/repo/find/files.tmpl @@ -2,10 +2,10 @@ <div role="main" aria-label="{{.Title}}" class="page-content repository"> {{template "repo/header" .}} <div class="ui container"> - <div class="gt-df gt-ac"> + <div class="tw-flex tw-content-center"> <a href="{{$.RepoLink}}">{{.RepoName}}</a> <span class="gt-mx-3">/</span> - <div class="ui input gt-f1"> + <div class="ui input tw-flex-1"> <input id="repo-file-find-input" type="text" autofocus data-url-data-link="{{.DataLink}}" data-url-tree-link="{{.TreeLink}}"> </div> </div> diff --git a/templates/repo/forks.tmpl b/templates/repo/forks.tmpl index b27b55c131..0a4b369cdb 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="gt-df gt-ac gt-py-3"> + <div class="tw-flex tw-content-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 61ef1fe10d..fc7cf925ab 100644 --- a/templates/repo/graph/commits.tmpl +++ b/templates/repo/graph/commits.tmpl @@ -28,10 +28,10 @@ {{- end -}} </a> </span> - <span class="message gt-dib gt-ellipsis gt-mr-3"> + <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 gt-df gt-ac gt-mr-2"> + <span class="commit-refs tw-flex tw-content-center gt-mr-2"> {{range $commit.Refs}} {{$refGroup := .RefGroup}} {{if eq $refGroup "pull"}} @@ -58,7 +58,7 @@ {{end}} {{end}} </span> - <span class="author gt-df gt-ac gt-mr-3"> + <span class="author tw-flex tw-content-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 gt-df gt-ac">{{DateTime "full" $commit.Date}}</span> + <span class="time tw-flex tw-content-center">{{DateTime "full" $commit.Date}}</span> {{end}} </li> {{end}} diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index e4d39839fc..b7ee38ae83 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 gt-ac"> + <div class="flex-item tw-content-center"> <div class="flex-item-leading"> {{template "repo/icon" .}} </div> diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 24bafb8d9d..7dfc6cfd73 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -27,19 +27,19 @@ </div> {{end}} </div> - <div class="gt-df gt-ac gt-fw gt-gap-2" id="repo-topics"> + <div class="tw-flex tw-content-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> {{end}} {{if and .Permission.IsAdmin (not .Repository.IsArchived)}} - <div class="ui form gt-hidden gt-df gt-fc gt-mt-4" id="topic_edit"> - <div class="field gt-f1 gt-mb-2"> - <div class="ui fluid multiple search selection dropdown gt-fw" data-text-count-prompt="{{ctx.Locale.Tr "repo.topic.count_prompt"}}" data-text-format-prompt="{{ctx.Locale.Tr "repo.topic.format_prompt"}}"> + <div class="ui form gt-hidden tw-flex tw-flex-col gt-mt-4" id="topic_edit"> + <div class="field tw-flex-1 gt-mb-2"> + <div class="ui fluid multiple search selection dropdown tw-flex-wrap" data-text-count-prompt="{{ctx.Locale.Tr "repo.topic.count_prompt"}}" data-text-format-prompt="{{ctx.Locale.Tr "repo.topic.format_prompt"}}"> <input type="hidden" name="topics" value="{{range $i, $v := .Topics}}{{.Name}}{{if Eval $i "+" 1 "<" (len $.Topics)}},{{end}}{{end}}"> {{range .Topics}} {{/* keey the same layout as Fomantic UI generated labels */}} - <a class="ui label transition visible tw-cursor-default gt-dib" data-value="{{.Name}}">{{.Name}}{{svg "octicon-x" 16 "delete icon"}}</a> + <a class="ui label transition visible tw-cursor-default tw-inline-block" data-value="{{.Name}}">{{.Name}}{{svg "octicon-x" 16 "delete icon"}}</a> {{end}} <div class="text"></div> </div> @@ -61,7 +61,7 @@ {{end}} {{template "repo/sub_menu" .}} <div class="repo-button-row"> - <div class="gt-df gt-ac gt-fw gt-gap-y-3"> + <div class="tw-flex tw-content-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="gt-df gt-ac"> + <div class="tw-flex tw-content-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/icon.tmpl b/templates/repo/icon.tmpl index a001f81891..e5e0bd68e7 100644 --- a/templates/repo/icon.tmpl +++ b/templates/repo/icon.tmpl @@ -1,6 +1,6 @@ {{$avatarLink := (.RelAvatarLink ctx)}} {{if $avatarLink}} - <img class="ui avatar gt-vm" src="{{$avatarLink}}" width="24" height="24" alt="{{.FullName}}"> + <img class="ui avatar tw-align-middle" src="{{$avatarLink}}" width="24" height="24" alt="{{.FullName}}"> {{else if $.IsMirror}} {{svg "octicon-mirror" 24}} {{else if $.IsFork}} diff --git a/templates/repo/issue/card.tmpl b/templates/repo/issue/card.tmpl index b461c5fc98..47c44af9b8 100644 --- a/templates/repo/issue/card.tmpl +++ b/templates/repo/issue/card.tmpl @@ -7,13 +7,13 @@ </div> {{end}} <div class="content gt-p-0 tw-w-full"> - <div class="gt-df tw-items-start"> + <div class="tw-flex tw-items-start"> <div class="issue-card-icon"> {{template "shared/issueicon" .}} </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 gt-df gt-ac" 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-content-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}} @@ -34,8 +34,8 @@ {{if .MilestoneID}} <div class="meta gt-my-2"> <a class="milestone" href="{{.Repo.Link}}/milestone/{{.MilestoneID}}"> - {{svg "octicon-milestone" 16 "gt-mr-2 gt-vm"}} - <span class="gt-vm">{{.Milestone.Name}}</span> + {{svg "octicon-milestone" 16 "gt-mr-2 tw-align-middle"}} + <span class="tw-align-middle">{{.Milestone.Name}}</span> </a> </div> {{end}} @@ -43,8 +43,8 @@ {{range index $.Page.LinkedPRs .ID}} <div class="meta gt-my-2"> <a href="{{$.Issue.Repo.Link}}/pulls/{{.Index}}"> - <span class="gt-m-0 text {{if .PullRequest.HasMerged}}purple{{else if .IsClosed}}red{{else}}green{{end}}">{{svg "octicon-git-merge" 16 "gt-mr-2 gt-vm"}}</span> - <span class="gt-vm">{{.Title}} <span class="text light grey">#{{.Index}}</span></span> + <span class="gt-m-0 text {{if .PullRequest.HasMerged}}purple{{else if .IsClosed}}red{{else}}green{{end}}">{{svg "octicon-git-merge" 16 "gt-mr-2 tw-align-middle"}}</span> + <span class="tw-align-middle">{{.Title}} <span class="text light grey">#{{.Index}}</span></span> </a> </div> {{end}} @@ -52,8 +52,8 @@ {{$tasks := .GetTasks}} {{if gt $tasks 0}} <div class="meta gt-my-2"> - {{svg "octicon-checklist" 16 "gt-mr-2 gt-vm"}} - <span class="gt-vm">{{.GetTasksDone}} / {{$tasks}}</span> + {{svg "octicon-checklist" 16 "gt-mr-2 tw-align-middle"}} + <span class="tw-align-middle">{{.GetTasksDone}} / {{$tasks}}</span> </div> {{end}} </div> diff --git a/templates/repo/issue/filter_actions.tmpl b/templates/repo/issue/filter_actions.tmpl index f573b8e09e..9c259fe0e1 100644 --- a/templates/repo/issue/filter_actions.tmpl +++ b/templates/repo/issue/filter_actions.tmpl @@ -29,7 +29,7 @@ <div class="divider"></div> {{end}} {{$previousExclusiveScope = $exclusiveScope}} - <div class="item issue-action gt-df gt-sb" data-action="toggle" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/labels"> + <div class="item issue-action tw-flex tw-justify-between" data-action="toggle" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/labels"> {{if SliceUtils.Contains $.SelLabelIDs .ID}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel $.Context ctx.Locale .}} {{template "repo/issue/labels/label_archived" .}} </div> diff --git a/templates/repo/issue/filter_list.tmpl b/templates/repo/issue/filter_list.tmpl index 696b7db46b..b5c950b121 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 gt-df gt-ac" {{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-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}}"> {{if .IsExcluded}} {{svg "octicon-circle-slash"}} {{else if .IsSelected}} @@ -107,7 +107,7 @@ {{ctx.Locale.Tr "repo.issues.new.open_projects"}} </div> {{range .OpenProjects}} - <a class="{{if $.ProjectID}}{{if eq $.ProjectID .ID}}active selected{{end}}{{end}} item gt-df" href="?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&project={{.ID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}{{if $.ShowArchivedLabels}}&archived=true{{end}}"> + <a class="{{if $.ProjectID}}{{if eq $.ProjectID .ID}}active selected{{end}}{{end}} item tw-flex" href="?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&project={{.ID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}{{if $.ShowArchivedLabels}}&archived=true{{end}}"> {{svg .IconName 18 "gt-mr-3 tw-shrink-0"}}<span class="gt-ellipsis">{{.Title}}</span> </a> {{end}} @@ -160,7 +160,7 @@ <a class="{{if eq .AssigneeID -1}}active selected {{end}}item" href="?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee=-1&poster={{$.PosterID}}{{if $.ShowArchivedLabels}}&archived=true{{end}}">{{ctx.Locale.Tr "repo.issues.filter_assginee_no_assignee"}}</a> <div class="divider"></div> {{range .Assignees}} - <a class="{{if eq $.AssigneeID .ID}}active selected{{end}} item gt-df" href="?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{.ID}}&poster={{$.PosterID}}{{if $.ShowArchivedLabels}}&archived=true{{end}}"> + <a class="{{if eq $.AssigneeID .ID}}active selected{{end}} item tw-flex" href="?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{.ID}}&poster={{$.PosterID}}{{if $.ShowArchivedLabels}}&archived=true{{end}}"> {{ctx.AvatarUtils.Avatar . 20}}{{template "repo/search_name" .}} </a> {{end}} diff --git a/templates/repo/issue/label_precolors.tmpl b/templates/repo/issue/label_precolors.tmpl index 146119b978..80007662c0 100644 --- a/templates/repo/issue/label_precolors.tmpl +++ b/templates/repo/issue/label_precolors.tmpl @@ -1,5 +1,5 @@ <div class="precolors"> - <div class="gt-df"> + <div class="tw-flex"> <a class="color" style="background-color:#e11d21" data-color-hex="#e11d21"></a> <a class="color" style="background-color:#eb6420" data-color-hex="#eb6420"></a> <a class="color" style="background-color:#fbca04" data-color-hex="#fbca04"></a> @@ -9,7 +9,7 @@ <a class="color" style="background-color:#0052cc" data-color-hex="#0052cc"></a> <a class="color" style="background-color:#5319e7" data-color-hex="#5319e7"></a> </div> - <div class="gt-df"> + <div class="tw-flex"> <a class="color" style="background-color:#f6c6c7" data-color-hex="#f6c6c7"></a> <a class="color" style="background-color:#fad8c7" data-color-hex="#fad8c7"></a> <a class="color" style="background-color:#fef2c0" data-color-hex="#fef2c0"></a> diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl index ca28e3af2d..86d08e5f75 100644 --- a/templates/repo/issue/labels/label_list.tmpl +++ b/templates/repo/issue/labels/label_list.tmpl @@ -42,9 +42,9 @@ <a class="open-issues" href="{{$.RepoLink}}/issues?labels={{.ID}}">{{svg "octicon-issue-opened"}} {{ctx.Locale.Tr "repo.issues.label_open_issues" .NumOpenIssues}}</a> {{end}} </div> - <div class="label-operation gt-df"> + <div class="label-operation tw-flex"> {{template "repo/issue/labels/label_archived" .}} - <div class="gt-df tw-ml-auto"> + <div class="tw-flex tw-ml-auto"> {{if and (not $.PageIsOrgSettingsLabels) (not $.Repository.IsArchived) (or $.CanWriteIssues $.CanWritePulls)}} <a class="edit-label-button" href="#" data-id="{{.ID}}" data-title="{{.Name}}" {{if .Exclusive}}data-exclusive{{end}} {{if gt .ArchivedUnix 0}}data-is-archived{{end}} data-num-issues="{{.NumIssues}}" data-description="{{.Description}}" data-color={{.Color}}>{{svg "octicon-pencil"}} {{ctx.Locale.Tr "repo.issues.label_edit"}}</a> <a class="delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trash"}} {{ctx.Locale.Tr "repo.issues.label_delete"}}</a> diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 507c3ce37a..e029bf6031 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -3,10 +3,10 @@ {{template "repo/header" .}} <div class="ui container"> {{template "base/alert" .}} - <div class="gt-df"> + <div class="tw-flex"> <h1 class="gt-mb-3">{{.Milestone.Name}}</h1> {{if not .Repository.IsArchived}} - <div class="text right gt-f1"> + <div class="text right tw-flex-1"> {{if or .CanWriteIssues .CanWritePulls}} {{if .Milestone.IsClosed}} <a class="ui primary basic button link-action" href data-url="{{$.RepoLink}}/milestones/{{.MilestoneID}}/open">{{ctx.Locale.Tr "repo.milestones.open"}} @@ -26,10 +26,10 @@ {{.Milestone.RenderedContent}} </div> {{end}} - <div class="gt-df gt-fc gt-gap-3"> + <div class="tw-flex tw-flex-col gt-gap-3"> <progress class="milestone-progress-big" value="{{.Milestone.Completeness}}" max="100"></progress> - <div class="gt-df gt-gap-4"> - <div classs="gt-df gt-ac"> + <div class="tw-flex gt-gap-4"> + <div classs="tw-flex tw-content-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 363ba7e3a2..af7dd70193 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="gt-df gt-ac"> + <div class="tw-flex tw-content-center"> <span class="gt-mr-3">{{.Completeness}}%</span> <progress value="{{.Completeness}}" max="100"></progress> </div> diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index b2b9e308f5..ba1e19bf07 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -171,7 +171,7 @@ <div class="selected"> {{range .Assignees}} <a class="item gt-p-2 muted gt-hidden" id="assignee_{{.ID}}" href="{{$.RepoLink}}/issues?assignee={{.ID}}"> - {{ctx.AvatarUtils.Avatar . 28 "gt-mr-3 gt-vm"}}{{.GetDisplayName}} + {{ctx.AvatarUtils.Avatar . 28 "gt-mr-3 tw-align-middle"}}{{.GetDisplayName}} </a> {{end}} </div> diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 89520ebe65..ff06d8c5bd 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 gt-df gt-ac gt-sb" role="heading" aria-level="3"> - <div class="comment-header-left gt-df gt-ac"> + <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"> {{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 gt-df gt-ac"> + <div class="comment-header-right actions tw-flex tw-content-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 2c3a47d670..151131366f 100644 --- a/templates/repo/issue/view_content/attachments.tmpl +++ b/templates/repo/issue/view_content/attachments.tmpl @@ -4,8 +4,8 @@ {{end}} {{$hasThumbnails := false}} {{- range .Attachments -}} - <div class="gt-df"> - <div class="gt-f1 gt-p-3"> + <div class="tw-flex"> + <div class="tw-flex-1 gt-p-3"> <a target="_blank" rel="noopener noreferrer" href="{{.DownloadURL}}" title="{{ctx.Locale.Tr "repo.issues.attachment.open_tab" .Name}}"> {{if FilenameIsImage .Name}} {{if not (StringUtils.Contains (StringUtils.ToString $.RenderedContent) .UUID)}} @@ -18,7 +18,7 @@ <span><strong>{{.Name}}</strong></span> </a> </div> - <div class="gt-p-3 gt-df gt-ac"> + <div class="gt-p-3 tw-flex tw-content-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 6654224320..2e2ce0fc28 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 gt-df gt-ac gt-sb" role="heading" aria-level="3"> - <div class="comment-header-left gt-df gt-ac"> + <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"> {{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 gt-df gt-ac"> + <div class="comment-header-right actions tw-flex tw-content-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 gt-df gt-ac gt-sb"> - <div class="comment-header-left gt-df gt-ac"> + <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"> {{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 gt-df gt-ac"> + <div class="comment-header-right actions tw-flex tw-content-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 gt-df gt-ac arrow-top"> + <div class="ui top attached header comment-header-left tw-flex tw-content-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 d93589539c..83c8fc6ca3 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 gt-df gt-ac gt-sb"> - <div class="gt-df gt-ac"> + <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"> <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 gt-df gt-ac"> + <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"> {{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 gt-df gt-ac"> + <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"> {{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 gt-df gt-ac"> + <div class="comment-header-left tw-flex tw-content-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 gt-df gt-ac"> + <div class="comment-header-right actions tw-flex tw-content-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,8 +109,8 @@ </div> {{end}} </div> - <div class="code-comment-buttons gt-df gt-ac gt-fw gt-mt-3 gt-mb-2 gt-mx-3"> - <div class="gt-f1"> + <div class="code-comment-buttons tw-flex tw-content-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"> {{svg "octicon-check" 16 "gt-mr-2"}} diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index aac30180df..9fafeb5ee3 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -33,7 +33,7 @@ <div class="ui attached merge-section segment {{if not $.LatestCommitStatus}}no-header{{end}} flex-items-block"> {{if .Issue.PullRequest.HasMerged}} {{if .IsPullBranchDeletable}} - <div class="item item-section text gt-f1"> + <div class="item item-section text tw-flex-1"> <div class="item-section-left"> <h3 class="gt-mb-3"> {{ctx.Locale.Tr "repo.pulls.merged_success"}} @@ -48,7 +48,7 @@ </div> {{end}} {{else if .Issue.IsClosed}} - <div class="item item-section text gt-f1"> + <div class="item item-section text tw-flex-1"> <div class="item-section-left"> <h3 class="gt-mb-3">{{ctx.Locale.Tr "repo.pulls.closed"}}</h3> <div class="merge-section-info"> @@ -82,7 +82,7 @@ </div> {{else if .IsPullWorkInProgress}} <div class="item toggle-wip" data-title="{{.Issue.Title}}" data-wip-prefix="{{.WorkInProgressPrefix}}" data-update-url="{{.Issue.Link}}/title"> - <div class="item-section-left flex-text-inline gt-f1"> + <div class="item-section-left flex-text-inline tw-flex-1"> {{svg "octicon-x"}} {{ctx.Locale.Tr "repo.pulls.cannot_merge_work_in_progress"}} </div> diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 329a39dd69..b8867c11e7 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 gt-df gt-ac muted"> + <a class="text tw-flex tw-content-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 gt-df gt-ac gt-py-3"> - <div class="gt-df gt-ac gt-f1"> + <div class="item tw-flex tw-content-center gt-py-3"> + <div class="tw-flex tw-content-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="gt-df gt-ac gt-gap-3"> + <div class="tw-flex tw-content-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 gt-df gt-ac 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-content-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 gt-df gt-ac gt-py-3"> - <div class="gt-df gt-ac gt-f1"> + <div class="item tw-flex tw-content-center gt-py-3"> + <div class="tw-flex tw-content-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="gt-df gt-ac gt-gap-3"> + <div class="tw-flex tw-content-center gt-gap-3"> {{svg (printf "octicon-%s" .Type.Icon) 16 (printf "text %s" (.HTMLTypeColorName))}} </div> </div> @@ -257,7 +257,7 @@ {{if .Participants}} <span class="text"><strong>{{ctx.Locale.Tr "repo.issues.num_participants" .NumParticipants}}</strong></span> - <div class="ui list gt-df gt-fw"> + <div class="ui list tw-flex tw-flex-wrap"> {{range .Participants}} <a {{if gt .ID 0}}href="{{.HomeLink}}"{{end}} data-tooltip-content="{{.GetDisplayName}}"> {{ctx.AvatarUtils.Avatar . 28 "gt-my-1 gt-mr-2"}} @@ -361,7 +361,7 @@ </div> {{if ne .Issue.DeadlineUnix 0}} <p> - <div class="gt-df gt-sb gt-ac"> + <div class="tw-flex tw-justify-between tw-content-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,8 +417,8 @@ </span> <div class="ui relaxed divided list"> {{range .BlockingDependencies}} - <div class="item dependency{{if .Issue.IsClosed}} is-closed{{end}} gt-df gt-ac gt-sb"> - <div class="item-left gt-df gt-jc gt-fc gt-f1 gt-ellipsis"> + <div class="item dependency{{if .Issue.IsClosed}} is-closed{{end}} tw-flex tw-content-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}} </a> @@ -426,7 +426,7 @@ {{.Repository.OwnerName}}/{{.Repository.Name}} </div> </div> - <div class="item-right gt-df gt-ac gt-m-2"> + <div class="item-right tw-flex tw-content-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 gt-df gt-ac gt-sb gt-ellipsis"> + <div class="item tw-flex tw-content-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,8 +449,8 @@ </span> <div class="ui relaxed divided list"> {{range .BlockedByDependencies}} - <div class="item dependency{{if .Issue.IsClosed}} is-closed{{end}} gt-df gt-ac gt-sb"> - <div class="item-left gt-df gt-jc gt-fc gt-f1 gt-ellipsis"> + <div class="item dependency{{if .Issue.IsClosed}} is-closed{{end}} tw-flex tw-content-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}} </a> @@ -458,7 +458,7 @@ {{.Repository.OwnerName}}/{{.Repository.Name}} </div> </div> - <div class="item-right gt-df gt-ac gt-m-2"> + <div class="item-right tw-flex tw-content-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,8 +469,8 @@ {{end}} {{if $.CanCreateIssueDependencies}} {{range .BlockedByDependenciesNotPermitted}} - <div class="item dependency{{if .Issue.IsClosed}} is-closed{{end}} gt-df gt-ac gt-sb"> - <div class="item-left gt-df gt-jc gt-fc gt-f1 gt-ellipsis"> + <div class="item dependency{{if .Issue.IsClosed}} is-closed{{end}} tw-flex tw-content-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> <span class="title" data-tooltip-content="#{{.Issue.Index}} {{.Issue.Title | RenderEmoji $.Context}}"> @@ -481,7 +481,7 @@ {{.Repository.OwnerName}}/{{.Repository.Name}} </div> </div> - <div class="item-right gt-df gt-ac gt-m-2"> + <div class="item-right tw-flex tw-content-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 gt-df gt-ac gt-sb gt-ellipsis"> + <div class="item tw-flex tw-content-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 gt-ac" data-tooltip-content="{{$issueReferenceLink}}"> + <div class="row tw-content-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/issue/view_content/update_branch_by_merge.tmpl b/templates/repo/issue/view_content/update_branch_by_merge.tmpl index 4dbefefe00..adce052dee 100644 --- a/templates/repo/issue/view_content/update_branch_by_merge.tmpl +++ b/templates/repo/issue/view_content/update_branch_by_merge.tmpl @@ -7,7 +7,7 @@ </div> <div class="item-section-right"> {{if and $.UpdateAllowed $.UpdateByRebaseAllowed}} - <div class="gt-dib"> + <div class="tw-inline-block"> <div class="ui buttons update-button"> <button class="ui button" data-do="{{$.Link}}/update" data-redirect="{{$.Link}}"> <span class="button-text"> diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 370826e0fd..4b5bf2ec0a 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -8,7 +8,7 @@ <h1 class="gt-word-break"> <span id="issue-title">{{RenderIssueTitle $.Context .Issue.Title ($.Repository.ComposeMetas ctx) | RenderCodeBlock}} <span class="index">#{{.Issue.Index}}</span> </span> - <div id="edit-title-input" class="ui input gt-f1 gt-hidden"> + <div id="edit-title-input" class="ui input tw-flex-1 gt-hidden"> <input value="{{.Issue.Title}}" maxlength="255" autocomplete="off"> </div> </h1> diff --git a/templates/repo/migrate/migrate.tmpl b/templates/repo/migrate/migrate.tmpl index 8ba567ee6b..c0336b9b97 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 gt-df gt-ac" href="{{AppSubUrl}}/repo/migrate?service_type={{.}}&org={{$.Org}}&mirror={{$.Mirror}}"> + <a class="ui card migrate-entry tw-flex tw-content-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 377a7ff79f..b227ce4439 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="gt-df gt-sb gt-ac gt-mb-4"> + <div class="tw-flex tw-justify-between tw-content-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/fork.tmpl b/templates/repo/pulls/fork.tmpl index f0907f409b..2cf0a85fc8 100644 --- a/templates/repo/pulls/fork.tmpl +++ b/templates/repo/pulls/fork.tmpl @@ -37,7 +37,7 @@ <div class="inline field"> <label>{{ctx.Locale.Tr "repo.fork_from"}}</label> - <a href="{{.ForkRepo.Link}}" class="gt-dib">{{.ForkRepo.FullName}}</a> + <a href="{{.ForkRepo.Link}}" class="tw-inline-block">{{.ForkRepo.FullName}}</a> </div> <div class="inline required field {{if .Err_RepoName}}error{{end}}"> <label for="repo_name">{{ctx.Locale.Tr "repo.repo_name"}}</label> diff --git a/templates/repo/pulls/tab_menu.tmpl b/templates/repo/pulls/tab_menu.tmpl index 340b1bb397..fb00acde32 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 gt-df gt-ac gt-gap-3"> + <span class="item tw-ml-auto gt-pr-0 gt-font-bold tw-flex tw-content-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 873cccab79..29059ea4a4 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -16,10 +16,10 @@ {{end}} </div> <div class="ui twelve wide column detail"> - <div class="gt-df gt-ac gt-sb gt-fw gt-mb-3"> + <div class="tw-flex tw-content-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" "gt-df"}} + {{template "repo/commit_statuses" dict "Status" $info.CommitStatus "Statuses" $info.CommitStatuses "AdditionalClasses" "tw-flex"}} {{if $release.IsDraft}} <span class="ui yellow label">{{ctx.Locale.Tr "repo.release.draft"}}</span> {{else if $release.IsPrerelease}} diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index 30e783167c..fd6338a701 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -21,7 +21,7 @@ {{else}} <input id="tag-name" name="tag_name" value="{{.tag_name}}" aria-label="{{ctx.Locale.Tr "repo.release.tag_name"}}" placeholder="{{ctx.Locale.Tr "repo.release.tag_name"}}" autofocus required maxlength="255"> <input id="tag-name-editor" type="hidden" data-existing-tags="{{JsonUtils.EncodeToString .Tags}}" data-tag-helper="{{ctx.Locale.Tr "repo.release.tag_helper"}}" data-tag-helper-new="{{ctx.Locale.Tr "repo.release.tag_helper_new"}}" data-tag-helper-existing="{{ctx.Locale.Tr "repo.release.tag_helper_existing"}}"> - <div id="tag-target-selector" class="gt-dib"> + <div id="tag-target-selector" class="tw-inline-block"> <span class="at">@</span> <div class="ui selection dropdown"> <input type="hidden" name="tag_target" value="{{.tag_target}}"> @@ -61,7 +61,7 @@ </div> {{range .attachments}} <div class="field flex-text-block" id="attachment-{{.ID}}"> - <div class="flex-text-inline gt-f1"> + <div class="flex-text-inline tw-flex-1"> <input name="attachment-edit-{{.UUID}}" class="attachment_edit" required value="{{.Name}}"> <input name="attachment-del-{{.UUID}}" type="hidden" value="false"> <span class="ui text grey tw-whitespace-nowrap">{{.Size | FileSize}}</span> @@ -101,7 +101,7 @@ </div> <span class="help">{{ctx.Locale.Tr "repo.release.prerelease_helper"}}</span> <div class="divider gt-mt-0"></div> - <div class="gt-df gt-je"> + <div class="tw-flex tw-justify-end"> {{if .PageIsEditRelease}} <a class="ui small button" href="{{.RepoLink}}/releases"> {{ctx.Locale.Tr "repo.release.cancel"}} diff --git a/templates/repo/release_tag_header.tmpl b/templates/repo/release_tag_header.tmpl index 8e6088790d..18a3c8c6b8 100644 --- a/templates/repo/release_tag_header.tmpl +++ b/templates/repo/release_tag_header.tmpl @@ -2,8 +2,8 @@ {{$canReadCode := $.Permission.CanRead $.UnitTypeCode}} {{if $canReadReleases}} - <div class="gt-df"> - <div class="gt-f1 gt-df gt-ac"> + <div class="tw-flex"> + <div class="tw-flex-1 tw-flex tw-content-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 73aff887f3..2610ae02fe 100644 --- a/templates/repo/settings/branches.tmpl +++ b/templates/repo/settings/branches.tmpl @@ -12,11 +12,11 @@ <p> {{ctx.Locale.Tr "repo.settings.default_branch_desc"}} </p> - <form class="gt-df" action="{{.Link}}" method="post"> + <form class="tw-flex" action="{{.Link}}" method="post"> {{.CsrfTokenHtml}} <input type="hidden" name="action" value="default_branch"> {{if not .Repository.IsEmpty}} - <div class="ui dropdown selection search gt-f1 gt-mr-3 tw-max-w-96"> + <div class="ui dropdown selection search tw-flex-1 gt-mr-3 tw-max-w-96"> {{svg "octicon-triangle-down" 14 "dropdown icon"}} <input type="hidden" name="branch" value="{{.Repository.DefaultBranch}}"> <div class="default text">{{.Repository.DefaultBranch}}</div> @@ -41,7 +41,7 @@ <div class="ui attached segment"> <div class="flex-list"> {{range .ProtectedBranches}} - <div class="flex-item gt-ac"> + <div class="flex-item tw-content-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 d7b5c96bab..8783de2544 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 gt-ac"> + <div class="flex-item tw-content-center"> <div class="flex-item-leading"> <a href="{{.HomeLink}}">{{ctx.AvatarUtils.Avatar . 32}}</a> </div> @@ -41,7 +41,7 @@ <div class="ui bottom attached segment"> <form class="ui form" id="repo-collab-form" action="{{.Link}}" method="post"> {{.CsrfTokenHtml}} - <div id="search-user-box" class="ui search input gt-vm"> + <div id="search-user-box" class="ui search input tw-align-middle"> <input class="prompt" name="collaborator" placeholder="{{ctx.Locale.Tr "search.team_kind"}}" autocomplete="off" autofocus required> </div> <button class="ui primary button">{{ctx.Locale.Tr "repo.settings.add_collaborator"}}</button> @@ -89,7 +89,7 @@ {{if $allowedToChangeTeams}} <form class="ui form" id="repo-collab-team-form" action="{{.Link}}/team" method="post"> {{.CsrfTokenHtml}} - <div id="search-team-box" class="ui search input gt-vm" data-org-name="{{.OrgName}}"> + <div id="search-team-box" class="ui search input tw-align-middle" data-org-name="{{.OrgName}}"> <input class="prompt" name="team" placeholder="{{ctx.Locale.Tr "search.team_kind"}}" autocomplete="off" autofocus required> </div> <button class="ui primary button">{{ctx.Locale.Tr "repo.settings.add_team"}}</button> diff --git a/templates/repo/settings/githooks.tmpl b/templates/repo/settings/githooks.tmpl index 3fce29d545..3d15d097cc 100644 --- a/templates/repo/settings/githooks.tmpl +++ b/templates/repo/settings/githooks.tmpl @@ -11,7 +11,7 @@ {{range .Hooks}} <div class="item truncated-item-container"> <span class="text {{if .IsActive}}green{{else}}grey{{end}} gt-mr-3">{{svg "octicon-dot-fill" 22}}</span> - <span class="text truncate gt-f1 gt-mr-3">{{.Name}}</span> + <span class="text truncate tw-flex-1 gt-mr-3">{{.Name}}</span> <a class="muted tw-float-right gt-p-3" href="{{$.RepoLink}}/settings/hooks/git/{{.Name|PathEscape}}"> {{svg "octicon-pencil"}} </a> diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 604e5d4152..aa40a1cd1b 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -132,7 +132,7 @@ <td>{{ctx.Locale.Tr "repo.settings.mirror_settings.direction.pull"}}</td> <td>{{DateTime "full" .PullMirror.UpdatedUnix}}</td> <td class="right aligned"> - <form method="post" class="gt-dib"> + <form method="post" class="tw-inline-block"> {{.CsrfTokenHtml}} <input type="hidden" name="action" value="mirror-sync"> <button class="ui primary tiny button inline text-thin">{{ctx.Locale.Tr "repo.settings.sync_mirror"}}</button> @@ -230,13 +230,13 @@ > {{svg "octicon-pencil" 14}} </button> - <form method="post" class="gt-dib"> + <form method="post" class="tw-inline-block"> {{$.CsrfTokenHtml}} <input type="hidden" name="action" value="push-mirror-sync"> <input type="hidden" name="push_mirror_id" value="{{.ID}}"> <button class="ui primary tiny button" data-tooltip-content="{{ctx.Locale.Tr "repo.settings.sync_mirror"}}">{{svg "octicon-sync" 14}}</button> </form> - <form method="post" class="gt-dib"> + <form method="post" class="tw-inline-block"> {{$.CsrfTokenHtml}} <input type="hidden" name="action" value="push-mirror-remove"> <input type="hidden" name="push_mirror_id" value="{{.ID}}"> @@ -837,7 +837,7 @@ </div> </div> {{if not .Repository.IsMirror}} - <div class="flex-item gt-ac"> + <div class="flex-item tw-content-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/settings/tags.tmpl b/templates/repo/settings/tags.tmpl index 4c196f0f99..c9efb7b67e 100644 --- a/templates/repo/settings/tags.tmpl +++ b/templates/repo/settings/tags.tmpl @@ -106,7 +106,7 @@ </td> <td class="right aligned"> <a class="ui tiny primary button" href="{{$.RepoLink}}/settings/tags/{{.ID}}">{{ctx.Locale.Tr "edit"}}</a> - <form class="gt-dib" action="{{$.RepoLink}}/settings/tags/delete" method="post"> + <form class="tw-inline-block" action="{{$.RepoLink}}/settings/tags/delete" method="post"> {{$.CsrfTokenHtml}} <input type="hidden" name="id" value="{{.ID}}"> <button class="ui tiny red button">{{ctx.Locale.Tr "remove"}}</button> diff --git a/templates/repo/settings/webhook/base_list.tmpl b/templates/repo/settings/webhook/base_list.tmpl index e56929b70f..9abc03e40e 100644 --- a/templates/repo/settings/webhook/base_list.tmpl +++ b/templates/repo/settings/webhook/base_list.tmpl @@ -15,7 +15,7 @@ {{range .Webhooks}} <div class="item truncated-item-container"> <span class="text {{if eq .LastStatus 1}}green{{else if eq .LastStatus 2}}red{{else}}grey{{end}} gt-mr-3">{{svg "octicon-dot-fill" 22}}</span> - <div class="text truncate gt-f1 gt-mr-3"> + <div class="text truncate tw-flex-1 gt-mr-3"> <a title="{{.URL}}" href="{{$.BaseLink}}/{{.ID}}">{{.URL}}</a> </div> <a class="muted gt-p-3" href="{{$.BaseLink}}/{{.ID}}">{{svg "octicon-pencil"}}</a> diff --git a/templates/repo/settings/webhook/history.tmpl b/templates/repo/settings/webhook/history.tmpl index 9f7a7816ea..e2aee13941 100644 --- a/templates/repo/settings/webhook/history.tmpl +++ b/templates/repo/settings/webhook/history.tmpl @@ -17,7 +17,7 @@ <div class="ui list"> {{range .History}} <div class="item"> - <div class="flex-text-block gt-sb"> + <div class="flex-text-block tw-justify-between"> <div class="flex-text-inline"> {{if .IsSucceed}} <span class="text green">{{svg "octicon-check"}}</span> diff --git a/templates/repo/tag/list.tmpl b/templates/repo/tag/list.tmpl index 9f0676e395..0348334623 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 gt-df gt-ac"> + <div class="five wide column tw-flex tw-content-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="gt-df gt-ac" href="{{$.RepoLink}}/releases/tag/{{.TagName | PathEscapeSegments}}" rel="nofollow">{{.TagName}}</a> + <a class="tw-flex tw-content-center" href="{{$.RepoLink}}/releases/tag/{{.TagName | PathEscapeSegments}}" rel="nofollow">{{.TagName}}</a> {{else}} - <a class="gt-df gt-ac" href="{{$.RepoLink}}/src/tag/{{.TagName | PathEscapeSegments}}" rel="nofollow">{{.TagName}}</a> + <a class="tw-flex tw-content-center" href="{{$.RepoLink}}/src/tag/{{.TagName | PathEscapeSegments}}" rel="nofollow">{{.TagName}}</a> {{end}} </h3> - <div class="download gt-df gt-ac"> + <div class="download tw-flex tw-content-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 8c1e7982eb..d8ef710400 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 gt-df gt-ac gt-sb gt-fw"> - <div class="file-header-left gt-df gt-ac gt-py-3 gt-pr-4"> + <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"> {{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 gt-df gt-ac gt-fw"> + <div class="file-header-right file-actions tw-flex tw-content-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/new.tmpl b/templates/repo/wiki/new.tmpl index 411c7fc869..d1abd27342 100644 --- a/templates/repo/wiki/new.tmpl +++ b/templates/repo/wiki/new.tmpl @@ -3,7 +3,7 @@ {{template "repo/header" .}} <div class="ui container"> {{template "base/alert" .}} - <div class="ui header flex-text-block gt-sb"> + <div class="ui header flex-text-block tw-justify-between"> {{ctx.Locale.Tr "repo.wiki.new_page"}} {{if .PageIsWikiEdit}} <a class="ui tiny primary button" href="{{.RepoLink}}/wiki?action=_new">{{ctx.Locale.Tr "repo.wiki.new_page_button"}}</a> diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl index cace0d48e0..fa7352e510 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 gt-df gt-ac gt-sb"> + <h2 class="ui header tw-flex tw-content-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 fefa9c589e..aa05a97fb0 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="gt-df gt-ac"> + <div class="tw-flex tw-content-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/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl index fbc730b288..f8bbf23b62 100644 --- a/templates/shared/actions/runner_edit.tmpl +++ b/templates/shared/actions/runner_edit.tmpl @@ -7,15 +7,15 @@ {{template "base/disable_form_autofill"}} {{.CsrfTokenHtml}} <div class="runner-basic-info"> - <div class="field gt-dib gt-mr-4"> + <div class="field tw-inline-block gt-mr-4"> <label>{{ctx.Locale.Tr "actions.runners.status"}}</label> <span class="ui {{if .Runner.IsOnline}}green{{else}}basic{{end}} label">{{.Runner.StatusLocaleName ctx.Locale}}</span> </div> - <div class="field gt-dib gt-mr-4"> + <div class="field tw-inline-block gt-mr-4"> <label>{{ctx.Locale.Tr "actions.runners.last_online"}}</label> <span>{{if .Runner.LastOnline}}{{TimeSinceUnix .Runner.LastOnline ctx.Locale}}{{else}}{{ctx.Locale.Tr "never"}}{{end}}</span> </div> - <div class="field gt-dib gt-mr-4"> + <div class="field tw-inline-block gt-mr-4"> <label>{{ctx.Locale.Tr "actions.runners.labels"}}</label> <span> {{range .Runner.AgentLabels}} @@ -23,7 +23,7 @@ {{end}} </span> </div> - <div class="field gt-dib gt-mr-4"> + <div class="field tw-inline-block gt-mr-4"> <label>{{ctx.Locale.Tr "actions.runners.owner_type"}}</label> <span data-tooltip-content="{{.Runner.BelongsToOwnerName}}">{{.Runner.BelongsToOwnerType.LocaleString ctx.Locale}}</span> </div> diff --git a/templates/shared/search/code/results.tmpl b/templates/shared/search/code/results.tmpl index 68b183e9bf..3bae959006 100644 --- a/templates/shared/search/code/results.tmpl +++ b/templates/shared/search/code/results.tmpl @@ -1,4 +1,4 @@ -<div class="flex-text-block gt-fw"> +<div class="flex-text-block tw-flex-wrap"> {{range $term := .SearchResultLanguages}} <a class="ui {{if eq $.Language $term.Language}}primary{{end}} basic label gt-m-0" href="?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}&fuzzy={{$.IsFuzzy}}"> @@ -12,9 +12,9 @@ {{range $result := .SearchResults}} {{$repo := or $.Repo (index $.RepoMaps .RepoID)}} <div class="diff-file-box diff-box file-content non-diff-file-content repo-search-result"> - <h4 class="ui top attached normal header gt-df gt-fw"> + <h4 class="ui top attached normal header tw-flex tw-flex-wrap"> {{if not $.Repo}} - <span class="file gt-f1"> + <span class="file tw-flex-1"> <a rel="nofollow" href="{{$repo.Link}}">{{$repo.FullName}}</a> {{if $repo.IsArchived}} <span class="ui basic label">{{ctx.Locale.Tr "repo.desc.archived"}}</span> @@ -22,7 +22,7 @@ - {{.Filename}} </span> {{else}} - <span class="file gt-f1">{{.Filename}}</span> + <span class="file tw-flex-1">{{.Filename}}</span> {{end}} <a role="button" class="ui basic tiny button" rel="nofollow" href="{{$repo.Link}}/src/commit/{{$result.CommitID | PathEscape}}/{{.Filename | PathEscapeSegments}}">{{ctx.Locale.Tr "repo.diff.view_file"}}</a> </h4> diff --git a/templates/shared/searchbottom.tmpl b/templates/shared/searchbottom.tmpl index b123b497c7..b920e10bb2 100644 --- a/templates/shared/searchbottom.tmpl +++ b/templates/shared/searchbottom.tmpl @@ -1,5 +1,5 @@ -<div class="ui bottom attached table segment gt-df gt-ac gt-sb"> - <div class="gt-df gt-ac gt-ml-4"> +<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"> {{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 4fbd8ddcfd..ea36d0cec2 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 gt-ac"> + <div class="flex-item tw-content-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 a8846b0abd..07e7b8aed5 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 gt-df gt-ac gt-word-break"> + <div class="ui header tw-flex tw-content-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/user/profile_big_avatar.tmpl b/templates/shared/user/profile_big_avatar.tmpl index a168e6903e..3e1cacd9ba 100644 --- a/templates/shared/user/profile_big_avatar.tmpl +++ b/templates/shared/user/profile_big_avatar.tmpl @@ -1,5 +1,5 @@ <div id="profile-avatar-card" class="ui card"> - <div id="profile-avatar" class="content gt-df"> + <div id="profile-avatar" class="content tw-flex"> {{if eq .SignedUserID .ContextUser.ID}} <a class="image" href="{{AppSubUrl}}/user/settings" data-tooltip-content="{{ctx.Locale.Tr "user.change_avatar"}}"> {{/* the size doesn't take affect (and no need to take affect), image size(width) should be controlled by the parent container since this is not a flex layout*/}} @@ -36,7 +36,7 @@ {{if .ContextUser.Location}} <li> {{svg "octicon-location"}} - <span class="gt-f1">{{.ContextUser.Location}}</span> + <span class="tw-flex-1">{{.ContextUser.Location}}</span> {{if .ContextUserLocationMapURL}} <a href="{{.ContextUserLocationMapURL}}" rel="nofollow noreferrer" data-tooltip-content="{{ctx.Locale.Tr "user.show_on_map"}}"> {{svg "octicon-link-external"}} @@ -47,7 +47,7 @@ {{if (eq .SignedUserID .ContextUser.ID)}} <li> {{svg "octicon-mail"}} - <a class="gt-f1" href="mailto:{{.ContextUser.Email}}" rel="nofollow">{{.ContextUser.Email}}</a> + <a class="tw-flex-1" href="mailto:{{.ContextUser.Email}}" rel="nofollow">{{.ContextUser.Email}}</a> <a href="{{AppSubUrl}}/user/settings#privacy-user-settings"> {{if .ShowUserEmail}} <i data-tooltip-content="{{ctx.Locale.Tr "user.email_visibility.limited"}}"> diff --git a/templates/shared/variables/variable_list.tmpl b/templates/shared/variables/variable_list.tmpl index 8e262d016c..dc8c7d7a80 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 gt-ac"> + <div class="flex-item tw-content-center"> <div class="flex-item-leading"> {{svg "octicon-pencil" 32}} </div> diff --git a/templates/status/500.tmpl b/templates/status/500.tmpl index 29de861a25..106529ca72 100644 --- a/templates/status/500.tmpl +++ b/templates/status/500.tmpl @@ -17,8 +17,8 @@ <body> <div class="full height"> <nav class="ui secondary menu"> - <div class="ui container gt-df"> - <div class="item gt-f1"> + <div class="ui container tw-flex"> + <div class="item tw-flex-1"> <a href="{{AppSubUrl}}/" aria-label="{{ctx.Locale.Tr "home"}}"> <img width="30" height="30" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{ctx.Locale.Tr "logo"}}" aria-hidden="true"> </a> diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl index d7d3649a4d..f8eb81423c 100644 --- a/templates/user/auth/signin_inner.tmpl +++ b/templates/user/auth/signin_inner.tmpl @@ -54,10 +54,10 @@ {{ctx.Locale.Tr "sign_in_or"}} </div> <div id="oauth2-login-navigator" class="gt-py-2"> - <div class="gt-df gt-fc gt-jc"> - <div id="oauth2-login-navigator-inner" class="gt-df gt-fc gt-fw gt-ac gt-gap-3"> + <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"> {{range $provider := .OAuth2Providers}} - <a class="{{$provider.Name}} ui button gt-df gt-ac gt-jc gt-py-3 tw-w-full oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}"> + <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}}"> {{$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 cfd826a0ce..a911537996 100644 --- a/templates/user/auth/signup_inner.tmpl +++ b/templates/user/auth/signup_inner.tmpl @@ -59,10 +59,10 @@ {{ctx.Locale.Tr "sign_in_or"}} </div> <div id="oauth2-login-navigator" class="gt-py-2"> - <div class="gt-df gt-fc gt-jc"> - <div id="oauth2-login-navigator-inner" class="gt-df gt-fc gt-fw gt-ac gt-gap-3"> + <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"> {{range $provider := .OAuth2Providers}} - <a class="{{$provider.Name}} ui button gt-df gt-ac gt-jc gt-py-3 tw-w-full oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}"> + <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}}"> {{$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 722da02f54..375ebba9ae 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 gt-df gt-ac gt-jc gt-gap-2 gt-py-3"> + <div class="ui attached segment tw-flex tw-content-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/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 0e7371ad83..382b0d4542 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -84,7 +84,7 @@ {{$push := ActionContent2Commits .}} {{$repoLink := (.GetRepoLink ctx)}} {{$repo := .Repo}} - <div class="gt-df gt-fc gt-gap-2"> + <div class="tw-flex tw-flex-col gt-gap-2"> {{range $push.Commits}} {{$commitLink := printf "%s/commit/%s" $repoLink .Sha1}} <div class="flex-text-block"> diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 214081d423..05f2b30efb 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="gt-df gt-ac"> + <div class="tw-flex tw-content-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 431aca0975..9da9e16d93 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="gt-df gt-ac gt-sb gt-mb-4"> + <div class="tw-flex tw-content-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="gt-df gt-ac gt-fc gt-p-4"> + <div class="tw-flex tw-content-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 gt-df gt-ac gt-fw gt-gap-3 gt-p-3" id="notification_{{.ID}}" data-status="{{.Status}}"> + <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-icon gt-ml-3 gt-mr-2 tw-self-start gt-mt-2"> {{if .Issue}} {{template "shared/issueicon" .Issue}} @@ -43,7 +43,7 @@ {{svg "octicon-repo" 16 "text grey"}} {{end}} </div> - <a class="notifications-link gt-df gt-f1 gt-fc silenced" href="{{.Link ctx}}"> + <a class="notifications-link tw-flex tw-flex-1 tw-flex-col silenced" href="{{.Link ctx}}"> <div class="notifications-top-row gt-font-13"> {{.Repository.FullName}} {{if .Issue}}<span class="text light-3">#{{.Issue.Index}}</span>{{end}} {{if eq .Status 3}} @@ -60,14 +60,14 @@ </span> </div> </a> - <div class="notifications-updated gt-ac gt-mr-3"> + <div class="notifications-updated tw-content-center gt-mr-3"> {{if .Issue}} {{TimeSinceUnix .Issue.UpdatedUnix ctx.Locale}} {{else}} {{TimeSinceUnix .UpdatedUnix ctx.Locale}} {{end}} </div> - <div class="notifications-buttons gt-ac gt-je gt-gap-2 gt-px-2"> + <div class="notifications-buttons tw-content-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/notification/notification_subscriptions.tmpl b/templates/user/notification/notification_subscriptions.tmpl index d39e628263..eb71621d92 100644 --- a/templates/user/notification/notification_subscriptions.tmpl +++ b/templates/user/notification/notification_subscriptions.tmpl @@ -11,8 +11,8 @@ </div> <div class="ui bottom attached active tab segment"> {{if eq .Status 1}} - <div class="gt-df gt-sb"> - <div class="gt-df"> + <div class="tw-flex tw-justify-between"> + <div class="tw-flex"> <div class="small-menu-items ui compact tiny menu"> <a class="{{if eq .State "all"}}active {{end}}item" href="?sort={{$.SortType}}&state=all&issueType={{$.IssueType}}&labels={{$.Labels}}"> {{ctx.Locale.Tr "all"}} @@ -27,7 +27,7 @@ </a> </div> </div> - <div class="gt-df gt-sb"> + <div class="tw-flex tw-justify-between"> <div class="ui right aligned secondary filter menu labels"> <!-- Type --> <div class="ui dropdown type jump item"> diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl index 515e79d739..efc09156e6 100644 --- a/templates/user/settings/account.tmpl +++ b/templates/user/settings/account.tmpl @@ -46,7 +46,7 @@ <form action="{{AppSubUrl}}/user/settings/account/email" class="ui form" method="post"> {{$.CsrfTokenHtml}} <input name="_method" type="hidden" value="NOTIFICATION"> - <div class="gt-df gt-fw gt-gap-3"> + <div class="tw-flex tw-flex-wrap gt-gap-3"> <div class="ui selection dropdown"> <input name="preference" type="hidden" value="{{.EmailNotificationsPreference}}"> {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/templates/user/settings/applications_oauth2_list.tmpl b/templates/user/settings/applications_oauth2_list.tmpl index bf6b28ec5f..1125a66d47 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 gt-ac"> + <div class="flex-item tw-content-center"> <div class="flex-item-leading"> {{svg "octicon-apps" 32}} </div> diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl index eeb2b6cbdd..41cdae2968 100644 --- a/templates/user/settings/repos.tmpl +++ b/templates/user/settings/repos.tmpl @@ -30,8 +30,8 @@ <span><a href="{{$repo.BaseRepo.Link}}">{{$repo.BaseRepo.OwnerName}}/{{$repo.BaseRepo.Name}}</a></span> {{end}} {{else}} - <span class="icon gt-dib gt-pt-3">{{svg "octicon-file-directory-fill"}}</span> - <span class="name gt-dib gt-pt-3">{{$.ContextUser.Name}}/{{$dir}}</span> + <span class="icon tw-inline-block gt-pt-3">{{svg "octicon-file-directory-fill"}}</span> + <span class="name tw-inline-block gt-pt-3">{{$.ContextUser.Name}}/{{$dir}}</span> <div class="tw-float-right"> {{if $.allowAdopt}} <button class="ui button primary show-modal gt-p-3" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{ctx.Locale.Tr "repo.adopt_preexisting_label"}}</span></button> diff --git a/templates/user/settings/security/openid.tmpl b/templates/user/settings/security/openid.tmpl index 0e9b4adcbe..63bc56ba9b 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 gt-ac"> + <div class="flex-item tw-content-center"> <div class="flex-item-leading"> {{svg "fontawesome-openid" 20}} </div> diff --git a/templates/webhook/new.tmpl b/templates/webhook/new.tmpl index 305133c03a..e0d04c1767 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 gt-df gt-ac"> + <div class="text tw-flex tw-content-center"> {{template "shared/webhook/icon" (dict "Size" 20 "HookType" .ctxData.HookType)}} {{ctx.Locale.Tr (print "repo.settings.web_hook_name_" .ctxData.HookType)}} </div> |