Skip to content

Commit 576644d

Browse files
wxiaoguangGiteaBot
wxiaoguang
and
GiteaBot
authored
Simplify helper CSS classes and avoid abuse (#26728)
Removed CSS helper classes (some of them are not useful while some of them are abused often) * `gt-db`: in most cases it could be replaced by `gt-df` and the flex layout should be encouraged. Other cases: either it does need the `gt-df` (eg: by using `div` directly) or it is an abuse (eg: the warning message in a form) * `gt-di`: it doesn't seem useful, or it could be replaced by `gt-dib` in most cases. * `gt-dif`: not useful, it could be replaced by `flex-text-inline` or `gt-df` * `gt-js`: never used * All `<i class="icon gt-df gt-ac gt-jc">` could be written as `<i class="icon">` ## Some UI samples ### Admin Notice ![image](https://github.com/go-gitea/gitea/assets/2114189/d02010d4-dc7d-463f-bc99-dcc9b6e2e2ac) ### Admin Stacktrace ![image](https://github.com/go-gitea/gitea/assets/2114189/4045695c-a8c4-4e37-b720-e77a61b1e965) ### Org Home ![image](https://github.com/go-gitea/gitea/assets/2114189/069f02d0-76ad-4052-8a80-700d7e501d40) ### Org Team Repo ![image](https://github.com/go-gitea/gitea/assets/2114189/dc8d6106-bb6b-4f60-83ac-06cb28df3ab5) ### Release List ![image](https://github.com/go-gitea/gitea/assets/2114189/0845e8a5-d1a9-487a-9d25-3c200ad54c17) ### User Setting Application Token Scope ![image](https://github.com/go-gitea/gitea/assets/2114189/fffbde27-432b-49c6-827e-17b8cd3457ff) Co-authored-by: Giteabot <teabot@gitea.io>
1 parent 8b5c081 commit 576644d

17 files changed

+33
-34
lines changed

‎templates/admin/notice.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<tbody>
1818
{{range .Notices}}
1919
<tr>
20-
<td><div class="ui checkbox gt-db" data-id="{{.ID}}"><input type="checkbox"></div></td>
20+
<td><div class="ui checkbox gt-df" data-id="{{.ID}}"><input type="checkbox"></div></td>
2121
<td>{{.ID}}</td>
2222
<td>{{$.locale.Tr .TrStr}}</td>
2323
<td class="view-detail auto-ellipsis" style="width: 80%;"><span class="notice-description">{{.Description}}</span></td>

‎templates/admin/stacktrace-row.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<div class="item">
2828
<details>
2929
<summary>
30-
<div class="gt-dif content">
30+
<div class="flex-text-inline">
3131
<div class="header gt-ml-3">
3232
<span class="icon gt-mr-3">{{svg "octicon-code" 16}}</span>{{.Description}}{{if gt .Count 1}} * {{.Count}}{{end}}
3333
</div>

‎templates/org/home.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
{{if .NumMembers}}
5858
<h4 class="ui top attached header gt-df">
5959
<strong class="gt-f1">{{.locale.Tr "org.members"}}</strong>
60-
<a class="text grey gt-dif gt-ac" href="{{.OrgLink}}/members"><span>{{.NumMembers}}</span> {{svg "octicon-chevron-right"}}</a>
60+
<a class="text grey gt-df gt-ac" href="{{.OrgLink}}/members"><span>{{.NumMembers}}</span> {{svg "octicon-chevron-right"}}</a>
6161
</h4>
6262
<div class="ui attached segment members">
6363
{{$isMember := .IsOrganizationMember}}
@@ -71,7 +71,7 @@
7171
{{if .IsOrganizationMember}}
7272
<div class="ui top attached header gt-df">
7373
<strong class="gt-f1">{{.locale.Tr "org.teams"}}</strong>
74-
<a class="text grey gt-dif gt-ac" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right"}}</a>
74+
<a class="text grey gt-df gt-ac" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right"}}</a>
7575
</div>
7676
<div class="ui attached table segment teams">
7777
{{range .Teams}}

‎templates/org/team/repositories.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
{{$canAddRemove := and $.IsOrganizationOwner (not $.Team.IncludesAllRepositories)}}
1111
{{if $canAddRemove}}
1212
<div class="ui attached segment gt-df gt-fw gt-gap-3">
13-
<form class="ui form ignore-dirty gt-f1 gt-dif" action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/repo/add" method="post">
13+
<form class="ui form ignore-dirty gt-f1 gt-df" 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">
1616
<div class="ui input">

‎templates/repo/home.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<div class="ui small action input{{if .CodeIndexerUnavailable}} disabled left icon{{end}}"{{if .CodeIndexerUnavailable}} data-tooltip-content="{{.locale.Tr "repo.search.code_search_unavailable"}}"{{end}}>
1919
<input name="q" value="{{.Keyword}}"{{if .CodeIndexerUnavailable}} disabled{{end}} placeholder="{{.locale.Tr "repo.search.search_repo"}}">
2020
{{if .CodeIndexerUnavailable}}
21-
<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-alert"}}</i>
21+
<i class="icon">{{svg "octicon-alert"}}</i>
2222
{{end}}
2323
<button class="ui small icon button"{{if .CodeIndexerUnavailable}} disabled{{end}} type="submit">
2424
{{svg "octicon-search"}}

‎templates/repo/issue/filters.tmpl

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</span>
1616
<div class="menu">
1717
<div class="ui icon search input">
18-
<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
18+
<i class="icon">{{svg "octicon-search" 16}}</i>
1919
<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_label"}}">
2020
</div>
2121
<span class="info">{{.locale.Tr "repo.issues.filter_label_exclude" | Safe}}</span>
@@ -43,7 +43,7 @@
4343
</span>
4444
<div class="menu">
4545
<div class="ui icon search input">
46-
<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
46+
<i class="icon">{{svg "octicon-search" 16}}</i>
4747
<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_milestone"}}">
4848
</div>
4949
<div class="divider"></div>
@@ -81,7 +81,7 @@
8181
</span>
8282
<div class="menu">
8383
<div class="ui icon search input">
84-
<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
84+
<i class="icon">{{svg "octicon-search" 16}}</i>
8585
<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_project"}}">
8686
</div>
8787
<a class="{{if not .ProjectID}}active selected {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_project_all"}}</a>
@@ -123,7 +123,7 @@
123123
</span>
124124
<div class="menu">
125125
<div class="ui icon search input">
126-
<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
126+
<i class="icon">{{svg "octicon-search" 16}}</i>
127127
<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_poster"}}">
128128
</div>
129129
<a class="item" data-value="0">{{.locale.Tr "repo.issues.filter_poster_no_select"}}</a>
@@ -138,7 +138,7 @@
138138
</span>
139139
<div class="menu">
140140
<div class="ui icon search input">
141-
<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
141+
<i class="icon">{{svg "octicon-search" 16}}</i>
142142
<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_assignee"}}">
143143
</div>
144144
<a class="{{if not .AssigneeID}}active selected {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_assginee_no_select"}}</a>

