Skip to content

Commit 2e49a4d

Browse files
GiteaBotwxiaoguang
GiteaBot
and
wxiaoguang
authored
Fix dropdown icon position (#27175) (#27177)
Backport #27175 by @wxiaoguang According to https://fomantic-ui.com/modules/dropdown.html and our "devtest" page, many dropdown elements has incorrect "icon" position. This PR fixes all of them. Fix #27173 Co-authored-by: wxiaoguang <[email protected]>
1 parent 8d9e2d0 commit 2e49a4d

File tree

16 files changed

+33
-35
lines changed

16 files changed

+33
-35
lines changed

‎templates/admin/base/search.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<div class="ui dropdown type jump item gt-mr-0">
1010
<span class="text">
1111
{{.locale.Tr "repo.issues.filter_sort"}}
12-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
1312
</span>
13+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
1414
<div class="menu">
1515
<a class="{{if or (eq .SortType "oldest") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=oldest&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</a>
1616
<a class="{{if eq .SortType "newest"}}active {{end}}item" href="{{$.Link}}?sort=newest&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.latest"}}</a>

‎templates/admin/emails/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<div class="ui dropdown type jump item gt-mr-0">
1616
<span class="text">
1717
{{.locale.Tr "repo.issues.filter_sort"}}
18-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
1918
</span>
19+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
2020
<div class="menu">
2121
<a class="{{if or (eq .SortType "email") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=email&q={{$.Keyword}}">{{.locale.Tr "admin.emails.filter_sort.email"}}</a>
2222
<a class="{{if eq .SortType "reverseemail"}}active {{end}}item" href="{{$.Link}}?sort=reverseemail&q={{$.Keyword}}">{{.locale.Tr "admin.emails.filter_sort.email_reverse"}}</a>

‎templates/admin/repo/search.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<div class="ui dropdown type jump item gt-mr-0">
1010
<span class="text">
1111
{{.locale.Tr "repo.issues.filter_sort"}}
12-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
1312
</span>
13+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
1414
<div class="menu">
1515
<a class="{{if or (eq .SortType "oldest") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=oldest&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</a>
1616
<a class="{{if eq .SortType "newest"}}active {{end}}item" href="{{$.Link}}?sort=newest&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.latest"}}</a>

‎templates/admin/user/list.tmpl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
<div class="ui right floated secondary filter menu">
1414
<!-- Status Filter Menu Item -->
1515
<div class="ui dropdown type jump item">
16-
<span class="text">{{.locale.Tr "admin.users.list_status_filter.menu_text"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}</span>
16+
<span class="text">{{.locale.Tr "admin.users.list_status_filter.menu_text"}}</span>
17+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
1718
<div class="menu">
1819
<a class="item j-reset-status-filter">{{.locale.Tr "admin.users.list_status_filter.reset"}}</a>
1920
<div class="divider"></div>
@@ -37,8 +38,9 @@
3738
<!-- Sort Menu Item -->
3839
<div class="ui dropdown type jump item">
3940
<span class="text">
40-
{{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
41+
{{.locale.Tr "repo.issues.filter_sort"}}
4142
</span>
43+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
4244
<div class="menu">
4345
<button class="item" name="sort" value="oldest">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</button>
4446
<button class="item" name="sort" value="newest">{{.locale.Tr "repo.issues.filter_sort.latest"}}</button>

‎templates/explore/repo_search.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<div class="ui dropdown type jump item gt-mr-0">
1717
<span class="text">
1818
{{.locale.Tr "repo.issues.filter_sort"}}
19-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
2019
</span>
20+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
2121
<div class="menu">
2222
<a class="{{if eq .SortType "newest"}}active {{end}}item" href="{{$.Link}}?tab={{$.TabName}}&sort=newest&q={{$.Keyword}}&language={{$.Language}}">{{.locale.Tr "repo.issues.filter_sort.latest"}}</a>
2323
<a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$.Link}}?tab={{$.TabName}}&sort=oldest&q={{$.Keyword}}&language={{$.Language}}">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</a>

‎templates/explore/search.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<div class="ui dropdown type jump item gt-mr-0">
1010
<span class="text">
1111
{{.locale.Tr "repo.issues.filter_sort"}}
12-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
1312
</span>
13+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
1414
<div class="menu">
1515
<a class="{{if eq .SortType "newest"}}active {{end}}item" href="{{$.Link}}?sort=newest&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.latest"}}</a>
1616
<a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$.Link}}?sort=oldest&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</a>

