Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace remaining fontawesome dropdown icons with SVG #24455

Merged
merged 3 commits into from
May 1, 2023
Merged

Replace remaining fontawesome dropdown icons with SVG #24455

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e39585
Replace remaining fontawesome dropdown icons with SVG
silverwind Apr 30, 2023
8cd41bc
add active label css
silverwind Apr 30, 2023
5527ec6
Merge branch 'main' into dropdown-svg
silverwind May 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/package/settings.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
{{$repoID = .PackageDescriptor.Repository.ID}}
{{end}}
<input type="hidden" name="repo_id" value="{{$repoID}}">
<i class="dropdown icon"></i>
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
<div class="default text">{{.locale.Tr "packages.settings.link.select"}}</div>
<div class="menu">
{{range .Repos}}
Expand Down
1 change: 0 additions & 1 deletion templates/repo/graph.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<div class="ui icon buttons tiny color-buttons">
<div class="ui multiple selection search dropdown" id="flow-select-refs-dropdown">
<input type="hidden" name="flow">
<i class="dropdown icon"></i>
silverwind marked this conversation as resolved.
Show resolved Hide resolved
<div class="default text">{{.locale.Tr "repo.commit_graph.select"}}</div>
<div class="menu">
<div class="item" data-value="...flow-hide-pr-refs">
Expand Down
3 changes: 2 additions & 1 deletion templates/repo/issue/fields/dropdown.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
{{/* FIXME: required validation */}}
<div class="ui fluid selection dropdown {{if .item.Attributes.multiple}}multiple clearable{{end}}">
<input type="hidden" name="form-field-{{.item.ID}}" value="0">
<i class="dropdown icon"></i>
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{svg "octicon-x" 14 "remove icon"}}
silverwind marked this conversation as resolved.
Show resolved Hide resolved
<div class="default text"></div>
<div class="menu">
{{range $i, $opt := .item.Attributes.options}}
Expand Down
18 changes: 18 additions & 0 deletions web_src/css/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2051,6 +2051,13 @@ a.ui.label:hover {
color: var(--color-text);
}

.ui.labels a.active.label:hover,
a.ui.active.label:hover {
background: var(--color-active);
border-color: var(--color-active);
color: var(--color-text);
}

.ui.label > .detail .icons {
margin-right: 0.25em;
}
Expand Down Expand Up @@ -2603,6 +2610,7 @@ table th[data-sortt-desc] .svg {
}

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

.ui.selection.dropdown > .svg.remove.icon {
top: .5px;
right: 32px;
width: auto;
}

.ui.selection.dropdown > .svg.remove.icon:hover {
opacity: 1;
}

.ui.dropdown.no-text > .dropdown.icon {
margin-left: 0 !important;
margin-right: 0 !important;
Expand Down
4 changes: 0 additions & 4 deletions web_src/css/features/gitgraph.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@
white-space: nowrap;
}

#git-graph-container #flow-select-refs-dropdown .dropdown.icon {
display: none;
}

#git-graph-container #flow-select-refs-dropdown .default.text {
padding-top: 4px;
padding-bottom: 4px;
Expand Down