Skip to content

Commit 2bdce9b

Browse files
ozrendevPikachuEXEabsidue
authored
Change clear filter button from text to icon (FreeTubeApp#8205)
* change clear filter button text to icon * wrap icon in button elem * add hover css * refactor css * Update src/renderer/components/FtSearchFilters/FtSearchFilters.vue Co-authored-by: PikachuEXE <[email protected]> * Update src/renderer/components/FtSearchFilters/FtSearchFilters.css Co-authored-by: absidue <[email protected]> * Apply suggestion from @PikachuEXE * Apply suggestion from @PikachuEXE --------- Co-authored-by: PikachuEXE <[email protected]> Co-authored-by: absidue <[email protected]>
1 parent fa79120 commit 2bdce9b

File tree

3 files changed

+58
-13
lines changed

3 files changed

+58
-13
lines changed

src/renderer/components/FtSearchFilters/FtSearchFilters.css

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.center {
2-
margin-block: 5px 10px;
2+
margin-block-start: 10px;
33
text-align: center;
44
user-select: none;
55
}
@@ -18,6 +18,42 @@
1818
justify-content: center;
1919
}
2020

21+
.titleContainer {
22+
display: flex;
23+
align-items: baseline;
24+
justify-content: center;
25+
gap: 0.5rem;
26+
block-size: inherit;
27+
}
28+
29+
.clearFilterButton {
30+
border-radius: 50%;
31+
border-style: none;
32+
background-color: transparent;
33+
color: var(--primary-text-color);
34+
cursor: pointer;
35+
font-size: 20px;
36+
line-height: 1em;
37+
padding: 10px;
38+
transition: background 0.2s ease-out;
39+
40+
&:hover {
41+
background-color: var(--side-nav-hover-color);
42+
color: var(--side-nav-hover-text-color);
43+
transition: background 0.2s ease-in;
44+
}
45+
46+
&:active {
47+
background-color: var(--tertiary-text-color);
48+
color: var(--side-nav-active-text-color);
49+
transition: background 0.2s ease-in;
50+
}
51+
}
52+
53+
.clearFilterIcon {
54+
vertical-align: -0.25em;
55+
}
56+
2157
@media only screen and (width <= 680px) {
2258
.searchRadio {
2359
border-inline-end: 0;

src/renderer/components/FtSearchFilters/FtSearchFilters.vue

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,25 @@
44
@click="hideSearchFilters"
55
>
66
<template #label="{ labelId }">
7-
<h2
8-
:id="labelId"
9-
class="center"
10-
>
11-
{{ title }}
12-
</h2>
7+
<div class="titleContainer">
8+
<h2
9+
:id="labelId"
10+
class="center"
11+
>
12+
{{ title }}
13+
</h2>
14+
<button
15+
class="clearFilterButton"
16+
:title="$t('Search Filters.Clear Filters')"
17+
:style="{visibility: (searchFilterValueChanged ? 'visible' : 'hidden')}"
18+
@click="clearFilters"
19+
>
20+
<FontAwesomeIcon
21+
class="clearFilterIcon"
22+
:icon="['fas', 'filter-circle-xmark']"
23+
/>
24+
</button>
25+
</div>
1326
</template>
1427

1528
<FtFlexBox class="radioFlexBox">
@@ -50,12 +63,6 @@
5063
/>
5164
</FtFlexBox>
5265
<div class="searchFilterCloseButtonContainer">
53-
<FtButton
54-
:label="$t('Search Filters.Clear Filters')"
55-
background-color="var(--accent-color)"
56-
text-color="var(--text-with-accent-color)"
57-
@click="clearFilters"
58-
/>
5966
<FtButton
6067
:label="$t('Close')"
6168
background-color="null"

src/renderer/main.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ import {
5656
faFileVideo,
5757
faFilm,
5858
faFilter,
59+
faFilterCircleXmark,
5960
faFlask,
6061
faFire,
6162
faForward,
@@ -179,6 +180,7 @@ library.add(
179180
faFileVideo,
180181
faFilm,
181182
faFilter,
183+
faFilterCircleXmark,
182184
faFlask,
183185
faFire,
184186
faForward,

0 commit comments

Comments
 (0)