‎templates/projects/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<div class="list-header-sort ui small dropdown type jump item">
3434
<span class="text">
3535
{{.locale.Tr "repo.issues.filter_sort"}}
36-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
3736
</span>
37+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
3838
<div class="menu">
3939
<a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&sort=oldest&state={{$.State}}">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</a>
4040
<a class="{{if eq .SortType "recentupdate"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&sort=recentupdate&state={{$.State}}">{{.locale.Tr "repo.issues.filter_sort.recentupdate"}}</a>

‎templates/repo/activity.tmpl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
<!-- Period -->
88
<div class="ui floating dropdown jump filter">
99
<div class="ui basic compact button">
10-
<span class="text">
11-
{{.locale.Tr "repo.activity.period.filter_label"}} <strong>{{.PeriodText}}</strong>
12-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
13-
</span>
10+
{{.locale.Tr "repo.activity.period.filter_label"}} <strong>{{.PeriodText}}</strong>
11+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
1412
</div>
1513
<div class="menu">
1614
<a class="{{if eq .Period "daily"}}active {{end}}item" href="{{$.RepoLink}}/activity/daily">{{.locale.Tr "repo.activity.period.daily"}}</a>

‎templates/repo/commits.tmpl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
<div class="gt-df gt-ac">
88
{{template "repo/branch_dropdown" dict "root" . "ContainerClasses" "gt-mr-2"}}
99
<a href="{{.RepoLink}}/graph" class="ui basic small compact button">
10-
<span class="text">
11-
{{svg "octicon-git-branch"}}
12-
</span>
10+
{{svg "octicon-git-branch"}}
1311
{{.locale.Tr "repo.commit_graph"}}
1412
</a>
1513
</div>

‎templates/repo/issue/filters.tmpl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<div class="ui {{if not .Labels}}disabled{{end}} dropdown jump item label-filter">
1212
<span class="text">
1313
{{.locale.Tr "repo.issues.filter_label"}}
14-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
1514
</span>
15+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
1616
<div class="menu">
1717
<div class="ui icon search input">
1818
<i class="icon">{{svg "octicon-search" 16}}</i>
@@ -42,8 +42,8 @@
4242
<div class="ui {{if not (or .OpenMilestones .ClosedMilestones)}}disabled{{end}} dropdown jump item">
4343
<span class="text">
4444
{{.locale.Tr "repo.issues.filter_milestone"}}
45-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
4645
</span>
46+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
4747
<div class="menu">
4848
<div class="ui icon search input">
4949
<i class="icon">{{svg "octicon-search" 16}}</i>
@@ -80,8 +80,8 @@
8080
<div class="ui{{if not (or .OpenProjects .ClosedProjects)}} disabled{{end}} dropdown jump item">
8181
<span class="text">
8282
{{.locale.Tr "repo.issues.filter_project"}}
83-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
8483
</span>
84+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
8585
<div class="menu">
8686
<div class="ui icon search input">
8787
<i class="icon">{{svg "octicon-search" 16}}</i>
@@ -122,8 +122,8 @@
122122
>
123123
<span class="text">
124124
{{.locale.Tr "repo.issues.filter_poster"}}
125-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
126125
</span>
126+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
127127
<div class="menu">
128128
<div class="ui icon search input">
129129
<i class="icon">{{svg "octicon-search" 16}}</i>
@@ -137,8 +137,8 @@
137137
<div class="ui {{if not .Assignees}}disabled{{end}} dropdown jump item">
138138
<span class="text">
139139
{{.locale.Tr "repo.issues.filter_assignee"}}
140-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
141140
</span>
141+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
142142
<div class="menu">
143143
<div class="ui icon search input">
144144
<i class="icon">{{svg "octicon-search" 16}}</i>
@@ -160,8 +160,8 @@
160160
<div class="ui dropdown type jump item">
161161
<span class="text">
162162
{{.locale.Tr "repo.issues.filter_type"}}
163-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
164163
</span>
164+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
165165
<div class="menu">
166166
<a class="{{if eq .ViewType "all"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type=all&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_type.all_issues"}}</a>
167167
<a class="{{if eq .ViewType "assigned"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type=assigned&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_type.assigned_to_you"}}</a>
@@ -179,8 +179,8 @@
179179
<div class="list-header-sort ui small dropdown downward type jump item">
180180
<span class="text">
181181
{{.locale.Tr "repo.issues.filter_sort"}}
182-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
183182
</span>
183+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
184184
<div class="menu">
185185
<a class="{{if or (eq .SortType "latest") (not .SortType)}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort=latest&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_sort.latest"}}</a>
186186
<a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort=oldest&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</a>

0 commit comments

Comments
 (0)