Skip to content

Commit 1bd2772

Browse files
authored
Replace remaining fontawesome dropdown icons with SVG (#24455)
- Replace leftover dropdown triangles with SVG - Replace remove icon with SVG and add styling for it: <img width="817" alt="Screenshot 2023-05-01 at 00 40 05" src="https://user-images.githubusercontent.com/115237/235379271-4674d4f7-b11e-4d6d-90f9-1478325443ca.png"> <img width="816" alt="Screenshot 2023-05-01 at 00 46 56" src="https://user-images.githubusercontent.com/115237/235379451-b515afb3-9773-4f6f-a259-e7048235bcba.png">
1 parent 00d998a commit 1bd2772

File tree

5 files changed

+21
-7
lines changed

5 files changed

+21
-7
lines changed

templates/package/settings.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{{$repoID = .PackageDescriptor.Repository.ID}}
2121
{{end}}
2222
<input type="hidden" name="repo_id" value="{{$repoID}}">
23-
<i class="dropdown icon"></i>
23+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
2424
<div class="default text">{{.locale.Tr "packages.settings.link.select"}}</div>
2525
<div class="menu">
2626
{{range .Repos}}

templates/repo/graph.tmpl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<div class="ui icon buttons tiny color-buttons">
99
<div class="ui multiple selection search dropdown" id="flow-select-refs-dropdown">
1010
<input type="hidden" name="flow">
11-
<i class="dropdown icon"></i>
1211
<div class="default text">{{.locale.Tr "repo.commit_graph.select"}}</div>
1312
<div class="menu">
1413
<div class="item" data-value="...flow-hide-pr-refs">

templates/repo/issue/fields/dropdown.tmpl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
{{/* FIXME: required validation */}}
44
<div class="ui fluid selection dropdown {{if .item.Attributes.multiple}}multiple clearable{{end}}">
55
<input type="hidden" name="form-field-{{.item.ID}}" value="0">
6-
<i class="dropdown icon"></i>
6+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
7+
{{svg "octicon-x" 14 "remove icon"}}
78
<div class="default text"></div>
89
<div class="menu">
910
{{range $i, $opt := .item.Attributes.options}}

web_src/css/base.css

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2051,6 +2051,13 @@ a.ui.label:hover {
20512051
color: var(--color-text);
20522052
}
20532053

2054+
.ui.labels a.active.label:hover,
2055+
a.ui.active.label:hover {
2056+
background: var(--color-active);
2057+
border-color: var(--color-active);
2058+
color: var(--color-text);
2059+
}
2060+
20542061
.ui.label > .detail .icons {
20552062
margin-right: 0.25em;
20562063
}
@@ -2603,6 +2610,7 @@ table th[data-sortt-desc] .svg {
26032610
}
26042611

26052612
.ui.dropdown .svg.dropdown.icon,
2613+
.ui.dropdown .svg.remove.icon,
26062614
.svg.dropdown.icon {
26072615
margin-top: 0 !important; /* reset the "ui.selection.dropdown > .dropdown.icon {margin-top}", for the Issue Dependencies dropdown */
26082616
margin-right: -0.5rem !important; /* fix up SVG dropdown triangles because Fomantic thinks they are icon fonts */
@@ -2615,6 +2623,16 @@ table th[data-sortt-desc] .svg {
26152623
top: 0 !important; /* reset the ".ui.selection.dropdown > .xxx.icon {top}" if the icon is svg instead of the fomantic icon */
26162624
}
26172625

2626+
.ui.selection.dropdown > .svg.remove.icon {
2627+
top: .5px;
2628+
right: 32px;
2629+
width: auto;
2630+
}
2631+
2632+
.ui.selection.dropdown > .svg.remove.icon:hover {
2633+
opacity: 1;
2634+
}
2635+
26182636
.ui.dropdown.no-text > .dropdown.icon {
26192637
margin-left: 0 !important;
26202638
margin-right: 0 !important;

web_src/css/features/gitgraph.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@
4646
white-space: nowrap;
4747
}
4848

49-
#git-graph-container #flow-select-refs-dropdown .dropdown.icon {
50-
display: none;
51-
}
52-
5349
#git-graph-container #flow-select-refs-dropdown .default.text {
5450
padding-top: 4px;
5551
padding-bottom: 4px;

0 commit comments

Comments
 (0)