Skip to content

Commit 90a4f9a

Browse files
silverwindsilverwind
authored
Migrate gap helpers to tailwind (#30034)
Commands ran: ```sh perl -p -i -e 's#gt-gap-0#tw-gap-0#g' web_src/js/**/* templates/**/* perl -p -i -e 's#gt-gap-1#tw-gap-0.5#g' web_src/js/**/* templates/**/* perl -p -i -e 's#gt-gap-2#tw-gap-1#g' web_src/js/**/* templates/**/* perl -p -i -e 's#gt-gap-3#tw-gap-2#g' web_src/js/**/* templates/**/* perl -p -i -e 's#gt-gap-4#tw-gap-4#g' web_src/js/**/* templates/**/* perl -p -i -e 's#gt-gap-5#tw-gap-8#g' web_src/js/**/* templates/**/* perl -p -i -e 's#gt-gap-x-0#tw-gap-x-0#g' web_src/js/**/* templates/**/* perl -p -i -e 's#gt-gap-x-1#tw-gap-x-0.5#g' web_src/js/**/* templates/**/* perl -p -i -e 's#gt-gap-x-2#tw-gap-x-1#g' web_src/js/**/* templates/**/* perl -p -i -e 's#gt-gap-x-3#tw-gap-x-2#g' web_src/js/**/* templates/**/* perl -p -i -e 's#gt-gap-x-4#tw-gap-x-4#g' web_src/js/**/* templates/**/* perl -p -i -e 's#gt-gap-x-5#tw-gap-x-8#g' web_src/js/**/* templates/**/* perl -p -i -e 's#gt-gap-y-0#tw-gap-y-0#g' web_src/js/**/* templates/**/* perl -p -i -e 's#gt-gap-y-1#tw-gap-y-0.5#g' web_src/js/**/* templates/**/* perl -p -i -e 's#gt-gap-y-2#tw-gap-y-1#g' web_src/js/**/* templates/**/* perl -p -i -e 's#gt-gap-y-3#tw-gap-y-2#g' web_src/js/**/* templates/**/* perl -p -i -e 's#gt-gap-y-4#tw-gap-y-4#g' web_src/js/**/* templates/**/* perl -p -i -e 's#gt-gap-y-5#tw-gap-y-8#g' web_src/js/**/* templates/**/*
1 parent 2d28170 commit 90a4f9a

File tree

19 files changed

+27
-48
lines changed

19 files changed

+27
-48
lines changed

‎templates/admin/user/list.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
<td><span>{{ctx.Locale.Tr "admin.users.never_login"}}</span></td>
104104
{{end}}
105105
<td>
106-
<div class="tw-flex gt-gap-3">
106+
<div class="tw-flex tw-gap-2">
107107
<a href="{{$.Link}}/{{.ID}}" data-tooltip-content="{{ctx.Locale.Tr "admin.users.details"}}">{{svg "octicon-person"}}</a>
108108
<a href="{{$.Link}}/{{.ID}}/edit" data-tooltip-content="{{ctx.Locale.Tr "edit"}}">{{svg "octicon-pencil"}}</a>
109109
</div>

‎templates/org/header.tmpl‎

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

‎templates/org/team/members.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{{template "org/team/navbar" .}}
1010
{{if .IsOrganizationOwner}}
1111
<div class="ui attached segment">
12-
<form class="ui form ignore-dirty tw-flex tw-flex-wrap gt-gap-3" action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/add" method="post">
12+
<form class="ui form ignore-dirty tw-flex tw-flex-wrap tw-gap-2" action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/add" method="post">
1313
{{.CsrfTokenHtml}}
1414
<input type="hidden" name="uid" value="{{.SignedUser.ID}}">
1515
<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}}>

‎templates/org/team/repositories.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{{template "org/team/navbar" .}}
1010
{{$canAddRemove := and $.IsOrganizationOwner (not $.Team.IncludesAllRepositories)}}
1111
{{if $canAddRemove}}
12-
<div class="ui attached segment tw-flex tw-flex-wrap gt-gap-3">
12+
<div class="ui attached segment tw-flex tw-flex-wrap tw-gap-2">
1313
<form class="ui form ignore-dirty tw-flex-1 tw-flex" action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/repo/add" method="post">
1414
{{.CsrfTokenHtml}}
1515
<div id="search-repo-box" data-uid="{{.Org.ID}}" class="ui search">

‎templates/repo/diff/box.tmpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{$showFileTree := (and (not .DiffNotAvailable) (gt .Diff.NumFiles 1))}}
22
<div>
33
<div class="diff-detail-box diff-box">
4-
<div class="tw-flex tw-items-center tw-flex-wrap gt-gap-3 gt-ml-1">
4+
<div class="tw-flex tw-items-center tw-flex-wrap tw-gap-2 gt-ml-1">
55
{{if $showFileTree}}
66
<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"}}">
77
{{/* the icon meaning is reversed here, "octicon-sidebar-collapse" means show the file tree */}}
@@ -111,7 +111,7 @@
111111
{{$isReviewFile := and $.IsSigned $.PageIsPullFiles (not $.IsArchived) $.IsShowingAllCommits}}
112112
<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}}>
113113
<h4 class="diff-file-header sticky-2nd-row ui top attached header tw-font-normal tw-flex tw-items-center tw-justify-between tw-flex-wrap">
114-
<div class="diff-file-name tw-flex tw-items-center gt-gap-2 tw-flex-wrap">
114+
<div class="diff-file-name tw-flex tw-items-center tw-gap-1 tw-flex-wrap">
115115
<button class="fold-file btn interact-bg gt-p-2{{if not $isExpandable}} tw-invisible{{end}}">
116116
{{if $file.ShouldBeHidden}}
117117
{{svg "octicon-chevron-right" 18}}
@@ -144,7 +144,7 @@
144144
<span class="gt-ml-4 gt-mono">{{ctx.Locale.Tr ($file.ModeTranslationKey $file.Mode)}}</span>
145145
{{end}}
146146
</div>
147-
<div class="diff-file-header-actions tw-flex tw-items-center gt-gap-2 tw-flex-wrap">
147+
<div class="diff-file-header-actions tw-flex tw-items-center tw-gap-1 tw-flex-wrap">
148148
{{if $showFileViewToggle}}
149149
<div class="ui compact icon buttons">
150150
<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>

‎templates/repo/diff/conversation.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<div class="conversation-holder" data-path="{{$comment.TreePath}}" data-side="{{if lt $comment.Line 0}}left{{else}}right{{end}}" data-idx="{{$comment.UnsignedLine}}">
1010
{{if $resolved}}
1111
<div class="ui attached header resolved-placeholder tw-flex tw-items-center tw-justify-between">
12-
<div class="ui grey text tw-flex tw-items-center tw-flex-wrap gt-gap-2">
12+
<div class="ui grey text tw-flex tw-items-center tw-flex-wrap tw-gap-1">
1313
{{svg "octicon-check" 16 "icon gt-mr-2"}}
1414
<b>{{$resolveDoer.Name}}</b> {{ctx.Locale.Tr "repo.issues.review.resolved_by"}}
1515
{{if $invalid}}
@@ -22,7 +22,7 @@
2222
</a>
2323
{{end}}
2424
</div>
25-
<div class="tw-flex tw-items-center gt-gap-3">
25+
<div class="tw-flex tw-items-center tw-gap-2">
2626
<button id="show-outdated-{{$comment.ID}}" data-comment="{{$comment.ID}}" class="ui tiny labeled button show-outdated tw-flex tw-items-center">
2727
{{svg "octicon-unfold" 16 "gt-mr-3"}}
2828
{{ctx.Locale.Tr "repo.issues.review.show_resolved"}}

‎templates/repo/home.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</div>
2828
{{end}}
2929
</div>
30-
<div class="tw-flex tw-items-center tw-flex-wrap gt-gap-2" id="repo-topics">
30+
<div class="tw-flex tw-items-center tw-flex-wrap tw-gap-1" id="repo-topics">
3131
{{range .Topics}}<a class="ui repo-topic large label topic gt-m-0" href="{{AppSubUrl}}/explore/repos?q={{.Name}}&topic=1">{{.Name}}</a>{{end}}
3232
{{if and .Permission.IsAdmin (not .Repository.IsArchived)}}<button id="manage_topic" class="btn interact-fg tw-text-12">{{ctx.Locale.Tr "repo.topic.manage_topics"}}</button>{{end}}
3333
</div>
@@ -61,7 +61,7 @@
6161
{{end}}
6262
{{template "repo/sub_menu" .}}
6363
<div class="repo-button-row">
64-
<div class="tw-flex tw-items-center tw-flex-wrap gt-gap-y-3">
64+
<div class="tw-flex tw-items-center tw-flex-wrap tw-gap-y-2">
6565
{{template "repo/branch_dropdown" dict "root" . "ContainerClasses" "gt-mr-2"}}
6666
{{if and .CanCompareOrPull .IsViewBranch (not .Repository.IsArchived)}}
6767
{{$cmpBranch := ""}}

‎templates/repo/issue/milestone_issues.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
{{.Milestone.RenderedContent}}
2727
</div>
2828
{{end}}
29-
<div class="tw-flex tw-flex-col gt-gap-3">
29+
<div class="tw-flex tw-flex-col tw-gap-2">
3030
<progress class="milestone-progress-big" value="{{.Milestone.Completeness}}" max="100"></progress>
31-
<div class="tw-flex gt-gap-4">
31+
<div class="tw-flex tw-gap-4">
3232
<div classs="tw-flex tw-items-center">
3333
{{$closedDate:= TimeSinceUnix .Milestone.ClosedDateUnix ctx.Locale}}
3434
{{if .IsClosed}}

‎templates/repo/issue/view_content/sidebar.tmpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<span class="text">{{svg "octicon-people" 20 "gt-mr-3"}}{{$.Issue.Repo.OwnerName}}/{{.Team.Name}}</span>
5959
{{end}}
6060
</div>
61-
<div class="tw-flex tw-items-center gt-gap-3">
61+
<div class="tw-flex tw-items-center tw-gap-2">
6262
{{if (and $.Permission.IsAdmin (or (eq .Review.Type 1) (eq .Review.Type 3)) (not $.Issue.IsClosed))}}
6363
<a href="#" class="ui muted icon tw-flex tw-items-center show-modal" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.dismiss_review"}}" data-modal="#dismiss-review-modal-{{.Review.ID}}">
6464
{{svg "octicon-x" 20}}
@@ -106,7 +106,7 @@
106106
{{.OriginalAuthor}}
107107
</a>
108108
</div>
109-
<div class="tw-flex tw-items-center gt-gap-3">
109+
<div class="tw-flex tw-items-center tw-gap-2">
110110
{{svg (printf "octicon-%s" .Type.Icon) 16 (printf "text %s" (.HTMLTypeColorName))}}
111111
</div>
112112
</div>
@@ -310,7 +310,7 @@
310310
<div class="ui mini modal issue-start-time-modal">
311311
<div class="header">{{ctx.Locale.Tr "repo.issues.add_time"}}</div>
312312
<div class="content">
313-
<form method="post" id="add_time_manual_form" action="{{.Issue.Link}}/times/add" class="ui input fluid gt-gap-3">
313+
<form method="post" id="add_time_manual_form" action="{{.Issue.Link}}/times/add" class="ui input fluid tw-gap-2">
314314
{{$.CsrfTokenHtml}}
315315
<input placeholder='{{ctx.Locale.Tr "repo.issues.add_time_hours"}}' type="number" name="hours">
316316
<input placeholder='{{ctx.Locale.Tr "repo.issues.add_time_minutes"}}' type="number" name="minutes" class="ui compact">

‎templates/repo/pulls/tab_menu.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
{{ctx.Locale.Tr "repo.pulls.tab_files"}}
1616
<span class="ui small label">{{if .NumFiles}}{{.NumFiles}}{{else}}-{{end}}</span>
1717
</a>
18-
<span class="item tw-ml-auto gt-pr-0 tw-font-bold tw-flex tw-items-center gt-gap-3">
18+
<span class="item tw-ml-auto gt-pr-0 tw-font-bold tw-flex tw-items-center tw-gap-2">
1919
<span><span class="text green">{{if .Diff.TotalAddition}}+{{.Diff.TotalAddition}}{{end}}</span> <span class="text red">{{if .Diff.TotalDeletion}}-{{.Diff.TotalDeletion}}{{end}}</span></span>
2020
<span class="diff-stats-bar">
2121
<div class="diff-stats-add-bar" style="width: {{Eval 100 "*" .Diff.TotalAddition "/" "(" .Diff.TotalAddition "+" .Diff.TotalDeletion "+" 0.0 ")"}}%"></div>

0 commit comments

Comments
 (0)