Skip to content

Commit 8bae34c

Browse files
silverwindsilverwind
authored
Change search and filter icons to SVG (#13473)
Unfortunately, the Fomantic CSS relies on i.icon instead of .icon so a wrapper is necessary for these with an accompanying class to center the icon.
1 parent ef2ffc6 commit 8bae34c

File tree

11 files changed

+25
-25
lines changed

11 files changed

+25
-25
lines changed

‎templates/base/head_navbar.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<div class="item">
3838
<div class="ui icon input">
3939
<input class="searchbox" type="text" placeholder="{{.i18n.Tr "search_project"}}">
40-
<i class="search icon"></i>
40+
<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
4141
</div>
4242
</div>
4343
*/}}

‎templates/repo/branch_dropdown.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</div>
1919
<div class="menu transition" :class="{visible: menuVisible}" v-if="menuVisible" v-cloak>
2020
<div class="ui icon search input">
21-
<i class="filter icon"></i>
21+
<i class="icon df ac jc m-0">{{svg "octicon-filter" 16}}</i>
2222
<input name="search" ref="searchField" v-model="searchTerm" @keydown="keydown($event)" placeholder="{{.i18n.Tr "repo.filter_branch_and_tag"}}...">
2323
</div>
2424
<div class="header branch-tag-choice">

‎templates/repo/diff/compare.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</div>
2222
<div class="menu">
2323
<div class="ui icon search input">
24-
<i class="filter icon"></i>
24+
<i class="icon df ac jc m-0">{{svg "octicon-filter" 16}}</i>
2525
<input name="search" placeholder="{{.i18n.Tr "repo.pulls.filter_branch"}}...">
2626
</div>
2727
<div class="scrolling menu">
@@ -54,7 +54,7 @@
5454
</div>
5555
<div class="menu">
5656
<div class="ui icon search input">
57-
<i class="filter icon"></i>
57+
<i class="icon df ac jc m-0">{{svg "octicon-filter" 16}}</i>
5858
<input name="search" placeholder="{{.i18n.Tr "repo.pulls.filter_branch"}}...">
5959
</div>
6060
<div class="scrolling menu">

‎templates/repo/issue/branch_selector_field.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</div>
1313
<div class="menu">
1414
<div class="ui icon search input">
15-
<i class="filter icon"></i>
15+
<i class="icon df ac jc m-0">{{svg "octicon-filter" 16}}</i>
1616
<input name="search" placeholder="{{.i18n.Tr "repo.filter_branch_and_tag"}}...">
1717
</div>
1818
<div class="header">

‎templates/repo/issue/new_form.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<div class="header" style="text-transform: none;font-size:16px;">{{.i18n.Tr "repo.issues.new.add_labels_title"}}</div>
5050
{{if or .Labels .OrgLabels}}
5151
<div class="ui icon search input">
52-
<i class="search icon"></i>
52+
<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
5353
<input type="text" placeholder="{{.i18n.Tr "repo.issues.filter_labels"}}">
5454
</div>
5555
{{end}}
@@ -94,7 +94,7 @@
9494
<div class="header" style="text-transform: none;font-size:16px;">{{.i18n.Tr "repo.issues.new.add_milestone_title"}}</div>
9595
{{if or .OpenMilestones .ClosedMilestones}}
9696
<div class="ui icon search input">
97-
<i class="search icon"></i>
97+
<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
9898
<input type="text" placeholder="{{.i18n.Tr "repo.issues.filter_milestones"}}">
9999
</div>
100100
{{end}}
@@ -151,7 +151,7 @@
151151
<div class="header" style="text-transform: none;font-size:16px;">{{.i18n.Tr "repo.issues.new.add_project_title"}}</div>
152152
{{if or .OpenProjects .ClosedProjects}}
153153
<div class="ui icon search input">
154-
<i class="search icon"></i>
154+
<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
155155
<input type="text" placeholder="{{.i18n.Tr "repo.issues.filter_projects"}}">
156156
</div>
157157
{{end}}
@@ -207,7 +207,7 @@
207207
<div class="filter menu" data-id="#assignee_ids">
208208
<div class="header" style="text-transform: none;font-size:16px;">{{.i18n.Tr "repo.issues.new.add_assignees_title"}}</div>
209209
<div class="ui icon search input">
210-
<i class="search icon"></i>
210+
<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
211211
<input type="text" placeholder="{{.i18n.Tr "repo.issues.filter_assignees"}}">
212212
</div>
213213
<div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_assignees"}}</div>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<div class="header" style="text-transform: none;font-size:16px;">{{.i18n.Tr "repo.issues.new.add_reviewer_title"}}</div>
1717
{{if .Reviewers}}
1818
<div class="ui icon search input">
19-
<i class="search icon"></i>
19+
<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
2020
<input type="text" placeholder="{{.i18n.Tr "repo.issues.filter_reviewers"}}">
2121
</div>
2222
{{end}}
@@ -101,7 +101,7 @@
101101
<div class="header" style="text-transform: none;font-size:16px;">{{.i18n.Tr "repo.issues.new.add_labels_title"}}</div>
102102
{{if or .Labels .OrgLabels}}
103103
<div class="ui icon search input">
104-
<i class="search icon"></i>
104+
<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
105105
<input type="text" placeholder="{{.i18n.Tr "repo.issues.filter_labels"}}">
106106
</div>
107107
{{end}}
@@ -149,7 +149,7 @@
149149
<div class="header" style="text-transform: none;font-size:16px;">{{.i18n.Tr "repo.issues.new.add_milestone_title"}}</div>
150150
{{if or .OpenMilestones .ClosedMilestones}}
151151
<div class="ui icon search input">
152-
<i class="search icon"></i>
152+
<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
153153
<input type="text" placeholder="{{.i18n.Tr "repo.issues.filter_milestones"}}">
154154
</div>
155155
{{end}}
@@ -246,7 +246,7 @@
246246
<div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/assignee">
247247
<div class="header" style="text-transform: none;font-size:16px;">{{.i18n.Tr "repo.issues.new.add_assignees_title"}}</div>
248248
<div class="ui icon search input">
249-
<i class="search icon"></i>
249+
<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
250250
<input type="text" placeholder="{{.i18n.Tr "repo.issues.filter_assignees"}}">
251251
</div>
252252
<div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_assignees"}}</div>

