Skip to content

Commit 68ec9b4

Browse files
silverwindsilverwind
authored
Migrate margin and padding helpers to tailwind (#30043)
This will conclude the refactor of 1:1 class replacements to tailwind, except `gt-hidden`. Commands ran: ```bash perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/* perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/* perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/* perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/* perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/* perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/* ```
1 parent 4734d43 commit 68ec9b4

File tree

178 files changed

+605
-703
lines changed

Some content is hidden

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

178 files changed

+605
-703
lines changed

‎routers/web/repo/blame.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ func renderBlame(ctx *context.Context, blameParts []*git.BlamePart, commitNames
280280
if commit.User != nil {
281281
avatar = string(avatarUtils.Avatar(commit.User, 18))
282282
} else {
283-
avatar = string(avatarUtils.AvatarByEmail(commit.Author.Email, commit.Author.Name, 18, "gt-mr-3"))
283+
avatar = string(avatarUtils.AvatarByEmail(commit.Author.Email, commit.Author.Name, 18, "tw-mr-2"))
284284
}
285285

286286
br.Avatar = gotemplate.HTML(avatar)

‎routers/web/repo/issue_content_history.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func GetContentHistoryList(ctx *context.Context) {
7070
}
7171

7272
src := html.EscapeString(item.UserAvatarLink)
73-
class := avatars.DefaultAvatarClass + " gt-mr-3"
73+
class := avatars.DefaultAvatarClass + " tw-mr-2"
7474
name := html.EscapeString(username)
7575
avatarHTML := string(templates.AvatarHTML(src, 28, class, username))
7676
timeSinceText := string(timeutil.TimeSinceUnix(item.EditedUnix, ctx.Locale))

‎routers/web/repo/view.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -919,9 +919,9 @@ func prepareOpenWithEditorApps(ctx *context.Context) {
919919
schema, _, _ := strings.Cut(app.OpenURL, ":")
920920
var iconHTML template.HTML
921921
if schema == "vscode" || schema == "vscodium" || schema == "jetbrains" {
922-
iconHTML = svg.RenderHTML(fmt.Sprintf("gitea-%s", schema), 16, "gt-mr-3")
922+
iconHTML = svg.RenderHTML(fmt.Sprintf("gitea-%s", schema), 16, "tw-mr-2")
923923
} else {
924-
iconHTML = svg.RenderHTML("gitea-git", 16, "gt-mr-3") // TODO: it could support user's customized icon in the future
924+
iconHTML = svg.RenderHTML("gitea-git", 16, "tw-mr-2") // TODO: it could support user's customized icon in the future
925925
}
926926
tmplApps = append(tmplApps, map[string]any{
927927
"DisplayName": app.DisplayName,

‎services/auth/source/oauth2/providers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func (p *AuthSourceProvider) DisplayName() string {
5959

6060
func (p *AuthSourceProvider) IconHTML(size int) template.HTML {
6161
if p.iconURL != "" {
62-
img := fmt.Sprintf(`<img class="tw-object-contain gt-mr-3" width="%d" height="%d" src="%s" alt="%s">`,
62+
img := fmt.Sprintf(`<img class="tw-object-contain tw-mr-2" width="%d" height="%d" src="%s" alt="%s">`,
6363
size,
6464
size,
6565
html.EscapeString(p.iconURL), html.EscapeString(p.DisplayName()),

‎services/auth/source/oauth2/providers_base.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ func (b *BaseProvider) IconHTML(size int) template.HTML {
3535
case "github":
3636
svgName = "octicon-mark-github"
3737
}
38-
svgHTML := svg.RenderHTML(svgName, size, "gt-mr-3")
38+
svgHTML := svg.RenderHTML(svgName, size, "tw-mr-2")
3939
if svgHTML == "" {
4040
log.Error("No SVG icon for oauth2 provider %q", b.name)
41-
svgHTML = svg.RenderHTML("gitea-openid", size, "gt-mr-3")
41+
svgHTML = svg.RenderHTML("gitea-openid", size, "tw-mr-2")
4242
}
4343
return svgHTML
4444
}

‎services/auth/source/oauth2/providers_openid.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func (o *OpenIDProvider) DisplayName() string {
2929

3030
// IconHTML returns icon HTML for this provider
3131
func (o *OpenIDProvider) IconHTML(size int) template.HTML {
32-
return svg.RenderHTML("gitea-openid", size, "gt-mr-3")
32+
return svg.RenderHTML("gitea-openid", size, "tw-mr-2")
3333
}
3434

3535
// CreateGothProvider creates a GothProvider from this Provider

‎templates/admin/config.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229
<dt>{{ctx.Locale.Tr "admin.config.mailer_user"}}</dt>
230230
<dd>{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}</dd>
231231
<div class="divider"></div>
232-
<dt class="gt-py-2">{{ctx.Locale.Tr "admin.config.send_test_mail"}}</dt>
232+
<dt class="tw-py-1">{{ctx.Locale.Tr "admin.config.send_test_mail"}}</dt>
233233
<dd>
234234
<form class="ui form ignore-dirty" action="{{AppSubUrl}}/admin/config/test_mail" method="post">
235235
{{.CsrfTokenHtml}}
@@ -332,7 +332,7 @@
332332
{{range $loggerName, $loggerDetail := .Loggers}}
333333
<dt>{{ctx.Locale.Tr "admin.config.logger_name_fmt" $loggerName}}</dt>
334334
{{if $loggerDetail.IsEnabled}}
335-
<dd><pre class="gt-m-0">{{$loggerDetail.EventWriters | JsonUtils.EncodeToString | JsonUtils.PrettyIndent}}</pre></dd>
335+
<dd><pre class="tw-m-0">{{$loggerDetail.EventWriters | JsonUtils.EncodeToString | JsonUtils.PrettyIndent}}</pre></dd>
336336
{{else}}
337337
<dd>{{ctx.Locale.Tr "admin.config.disabled_logger"}}</dd>
338338
{{end}}

‎templates/admin/config_settings.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<div class="field">
2929
<details>
3030
<summary>{{ctx.Locale.Tr "admin.config.open_with_editor_app_help"}}</summary>
31-
<pre class="gt-px-4">{{.DefaultOpenWithEditorAppsString}}</pre>
31+
<pre class="tw-px-4">{{.DefaultOpenWithEditorAppsString}}</pre>
3232
</details>
3333
</div>
3434
<div class="field">

‎templates/admin/cron.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</h4>
66
<div class="ui attached table segment">
77
<form method="post" action="{{AppSubUrl}}/admin">
8-
<table class="ui very basic striped table unstackable gt-mb-0">
8+
<table class="ui very basic striped table unstackable tw-mb-0">
99
<thead>
1010
<tr>
1111
<th></th>

‎templates/admin/dashboard.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<div class="ui attached table segment">
1212
<form method="post" action="{{AppSubUrl}}/admin">
1313
{{.CsrfTokenHtml}}
14-
<table class="ui very basic table gt-mt-0 gt-px-4">
14+
<table class="ui very basic table tw-mt-0 tw-px-4">
1515
<tbody>
1616
<tr>
1717
<td>{{ctx.Locale.Tr "admin.dashboard.delete_inactive_accounts"}}</td>

‎templates/admin/emails/list.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
{{ctx.Locale.Tr "admin.emails.email_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}})
55
</h4>
66
<div class="ui attached segment">
7-
<div class="ui secondary filter menu tw-items-center gt-mx-0">
7+
<div class="ui secondary filter menu tw-items-center tw-mx-0">
88
<form class="ui form ignore-dirty tw-flex-1">
99
{{template "shared/search/combo" dict "Value" .Keyword}}
1010
</form>
1111
<!-- Sort -->
12-
<div class="ui dropdown type jump item gt-mr-0">
12+
<div class="ui dropdown type jump item tw-mr-0">
1313
<span class="text">
1414
{{ctx.Locale.Tr "repo.issues.filter_sort"}}
1515
</span>

‎templates/admin/org/list.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
</div>
88
</h4>
99
<div class="ui attached segment">
10-
<div class="ui secondary filter menu tw-items-center gt-mx-0">
10+
<div class="ui secondary filter menu tw-items-center tw-mx-0">
1111
<form class="ui form ignore-dirty tw-flex-1">
1212
{{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.org_kind")}}
1313
</form>
1414
<!-- Sort -->
15-
<div class="ui dropdown type jump item gt-mr-0">
15+
<div class="ui dropdown type jump item tw-mr-0">
1616
<span class="text">
1717
{{ctx.Locale.Tr "repo.issues.filter_sort"}}
1818
</span>

‎templates/admin/queue_manage.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
-
3131
{{else}}
3232
{{$sum}}
33-
<form action="{{$.Link}}/remove-all-items" method="post" class="tw-inline-block gt-ml-4">
33+
<form action="{{$.Link}}/remove-all-items" method="post" class="tw-inline-block tw-ml-4">
3434
{{$.CsrfTokenHtml}}
3535
<button class="ui tiny basic red button">{{ctx.Locale.Tr "admin.monitor.queue.settings.remove_all_items"}}</button>
3636
</form>

‎templates/admin/repo/unadopted.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<div class="item tw-flex tw-items-center">
2424
<span class="tw-flex-1"> {{svg "octicon-file-directory-fill"}} {{$dir}}</span>
2525
<div>
26-
<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>
26+
<button class="ui button primary show-modal tw-p-2" data-modal="#adopt-unadopted-modal-{{$dirI}}">{{svg "octicon-plus"}} {{ctx.Locale.Tr "repo.adopt_preexisting_label"}}</button>
2727
<div class="ui g-modal-confirm modal" id="adopt-unadopted-modal-{{$dirI}}">
2828
<div class="header">
2929
<span class="label">{{ctx.Locale.Tr "repo.adopt_preexisting"}}</span>
@@ -40,7 +40,7 @@
4040
{{template "base/modal_actions_confirm"}}
4141
</form>
4242
</div>
43-
<button class="ui button red show-modal gt-p-3" data-modal="#delete-unadopted-modal-{{$dirI}}">{{svg "octicon-x"}} {{ctx.Locale.Tr "repo.delete_preexisting_label"}}</button>
43+
<button class="ui button red show-modal tw-p-2" data-modal="#delete-unadopted-modal-{{$dirI}}">{{svg "octicon-x"}} {{ctx.Locale.Tr "repo.delete_preexisting_label"}}</button>
4444
<div class="ui g-modal-confirm modal" id="delete-unadopted-modal-{{$dirI}}">
4545
<div class="header">
4646
<span class="label">{{ctx.Locale.Tr "repo.delete_preexisting"}}</span>

‎templates/admin/self_check.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<div class="ui attached segment">
88
{{if .DatabaseCheckHasProblems}}
99
{{if .DatabaseType.IsMySQL}}
10-
<div class="gt-p-3">{{ctx.Locale.Tr "admin.self_check.database_fix_mysql"}}</div>
10+
<div class="tw-p-2">{{ctx.Locale.Tr "admin.self_check.database_fix_mysql"}}</div>
1111
{{else if .DatabaseType.IsMSSQL}}
12-
<div class="gt-p-3">{{ctx.Locale.Tr "admin.self_check.database_fix_mssql"}}</div>
12+
<div class="tw-p-2">{{ctx.Locale.Tr "admin.self_check.database_fix_mssql"}}</div>
1313
{{end}}
1414
{{if .DatabaseCheckCollationMismatch}}
1515
<div class="ui red message">{{ctx.Locale.Tr "admin.self_check.database_collation_mismatch" .DatabaseCheckResult.ExpectedCollation}}</div>
@@ -28,7 +28,7 @@
2828
</div>
2929
{{end}}
3030
{{else}}
31-
<div class="gt-p-3">{{ctx.Locale.Tr "admin.self_check.no_problem_found"}}</div>
31+
<div class="tw-p-2">{{ctx.Locale.Tr "admin.self_check.no_problem_found"}}</div>
3232
{{end}}
3333
</div>
3434
</div>

‎templates/admin/stacktrace-row.tmpl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="item">
22
<div class="tw-flex tw-items-center">
3-
<div class="icon gt-ml-3 gt-mr-3">
3+
<div class="icon tw-ml-2 tw-mr-2">
44
{{if eq .Process.Type "request"}}
55
{{svg "octicon-globe" 16}}
66
{{else if eq .Process.Type "system"}}
@@ -22,14 +22,14 @@
2222
</div>
2323
</div>
2424
{{if .Process.Stacks}}
25-
<div class="divided list gt-ml-3">
25+
<div class="divided list tw-ml-2">
2626
{{range .Process.Stacks}}
2727
<div class="item">
2828
<details>
2929
<summary>
3030
<div class="flex-text-inline">
31-
<div class="header gt-ml-3">
32-
<span class="icon gt-mr-3">{{svg "octicon-code" 16}}</span>{{.Description}}{{if gt .Count 1}} * {{.Count}}{{end}}
31+
<div class="header tw-ml-2">
32+
<span class="icon tw-mr-2">{{svg "octicon-code" 16}}</span>{{.Description}}{{if gt .Count 1}} * {{.Count}}{{end}}
3333
</div>
3434
<div class="description">
3535
{{range .Labels}}
@@ -41,7 +41,7 @@
4141
<div class="list">
4242
{{range .Entry}}
4343
<div class="item tw-flex tw-items-center">
44-
<span class="icon gt-mr-4">{{svg "octicon-dot-fill" 16}}</span>
44+
<span class="icon tw-mr-4">{{svg "octicon-dot-fill" 16}}</span>
4545
<div class="content tw-flex-1">
4646
<div class="header"><code>{{.Function}}</code></div>
4747
<div class="description"><code>{{.File}}:{{.Line}}</code></div>

‎templates/admin/user/edit.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
<label>{{ctx.Locale.Tr "settings.lookup_avatar_by_mail"}}</label>
182182
</div>
183183
</div>
184-
<div class="field gt-pl-4 {{if .Err_Gravatar}}error{{end}}">
184+
<div class="field tw-pl-4 {{if .Err_Gravatar}}error{{end}}">
185185
<label for="gravatar">Avatar {{ctx.Locale.Tr "email"}}</label>
186186
<input id="gravatar" name="gravatar" value="{{.User.AvatarEmail}}">
187187
</div>
@@ -194,7 +194,7 @@
194194
</div>
195195
</div>
196196

197-
<div class="inline field gt-pl-4">
197+
<div class="inline field tw-pl-4">
198198
<label for="avatar">{{ctx.Locale.Tr "settings.choose_new_avatar"}}</label>
199199
<input name="avatar" type="file" accept="image/png,image/jpeg,image/gif,image/webp">
200200
</div>

‎templates/base/head_navbar.tmpl

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
<!-- mobile right menu, it must be here because in mobile view, each item is a flex column, the first item is a full row column -->
1414
<div class="ui secondary menu item navbar-mobile-right only-mobile">
1515
{{if .IsSigned}}
16-
<a id="mobile-notifications-icon" class="item tw-w-auto gt-p-3" href="{{AppSubUrl}}/notifications" data-tooltip-content="{{ctx.Locale.Tr "notifications"}}" aria-label="{{ctx.Locale.Tr "notifications"}}">
16+
<a id="mobile-notifications-icon" class="item tw-w-auto tw-p-2" href="{{AppSubUrl}}/notifications" data-tooltip-content="{{ctx.Locale.Tr "notifications"}}" aria-label="{{ctx.Locale.Tr "notifications"}}">
1717
<div class="tw-relative">
1818
{{svg "octicon-bell"}}
1919
<span class="notification_count{{if not $notificationUnreadCount}} gt-hidden{{end}}">{{$notificationUnreadCount}}</span>
2020
</div>
2121
</a>
2222
{{end}}
23-
<button class="item tw-w-auto ui icon mini button gt-p-3 gt-m-0" id="navbar-expand-toggle" aria-label="{{ctx.Locale.Tr "home.nav_menu"}}">{{svg "octicon-three-bars"}}</button>
23+
<button class="item tw-w-auto ui icon mini button tw-p-2 tw-m-0" id="navbar-expand-toggle" aria-label="{{ctx.Locale.Tr "home.nav_menu"}}">{{svg "octicon-three-bars"}}</button>
2424
</div>
2525

2626
<!-- navbar links non-mobile -->
@@ -57,8 +57,8 @@
5757
{{if and .IsSigned .MustChangePassword}}
5858
<div class="ui dropdown jump item" data-tooltip-content="{{ctx.Locale.Tr "user_profile_and_more"}}">
5959
<span class="text tw-flex tw-items-center">
60-
{{ctx.AvatarUtils.Avatar .SignedUser 24 "gt-mr-2"}}
61-
<span class="only-mobile gt-ml-3">{{.SignedUser.Name}}</span>
60+
{{ctx.AvatarUtils.Avatar .SignedUser 24 "tw-mr-1"}}
61+
<span class="only-mobile tw-ml-2">{{.SignedUser.Name}}</span>
6262
<span class="not-mobile">{{svg "octicon-triangle-down"}}</span>
6363
</span>
6464
<div class="menu user-menu">
@@ -75,19 +75,19 @@
7575
</div><!-- end dropdown avatar menu -->
7676
{{else if .IsSigned}}
7777
{{if EnableTimetracking}}
78-
<a class="active-stopwatch-trigger item gt-mx-0{{if not .ActiveStopwatch}} gt-hidden{{end}}" href="{{.ActiveStopwatch.IssueLink}}" title="{{ctx.Locale.Tr "active_stopwatch"}}">
78+
<a class="active-stopwatch-trigger item tw-mx-0{{if not .ActiveStopwatch}} gt-hidden{{end}}" href="{{.ActiveStopwatch.IssueLink}}" title="{{ctx.Locale.Tr "active_stopwatch"}}">
7979
<div class="tw-relative">
8080
{{svg "octicon-stopwatch"}}
8181
<span class="header-stopwatch-dot"></span>
8282
</div>
83-
<span class="only-mobile gt-ml-3">{{ctx.Locale.Tr "active_stopwatch"}}</span>
83+
<span class="only-mobile tw-ml-2">{{ctx.Locale.Tr "active_stopwatch"}}</span>
8484
</a>
85-
<div class="active-stopwatch-popup item tippy-target gt-p-3">
85+
<div class="active-stopwatch-popup item tippy-target tw-p-2">
8686
<div class="tw-flex tw-items-center">
8787
<a class="stopwatch-link tw-flex tw-items-center" href="{{.ActiveStopwatch.IssueLink}}">
88-
{{svg "octicon-issue-opened" 16 "gt-mr-3"}}
88+
{{svg "octicon-issue-opened" 16 "tw-mr-2"}}
8989
<span class="stopwatch-issue">{{.ActiveStopwatch.RepoSlug}}#{{.ActiveStopwatch.IssueIndex}}</span>
90-
<span class="ui primary label stopwatch-time gt-my-0 gt-mx-4" data-seconds="{{.ActiveStopwatch.Seconds}}">
90+
<span class="ui primary label stopwatch-time tw-my-0 tw-mx-4" data-seconds="{{.ActiveStopwatch.Seconds}}">
9191
{{if .ActiveStopwatch}}{{Sec2Time .ActiveStopwatch.Seconds}}{{end}}
9292
</span>
9393
</a>
@@ -111,14 +111,14 @@
111111
</div>
112112
{{end}}
113113

114-
<a class="item not-mobile gt-mx-0" href="{{AppSubUrl}}/notifications" data-tooltip-content="{{ctx.Locale.Tr "notifications"}}" aria-label="{{ctx.Locale.Tr "notifications"}}">
114+
<a class="item not-mobile tw-mx-0" href="{{AppSubUrl}}/notifications" data-tooltip-content="{{ctx.Locale.Tr "notifications"}}" aria-label="{{ctx.Locale.Tr "notifications"}}">
115115
<div class="tw-relative">
116116
{{svg "octicon-bell"}}
117117
<span class="notification_count{{if not $notificationUnreadCount}} gt-hidden{{end}}">{{$notificationUnreadCount}}</span>
118118
</div>
119119
</a>
120120

121-
<div class="ui dropdown jump item gt-mx-0 gt-pr-3" data-tooltip-content="{{ctx.Locale.Tr "create_new"}}">
121+
<div class="ui dropdown jump item tw-mx-0 tw-pr-2" data-tooltip-content="{{ctx.Locale.Tr "create_new"}}">
122122
<span class="text">
123123
{{svg "octicon-plus"}}
124124
<span class="not-mobile">{{svg "octicon-triangle-down"}}</span>
@@ -141,10 +141,10 @@
141141
</div><!-- end content create new menu -->
142142
</div><!-- end dropdown menu create new -->
143143

144-
<div class="ui dropdown jump item gt-mx-0 gt-pr-3" data-tooltip-content="{{ctx.Locale.Tr "user_profile_and_more"}}">
144+
<div class="ui dropdown jump item tw-mx-0 tw-pr-2" data-tooltip-content="{{ctx.Locale.Tr "user_profile_and_more"}}">
145145
<span class="text tw-flex tw-items-center">
146-
{{ctx.AvatarUtils.Avatar .SignedUser 24 "gt-mr-2"}}
147-
<span class="only-mobile gt-ml-3">{{.SignedUser.Name}}</span>
146+
{{ctx.AvatarUtils.Avatar .SignedUser 24 "tw-mr-1"}}
147+
<span class="only-mobile tw-ml-2">{{.SignedUser.Name}}</span>
148148
<span class="not-mobile">{{svg "octicon-triangle-down"}}</span>
149149
</span>
150150
<div class="menu user-menu">

‎templates/base/paginate.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<div class="center page buttons">
77
<div class="ui borderless pagination menu">
88
<a class="{{if .IsFirst}}disabled{{end}} item navigation" {{if not .IsFirst}}href="{{$paginationLink}}{{if $paginationParams}}?{{$paginationParams}}{{end}}"{{end}}>
9-
{{svg "gitea-double-chevron-left" 16 "gt-mr-2"}}
9+
{{svg "gitea-double-chevron-left" 16 "tw-mr-1"}}
1010
<span class="navigation_label">{{ctx.Locale.Tr "admin.first_page"}}</span>
1111
</a>
1212
<a class="{{if not .HasPrevious}}disabled{{end}} item navigation" {{if .HasPrevious}}href="{{$paginationLink}}?page={{.Previous}}{{if $paginationParams}}&{{$paginationParams}}{{end}}"{{end}}>
13-
{{svg "octicon-chevron-left" 16 "gt-mr-2"}}
13+
{{svg "octicon-chevron-left" 16 "tw-mr-1"}}
1414
<span class="navigation_label">{{ctx.Locale.Tr "repo.issues.previous"}}</span>
1515
</a>
1616
{{range .Pages}}
@@ -22,11 +22,11 @@
2222
{{end}}
2323
<a class="{{if not .HasNext}}disabled{{end}} item navigation" {{if .HasNext}}href="{{$paginationLink}}?page={{.Next}}{{if $paginationParams}}&{{$paginationParams}}{{end}}"{{end}}>
2424
<span class="navigation_label">{{ctx.Locale.Tr "repo.issues.next"}}</span>
25-
{{svg "octicon-chevron-right" 16 "gt-ml-2"}}
25+
{{svg "octicon-chevron-right" 16 "tw-ml-1"}}
2626
</a>
2727
<a class="{{if .IsLast}}disabled{{end}} item navigation" {{if not .IsLast}}href="{{$paginationLink}}?page={{.TotalPages}}{{if $paginationParams}}&{{$paginationParams}}{{end}}"{{end}}>
2828
<span class="navigation_label">{{ctx.Locale.Tr "admin.last_page"}}</span>
29-
{{svg "gitea-double-chevron-right" 16 "gt-ml-2"}}
29+
{{svg "gitea-double-chevron-right" 16 "tw-ml-1"}}
3030
</a>
3131
</div>
3232
</div>

‎templates/devtest/fetch-action.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<div><button name="btn">submit post</button></div>
2727
</form>
2828
<form method="post" action="/no-such-uri" class="form-fetch-action">
29-
<div class="gt-py-5">bad action url</div>
29+
<div class="tw-py-8">bad action url</div>
3030
<div><button name="btn">submit test</button></div>
3131
</form>
3232
</div>

‎templates/devtest/flex-list.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
</div>
7474
<div class="flex-item-trailing">
7575
<a class="muted" href="{{$.Link}}">
76-
<span class="flex-text-inline"><i class="color-icon gt-mr-3 tw-bg-blue"></i>Go</span>
76+
<span class="flex-text-inline"><i class="color-icon tw-mr-2 tw-bg-blue"></i>Go</span>
7777
</a>
7878
<a class="text grey flex-text-inline" href="{{$.Link}}">{{svg "octicon-star" 16}}45000</a>
7979
<a class="text grey flex-text-inline" href="{{$.Link}}">{{svg "octicon-git-branch" 16}}1234</a>
@@ -104,7 +104,7 @@
104104
</div>
105105

106106
<h1>If parent provides the padding/margin space:</h1>
107-
<div class="tw-border tw-border-secondary gt-py-4">
107+
<div class="tw-border tw-border-secondary tw-py-4">
108108
<div class="flex-list flex-space-fitted">
109109
<div class="flex-item">item 1 (no padding top)</div>
110110
<div class="flex-item">item 2 (no padding bottom)</div>

0 commit comments

Comments
 (0)