mirror of
1
Fork 0

Use tailwind instead of `gt-[wh]-` helper classes (#29423)

Follow #29357
- Replace `gt-w-*` -> `tw-w-*` and remove `gt-w-*`
- Replace `gt-h-*` -> `tw-h-*` and remove `gt-h-*`

(cherry picked from commit 9a8c90ee18095d284192476834d5d23074d136f3)

Conflicts:
	templates/base/head_navbar.tmpl
	templates/status/404.tmpl
	trivial context conflict
This commit is contained in:
Lunny Xiao 2024-02-27 22:31:41 +08:00 committed by Earl Warren
parent 459ee98136
commit 15660334ba
No known key found for this signature in database
GPG Key ID: 0579CB2928A78A00
7 changed files with 10 additions and 16 deletions

View File

@ -20,7 +20,7 @@
{{if .DatabaseCheckInconsistentCollationColumns}} {{if .DatabaseCheckInconsistentCollationColumns}}
<div class="ui red message"> <div class="ui red message">
{{ctx.Locale.Tr "admin.self_check.database_inconsistent_collation_columns" .DatabaseCheckResult.DatabaseCollation}} {{ctx.Locale.Tr "admin.self_check.database_inconsistent_collation_columns" .DatabaseCheckResult.DatabaseCollation}}
<ul class="gt-w-full"> <ul class="tw-w-full">
{{range .DatabaseCheckInconsistentCollationColumns}} {{range .DatabaseCheckInconsistentCollationColumns}}
<li>{{.}}</li> <li>{{.}}</li>
{{end}} {{end}}

View File

@ -13,14 +13,14 @@
<!-- 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 --> <!-- 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 -->
<div class="ui secondary menu item navbar-mobile-right"> <div class="ui secondary menu item navbar-mobile-right">
{{if .IsSigned}} {{if .IsSigned}}
<a id="mobile-notifications-icon" class="item gt-w-auto gt-p-3" href="{{AppSubUrl}}/notifications" data-tooltip-content="{{ctx.Locale.Tr "notifications"}}" aria-label="{{ctx.Locale.Tr "notifications"}}"> <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"}}">
<div class="gt-relative"> <div class="gt-relative">
{{svg "octicon-bell"}} {{svg "octicon-bell"}}
<span class="notification_count{{if not $notificationUnreadCount}} gt-hidden{{end}}">{{$notificationUnreadCount}}</span> <span class="notification_count{{if not $notificationUnreadCount}} gt-hidden{{end}}">{{$notificationUnreadCount}}</span>
</div> </div>
</a> </a>
{{end}} {{end}}
<button class="item gt-w-auto ui icon mini button gt-p-3 gt-m-0" id="navbar-expand-toggle" aria-label="{{ctx.Locale.Tr "toggle_menu"}}">{{svg "octicon-three-bars"}}</button> <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 "toggle_menu"}}">{{svg "octicon-three-bars"}}</button>
</div> </div>
<!-- navbar links non-mobile --> <!-- navbar links non-mobile -->

View File

@ -5,7 +5,7 @@
<div id="test-modal-form-1" class="ui mini modal"> <div id="test-modal-form-1" class="ui mini modal">
<div class="header">Form dialog (layout 1)</div> <div class="header">Form dialog (layout 1)</div>
<form class="content" method="post"> <form class="content" method="post">
<div class="ui input gt-w-full"><input name="user_input"></div> <div class="ui input tw-w-full"><input name="user_input"></div>
{{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}} {{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}}
</form> </form>
</div> </div>
@ -14,7 +14,7 @@
<div class="header">Form dialog (layout 2)</div> <div class="header">Form dialog (layout 2)</div>
<form method="post"> <form method="post">
<div class="content"> <div class="content">
<div class="ui input gt-w-full"><input name="user_input"></div> <div class="ui input tw-w-full"><input name="user_input"></div>
{{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}} {{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}}
</div> </div>
</form> </form>
@ -24,7 +24,7 @@
<div class="header">Form dialog (layout 3)</div> <div class="header">Form dialog (layout 3)</div>
<form method="post"> <form method="post">
<div class="content"> <div class="content">
<div class="ui input gt-w-full"><input name="user_input"></div> <div class="ui input tw-w-full"><input name="user_input"></div>
</div> </div>
{{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}} {{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}}
</form> </form>
@ -33,7 +33,7 @@
<div id="test-modal-form-4" class="ui mini modal"> <div id="test-modal-form-4" class="ui mini modal">
<div class="header">Form dialog (layout 4)</div> <div class="header">Form dialog (layout 4)</div>
<div class="content"> <div class="content">
<div class="ui input gt-w-full"><input name="user_input"></div> <div class="ui input tw-w-full"><input name="user_input"></div>
</div> </div>
<form method="post"> <form method="post">
{{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}} {{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}}