‎templates/repo/issue/labels/labels_selector_field.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<div class="filter menu" {{if .Issue}}data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/labels"{{else}}data-id="#label_ids"{{end}}>
99
{{if or .Labels .OrgLabels}}
1010
<div class="ui icon search input">
11-
<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
11+
<i class="icon">{{svg "octicon-search" 16}}</i>
1212
<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_labels"}}">
1313
</div>
1414
{{end}}

‎templates/repo/issue/milestone/select_menu.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{if or .OpenMilestones .ClosedMilestones}}
22
<div class="ui icon search input">
3-
<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
3+
<i class="icon">{{svg "octicon-search" 16}}</i>
44
<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_milestones"}}">
55
</div>
66
<div class="divider"></div>

‎templates/repo/issue/new_form.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<div class="menu">
9696
{{if or .OpenProjects .ClosedProjects}}
9797
<div class="ui icon search input">
98-
<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
98+
<i class="icon">{{svg "octicon-search" 16}}</i>
9999
<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_projects"}}">
100100
</div>
101101
{{end}}
@@ -152,7 +152,7 @@
152152
</span>
153153
<div class="filter menu" data-id="#assignee_ids">
154154
<div class="ui icon search input">
155-
<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
155+
<i class="icon">{{svg "octicon-search" 16}}</i>
156156
<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_assignees"}}">
157157
</div>
158158
<div class="no-select item">{{.locale.Tr "repo.issues.new.clear_assignees"}}</div>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="divider"></div>
22
<div class="instruct-toggle"> {{$.locale.Tr "repo.pulls.merge_instruction_hint" | Safe}} </div>
33
<div class="instruct-content gt-mt-3 gt-hidden">
4-
<div><h3 class="gt-di">{{$.locale.Tr "step1"}} </h3>{{$.locale.Tr "repo.pulls.merge_instruction_step1_desc"}}</div>
4+
<div><h3 class="gt-dib">{{$.locale.Tr "step1"}}</h3> {{$.locale.Tr "repo.pulls.merge_instruction_step1_desc"}}</div>
55
<div class="ui secondary segment">
66
{{if eq $.Issue.PullRequest.Flow 0}}
77
<div>git checkout -b {{if ne $.Issue.PullRequest.HeadRepo.ID $.Issue.PullRequest.BaseRepo.ID}}{{$.Issue.PullRequest.HeadRepo.OwnerName}}-{{end}}{{$.Issue.PullRequest.HeadBranch}} {{$.Issue.PullRequest.BaseBranch}}</div>
@@ -10,7 +10,7 @@
1010
<div>git fetch origin {{$.Issue.PullRequest.GetGitRefName}}:{{$.Issue.PullRequest.HeadBranch}}</div>
1111
{{end}}
1212
</div>
13-
<div><h3 class="gt-di">{{$.locale.Tr "step2"}} </h3>{{$.locale.Tr "repo.pulls.merge_instruction_step2_desc"}}</div>
13+
<div><h3 class="gt-dib">{{$.locale.Tr "step2"}}</h3> {{$.locale.Tr "repo.pulls.merge_instruction_step2_desc"}}</div>
1414
<div class="ui secondary segment">
1515
<div>git checkout {{$.Issue.PullRequest.BaseBranch}}</div>
1616
<div>git merge --no-ff {{if ne $.Issue.PullRequest.HeadRepo.ID $.Issue.PullRequest.BaseRepo.ID}}{{$.Issue.PullRequest.HeadRepo.OwnerName}}-{{end}}{{$.Issue.PullRequest.HeadBranch}}</div>

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/request_review">
1313
{{if .Reviewers}}
1414
<div class="ui icon search input">
15-
<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
15+
<i class="icon">{{svg "octicon-search" 16}}</i>
1616
<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_reviewers"}}">
1717
</div>
1818
{{end}}
@@ -162,7 +162,7 @@
162162
<div class="menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/projects">
163163
{{if or .OpenProjects .ClosedProjects}}
164164
<div class="ui icon search input">
165-
<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
165+
<i class="icon">{{svg "octicon-search" 16}}</i>
166166
<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_projects"}}">
167167
</div>
168168
{{end}}
@@ -215,7 +215,7 @@
215215
</a>
216216
<div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/assignee">
217217
<div class="ui icon search input">
218-
<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
218+
<i class="icon">{{svg "octicon-search" 16}}</i>
219219
<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_assignees"}}">
220220
</div>
221221
<div class="no-select item">{{.locale.Tr "repo.issues.new.clear_assignees"}}</div>