‎templates/repo/issue/view_title.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
</div>
6262
<div class="menu">
6363
<div class="ui icon search input">
64-
<i class="filter icon"></i>
64+
<i class="icon df ac jc m-0">{{svg "octicon-filter" 16}}</i>
6565
<input name="search" placeholder="{{.i18n.Tr "repo.pulls.filter_branch"}}...">
6666
</div>
6767
<div class="scrolling menu" id="branch-select">

‎templates/repo/search.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="ui fluid action input">
88
<input name="q" value="{{.Keyword}}" placeholder="{{.i18n.Tr "repo.search.search_repo"}}">
99
<button class="ui button" type="submit">
10-
<i class="search icon"></i>
10+
<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
1111
</button>
1212
</div>
1313
</form>

‎templates/repo/wiki/view.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</div>
1717
<div class="menu">
1818
<div class="ui icon search input">
19-
<i class="filter icon"></i>
19+
<i class="icon df ac jc m-0">{{svg "octicon-filter" 16}}</i>
2020
<input name="search" placeholder="{{.i18n.Tr "repo.wiki.filter_page"}}...">
2121
</div>
2222
<div class="scrolling menu">

‎templates/user/dashboard/repolist.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
<div class="ui attached secondary segment repos-search">
3030
<div class="ui fluid right action left icon input" :class="{loading: isLoading}">
3131
<input @input="searchRepos(reposFilter)" v-model="searchQuery" ref="search" placeholder="{{.i18n.Tr "home.search_repos"}}">
32-
<i class="search icon"></i>
33-
<div class="ui dropdown button" title="{{.i18n.Tr "home.filter"}}">
34-
<i class="icon filter"></i>
32+
<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
33+
<div class="ui dropdown icon button" title="{{.i18n.Tr "home.filter"}}">
34+
<i class="icon df ac jc m-0">{{svg "octicon-filter" 16}}</i>
3535
<div class="menu">
3636
<div class="item">
3737
<a @click="toggleArchivedFilter()">

‎web_src/less/helpers.less

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
.df { display: flex; }
2-
.ac { align-items: center; }
3-
.jc { justify-content: center; }
4-
.js { justify-content: flex-start; }
5-
.je { justify-content: flex-end; }
6-
.sb { justify-content: space-between; }
1+
.df { display: flex !important; }
2+
.ac { align-items: center !important; }
3+
.jc { justify-content: center !important; }
4+
.js { justify-content: flex-start !important; }
5+
.je { justify-content: flex-end !important; }
6+
.sb { justify-content: space-between !important; }
77
.mono { font-family: var(--fonts-monospace); font-size: .9em; /* compensate for monospace fonts being usually slighty larger */ }
88
.rounded { border-radius: var(--border-radius) !important; }
99
.word-break { word-wrap: break-word; word-break: break-all; }

0 commit comments

Comments
 (0)