View File

@ -206,7 +206,7 @@
{{if $showFileViewToggle}} {{if $showFileViewToggle}}
{{/* for image or CSV, it can have a horizontal scroll bar, there won't be review comment context menu (position absolute) which would be clipped by "overflow" */}} {{/* for image or CSV, it can have a horizontal scroll bar, there won't be review comment context menu (position absolute) which would be clipped by "overflow" */}}
<div id="diff-rendered-{{$file.NameHash}}" class="file-body file-code {{if $.IsSplitStyle}}code-diff-split{{else}}code-diff-unified{{end}} gt-overflow-x-scroll"> <div id="diff-rendered-{{$file.NameHash}}" class="file-body file-code {{if $.IsSplitStyle}}code-diff-split{{else}}code-diff-unified{{end}} gt-overflow-x-scroll">
<table class="chroma gt-w-full"> <table class="chroma tw-w-full">
{{if $isImage}} {{if $isImage}}
{{template "repo/diff/image_diff" dict "file" . "root" $ "blobBase" $blobBase "blobHead" $blobHead "sniffedTypeBase" $sniffedTypeBase "sniffedTypeHead" $sniffedTypeHead}} {{template "repo/diff/image_diff" dict "file" . "root" $ "blobBase" $blobBase "blobHead" $blobHead "sniffedTypeBase" $sniffedTypeBase "sniffedTypeHead" $sniffedTypeHead}}
{{else}} {{else}}

View File

@ -6,7 +6,7 @@
{{end}} {{end}}
</div> </div>
{{end}} {{end}}
<div class="content gt-p-0 gt-w-full"> <div class="content gt-p-0 tw-w-full">
<div class="gt-df gt-items-start"> <div class="gt-df gt-items-start">
<div class="issue-card-icon"> <div class="issue-card-icon">
{{template "shared/issueicon" .}} {{template "shared/issueicon" .}}

View File

@ -1,5 +1,5 @@
{{template "base/head" .}} {{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content ui center gt-w-screen {{if .IsRepo}}repository{{end}}"> <div role="main" aria-label="{{.Title}}" class="page-content ui center tw-w-screen {{if .IsRepo}}repository{{end}}">
{{if .IsRepo}}{{template "repo/header" .}}{{end}} {{if .IsRepo}}{{template "repo/header" .}}{{end}}
<div class="ui container center"> <div class="ui container center">
<h1 style="margin-top: 100px" class="error-code">404</h1> <h1 style="margin-top: 100px" class="error-code">404</h1>

View File

@ -73,12 +73,6 @@ Gitea's private styles use `g-` prefix.
.gt-overflow-x-scroll { overflow-x: scroll !important; } .gt-overflow-x-scroll { overflow-x: scroll !important; }
.gt-overflow-y-hidden { overflow-y: hidden !important; } .gt-overflow-y-hidden { overflow-y: hidden !important; }
.gt-h-screen { height: 100vh !important; }
.gt-h-full { height: 100% !important; }
.gt-w-auto { width: auto !important; }
.gt-w-screen { width: 100vw !important; }
.gt-w-full { width: 100% !important; }
.gt-float-left { float: left !important; } .gt-float-left { float: left !important; }
.gt-float-right { float: right !important; } .gt-float-right { float: right !important; }
.gt-clear-both { clear: both !important; } .gt-clear-both { clear: both !important; }