‎templates/repo/release/list.tmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
{{range $idx, $release := .Releases}}
99
<li class="ui grid">
1010
<div class="ui four wide column meta">
11-
<a class="gt-db muted" href="{{if not .Sha1}}#{{else}}{{$.RepoLink}}/src/tag/{{.TagName | PathEscapeSegments}}{{end}}" rel="nofollow">{{svg "octicon-tag" 16 "gt-mr-2"}}{{.TagName}}</a>
11+
<a class="muted" href="{{if not .Sha1}}#{{else}}{{$.RepoLink}}/src/tag/{{.TagName | PathEscapeSegments}}{{end}}" rel="nofollow">{{svg "octicon-tag" 16 "gt-mr-2"}}{{.TagName}}</a>
1212
{{if .Sha1}}
13-
<a class="gt-mono muted gt-db gt-mt-4 gt-pt-1" href="{{$.RepoLink}}/src/commit/{{.Sha1}}" rel="nofollow">{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .Sha1}}</a>
14-
{{template "repo/branch_dropdown" dict "root" $ "release" . "ContainerClasses" "gt-mt-4"}}
13+
<a class="muted gt-mono" href="{{$.RepoLink}}/src/commit/{{.Sha1}}" rel="nofollow">{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .Sha1}}</a>
14+
{{template "repo/branch_dropdown" dict "root" $ "release" .}}
1515
{{end}}
1616
</div>
1717
<div class="ui twelve wide column detail">

