Skip to content

Commit 1f026bc

Browse files
wxiaoguangwxiaoguang
authored
Fix dropdown icon position (#27175)
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
1 parent c2cabe7 commit 1f026bc

File tree

16 files changed

+33
-35
lines changed

16 files changed

+33
-35
lines changed

‎templates/admin/base/search.tmpl

+1-1
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

+1-1
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

+1-1
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

+4-2
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

+1-1
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

+1-1
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

+1-1
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

+2-4
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

+1-3
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

+7-7
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>

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<h4 class="ui top attached header">
22
{{.locale.Tr "repo.issues.label_count" .NumLabels}}
33
<div class="ui right">
4-
<div class="ui right floated secondary filter menu">
4+
<div class="ui secondary menu">
55
<!-- Sort -->
6-
<div class="ui dropdown type jump item">
6+
<div class="item ui jump dropdown gt-py-3">
77
<span class="text">
88
{{.locale.Tr "repo.issues.filter_sort"}}
9-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
109
</span>
11-
<div class="menu">
10+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
11+
<div class="left menu">
1212
<a class="{{if or (eq .SortType "alphabetically") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=alphabetically&state={{$.State}}">{{.locale.Tr "repo.issues.label.filter_sort.alphabetically"}}</a>
1313
<a class="{{if eq .SortType "reversealphabetically"}}active {{end}}item" href="{{$.Link}}?sort=reversealphabetically&state={{$.State}}">{{.locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}</a>
1414
<a class="{{if eq .SortType "leastissues"}}active {{end}}item" href="{{$.Link}}?sort=leastissues&state={{$.State}}">{{.locale.Tr "repo.milestones.filter_sort.least_issues"}}</a>

‎templates/repo/issue/list.tmpl

+4-4
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
<div class="ui {{if not .Labels}}disabled{{end}} dropdown jump item">
5555
<span class="text">
5656
{{.locale.Tr "repo.issues.action_label"}}
57-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
5857
</span>
58+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
5959
<div class="menu">
6060
<div class="item issue-action" data-action="clear" data-url="{{$.RepoLink}}/issues/labels">
6161
{{.locale.Tr "repo.issues.new.clear_labels"}}
@@ -78,8 +78,8 @@
7878
<div class="ui {{if not (or .OpenMilestones .ClosedMilestones)}}disabled{{end}} dropdown jump item">
7979
<span class="text">
8080
{{.locale.Tr "repo.issues.action_milestone"}}
81-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
8281
</span>
82+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
8383
<div class="menu">
8484
<div class="item issue-action" data-element-id="0" data-url="{{$.Link}}/milestone">
8585
{{.locale.Tr "repo.issues.action_milestone_no_select"}}
@@ -109,8 +109,8 @@
109109
<div class="ui{{if not (or .OpenProjects .ClosedProjects)}} disabled{{end}} dropdown jump item">
110110
<span class="text">
111111
{{.locale.Tr "repo.project_board"}}
112-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
113112
</span>
113+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
114114
<div class="menu">
115115
<div class="item issue-action" data-element-id="0" data-url="{{$.Link}}/projects">
116116
{{.locale.Tr "repo.issues.new.clear_projects"}}
@@ -144,8 +144,8 @@
144144
<div class="ui {{if not .Assignees}}disabled{{end}} dropdown jump item">
145145
<span class="text">
146146
{{.locale.Tr "repo.issues.action_assignee"}}
147-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
148147
</span>
148+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
149149
<div class="menu">
150150
<div class="item issue-action" data-action="clear" data-url="{{$.Link}}/assignee">
151151
{{.locale.Tr "repo.issues.new.clear_assignees"}}

‎templates/repo/issue/milestones.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
<div class="list-header-sort ui small dropdown type jump item">
3838
<span class="text">
3939
{{.locale.Tr "repo.issues.filter_sort"}}
40-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
4140
</span>
41+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
4242
<div class="menu">
4343
<a class="{{if or (eq .SortType "closestduedate") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=closestduedate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.earliest_due_data"}}</a>
4444
<a class="{{if eq .SortType "furthestduedate"}}active {{end}}item" href="{{$.Link}}?sort=furthestduedate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.latest_due_date"}}</a>

‎templates/user/dashboard/milestones.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
<div class="list-header-sort ui dropdown type jump item">
6060
<span class="text">
6161
{{.locale.Tr "repo.issues.filter_sort"}}
62-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
6362
</span>
63+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
6464
<div class="menu">
6565
<a class="{{if or (eq .SortType "closestduedate") (not .SortType)}}active {{end}}item" href="{{$.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=closestduedate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.closest_due_date"}}</a>
6666
<a class="{{if eq .SortType "furthestduedate"}}active {{end}}item" href="{{$.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=furthestduedate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.furthest_due_date"}}</a>

‎templates/user/dashboard/navbar.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
{{else}}
5454
{{.locale.Tr "org.teams"}}
5555
{{end}}
56-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
5756
</span>
57+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
5858
<div class="context user overflow menu">
5959
<div class="ui header">
6060
{{.locale.Tr "home.filter_by_team_repositories"}}

‎templates/user/notification/notification_subscriptions.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<div class="ui dropdown type jump item">
3434
<span class="text">
3535
{{.locale.Tr "repo.issues.filter_type"}}
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 or (eq .IssueType "all") (not .IssueType)}}active {{end}}item" href="{{$.Link}}?sort={{$.SortType}}&state={{$.State}}&issueType=all&labels={{$.Labels}}">{{.locale.Tr "all"}}</a>
4040
<a class="{{if eq .IssueType "issues"}}active {{end}}item" href="{{$.Link}}?sort={{$.SortType}}&state={{$.State}}&issueType=issues&labels={{$.Labels}}">{{.locale.Tr "issues"}}</a>
@@ -46,8 +46,8 @@
4646
<div class="ui dropdown type jump item">
4747
<span class="text">
4848
{{.locale.Tr "repo.issues.filter_sort"}}
49-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
5049
</span>
50+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
5151
<div class="menu">
5252
<a class="{{if or (eq .SortType "latest") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=latest&state={{$.State}}&issueType={{$.IssueType}}&labels={{$.Labels}}">{{.locale.Tr "repo.issues.filter_sort.latest"}}</a>
5353
<a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$.Link}}?sort=oldest&state={{$.State}}&issueType={{$.IssueType}}&labels={{$.Labels}}">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</a>

0 commit comments

Comments
 (0)