Skip to content

Commit 42679c1

Browse files
authored
Merge pull request #1631 from IFRCGo/fix/minor-styling
Minor styling fixes
2 parents 817d56d + 0cefae1 commit 42679c1

File tree

5 files changed

+10
-18
lines changed

5 files changed

+10
-18
lines changed

app/src/components/domain/ActiveOperationMap/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ function ActiveOperationMap(props: Props) {
408408
value={rawFilter.displacement}
409409
onChange={setFilterField}
410410
/>
411-
<div>
411+
<div className={styles.clearButton}>
412412
<Button
413413
name={undefined}
414414
onClick={handleClearFiltersButtonClick}

app/src/components/domain/ActiveOperationMap/styles.module.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
.active-operation-map {
2+
.clear-button {
3+
display: flex;
4+
flex-direction: column;
5+
justify-content: flex-end;
6+
}
27
.content {
38
position: relative;
49

app/src/views/CountryOngoingActivitiesThreeWProjects/Filters/index.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import {
88
stringNameSelector,
99
stringValueSelector,
1010
} from '@ifrc-go/ui/utils';
11-
import { _cs } from '@togglecorp/fujs';
1211
import { type EntriesAsList } from '@togglecorp/toggle-form';
1312

1413
import useGlobalEnums from '#hooks/domain/useGlobalEnums';
@@ -17,7 +16,6 @@ import type { GoApiResponse } from '#utils/restRequest';
1716
import { useRequest } from '#utils/restRequest';
1817

1918
import i18n from './i18n.json';
20-
import styles from './styles.module.css';
2119

2220
type DistrictListItem = NonNullable<GoApiResponse<'/api/v2/district/'>['results']>[number];
2321

@@ -35,7 +33,6 @@ function countrySocietyNameSelector(country: NationalSociety) {
3533
}
3634

3735
interface Props {
38-
className?: string;
3936
value: FilterValue;
4037
onChange: React.Dispatch<React.SetStateAction<FilterValue>>;
4138
disabled?: boolean;
@@ -44,7 +41,6 @@ interface Props {
4441

4542
function Filters(props: Props) {
4643
const {
47-
className,
4844
value,
4945
onChange,
5046
disabled,
@@ -83,7 +79,7 @@ function Filters(props: Props) {
8379
}, [onChange]);
8480

8581
return (
86-
<div className={_cs(styles.filters, className)}>
82+
<>
8783
<MultiSelectInput
8884
name="reporting_ns"
8985
placeholder={strings.threeWFilterReportingNs}
@@ -144,7 +140,7 @@ function Filters(props: Props) {
144140
onChange={handleInputChange}
145141
disabled={disabled}
146142
/>
147-
</div>
143+
</>
148144
);
149145
}
150146

app/src/views/CountryOngoingActivitiesThreeWProjects/Filters/styles.module.css

Lines changed: 0 additions & 5 deletions
This file was deleted.

app/src/views/GlobalThreeW/Filters/index.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@ import {
66
stringLabelSelector,
77
stringValueSelector,
88
} from '@ifrc-go/ui/utils';
9-
import { _cs } from '@togglecorp/fujs';
109

1110
import NationalSocietyMultiSelectInput from '#components/domain/NationalSocietyMultiSelectInput';
1211
import useGlobalEnums from '#hooks/domain/useGlobalEnums';
1312
import { useRequest } from '#utils/restRequest';
1413

1514
import i18n from './i18n.json';
16-
import styles from './styles.module.css';
1715

1816
export interface FilterValue {
1917
reporting_ns: number[];
@@ -23,15 +21,13 @@ export interface FilterValue {
2321
}
2422

2523
interface Props {
26-
className?: string;
2724
value: FilterValue;
2825
onChange: React.Dispatch<React.SetStateAction<FilterValue>>;
2926
disabled?: boolean;
3027
}
3128

3229
function Filters(props: Props) {
3330
const {
34-
className,
3531
value,
3632
onChange,
3733
disabled,
@@ -64,7 +60,7 @@ function Filters(props: Props) {
6460
}, [onChange]);
6561

6662
return (
67-
<div className={_cs(styles.filters, className)}>
63+
<>
6864
<NationalSocietyMultiSelectInput
6965
name="reporting_ns"
7066
placeholder={strings.threeWFilterReportingNs}
@@ -102,7 +98,7 @@ function Filters(props: Props) {
10298
onChange={handleInputChange}
10399
disabled={disabled}
104100
/>
105-
</div>
101+
</>
106102
);
107103
}
108104

0 commit comments

Comments
 (0)