‎templates/repo/settings/options.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<tbody>
117117
<tr>
118118
<td colspan="4">
119-
<span class="text red gt-db gt-py-4 gt-border-secondary-bottom">{{$.locale.Tr "repo.settings.mirror_settings.direction.pull"}}: {{$.locale.Tr "error.occurred"}}</span>
119+
<div class="text red gt-py-4 gt-border-secondary-bottom">{{$.locale.Tr "repo.settings.mirror_settings.direction.pull"}}: {{$.locale.Tr "error.occurred"}}</div>
120120
</td>
121121
</tr>
122122
</tbody>

‎templates/user/settings/applications.tmpl

+4-4
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@
8686
></scoped-access-token-selector>
8787
</div>
8888
</details>
89-
<div id="scoped-access-warning" class="ui warning message center gt-db gt-hidden">
90-
{{.locale.Tr "settings.at_least_one_permission"}}
91-
</div>
9289
<button id="scoped-access-submit" class="ui green button">
9390
{{.locale.Tr "settings.generate_token"}}
9491
</button>
95-
</form>
92+
</form>{{/* Fomantic ".ui.form .warning.message" is hidden by default, so put the warning message out of the form*/}}
93+
<div id="scoped-access-warning" class="ui warning message center gt-hidden">
94+
{{.locale.Tr "settings.at_least_one_permission"}}
95+
</div>
9696
</div>
9797

9898
{{if .EnableOAuth2}}

‎web_src/css/helpers.css

-4
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22
Gitea's tailwind-style CSS helper classes have `gt-` prefix.
33
Gitea's private styles use `g-` prefix.
44
*/
5-
.gt-db { display: block !important; }
65
.gt-df { display: flex !important; }
7-
.gt-di { display: inline !important; }
8-
.gt-dif { display: inline-flex !important; }
96
.gt-dib { display: inline-block !important; }
107
.gt-ac { align-items: center !important; }
118
.gt-jc { justify-content: center !important; }
12-
.gt-js { justify-content: flex-start !important; }
139
.gt-je { justify-content: flex-end !important; }
1410
.gt-sb { justify-content: space-between !important; }
1511
.gt-fc { flex-direction: column !important; }

‎web_src/css/repo/release-tag.css

+4-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,11 @@
2323

2424
.repository.releases #release-list > li .meta {
2525
margin-top: 4px;
26-
text-align: right;
2726
position: relative;
27+
text-align: right;
28+
display: flex;
29+
flex-direction: column;
30+
gap: 1em;
2831
}
2932

3033
.repository.releases #release-list > li .detail {

‎web_src/js/components/DashboardRepoList.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<div class="ui attached segment repos-search">
1818
<div class="ui fluid right action left icon input" :class="{loading: isLoading}">
1919
<input type="search" spellcheck="false" maxlength="255" @input="changeReposFilter(reposFilter)" v-model="searchQuery" ref="search" @keydown="reposFilterKeyControl" :placeholder="textSearchRepos">
20-
<i class="icon gt-df gt-ac gt-jc"><svg-icon name="octicon-search" :size="16"/></i>
20+
<i class="icon"><svg-icon name="octicon-search" :size="16"/></i>
2121
<div class="ui dropdown icon button" :title="textFilter">
2222
<svg-icon name="octicon-filter" :size="16"/>
2323
<div class="menu">

0 commit comments

Comments
 (0)