Skip to content

Commit 341a074

Browse files
committed
Use rem and align-self for checkbox margin, scope css to filter-dropdown class
1 parent a517840 commit 341a074

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

client/wfprev-war/src/main/angular/src/app/components/search-filter/search-filter.component.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<div class="field search-input filter-search-input">
2121
<mat-label class="label">Business Area</mat-label>
2222
<mat-form-field appearance="fill" class="filter-item">
23-
<mat-select [(ngModel)]="selectedBusinessArea" placeholder="Select"
23+
<mat-select [(ngModel)]="selectedBusinessArea" placeholder="Select" [panelClass]="'filter-dropdown'"
2424
(selectionChange)="onOptionToggled($event,'selectedBusinessArea', businessAreaOptions)"
2525
multiple>
2626
<mat-option *ngFor="let option of businessAreaOptions" [value]="option.value" (onSelectionChange)="syncAllWithItemToggle($event, option.value, 'selectedBusinessArea', businessAreaOptions)">
@@ -33,7 +33,7 @@
3333
<div class="field search-input filter-search-input">
3434
<mat-label class="label">Fiscal Year(s)</mat-label>
3535
<mat-form-field appearance="fill" class="filter-item">
36-
<mat-select [(ngModel)]="selectedFiscalYears" placeholder="Select"
36+
<mat-select [(ngModel)]="selectedFiscalYears" placeholder="Select" [panelClass]="'filter-dropdown'"
3737
(selectionChange)="onOptionToggled($event,'selectedFiscalYears', fiscalYearOptions)"
3838
multiple>
3939
<mat-option *ngFor="let option of fiscalYearOptions" [value]="option.value" (onSelectionChange)="syncAllWithItemToggle($event, option.value, 'selectedFiscalYears', fiscalYearOptions)">
@@ -46,7 +46,7 @@
4646
<div class="field search-input filter-search-input">
4747
<mat-label class="label">Activity Category</mat-label>
4848
<mat-form-field appearance="fill" class="filter-item">
49-
<mat-select [(ngModel)]="selectedActivity" placeholder="Select"
49+
<mat-select [(ngModel)]="selectedActivity" placeholder="Select" [panelClass]="'filter-dropdown'"
5050
(selectionChange)="onOptionToggled($event,'selectedActivity', activityOptions)"
5151
multiple>
5252
<mat-option *ngFor="let option of activityOptions" [value]="option.value" (onSelectionChange)="syncAllWithItemToggle($event, option.value, 'selectedActivity', activityOptions)">
@@ -59,7 +59,7 @@
5959
<div class="field search-input filter-search-input">
6060
<mat-label class="label">Forest Region</mat-label>
6161
<mat-form-field appearance="fill" class="filter-item">
62-
<mat-select [(ngModel)]="selectedForestRegion" placeholder="Select"
62+
<mat-select [(ngModel)]="selectedForestRegion" placeholder="Select" [panelClass]="'filter-dropdown'"
6363
(ngModelChange)="onForestRegionChange()"
6464
(selectionChange)="onOptionToggled($event,'selectedForestRegion', forestRegionOptions)"
6565
multiple>
@@ -73,7 +73,7 @@
7373
<div class="field search-input filter-search-input">
7474
<mat-label class="label">Forest District</mat-label>
7575
<mat-form-field appearance="fill" class="filter-item">
76-
<mat-select [(ngModel)]="selectedForestDistrict" placeholder="Select"
76+
<mat-select [(ngModel)]="selectedForestDistrict" placeholder="Select" [panelClass]="'filter-dropdown'"
7777
(selectionChange)="onOptionToggled($event,'selectedForestDistrict', forestDistrictOptions)"
7878
multiple>
7979
<mat-option *ngFor="let option of forestDistrictOptions" [value]="option.value" (onSelectionChange)="syncAllWithItemToggle($event, option.value, 'selectedForestDistrict', forestDistrictOptions)">
@@ -86,7 +86,7 @@
8686
<div class="field search-input filter-search-input">
8787
<mat-label class="label">Fire Centre</mat-label>
8888
<mat-form-field appearance="fill" class="filter-item">
89-
<mat-select [(ngModel)]="selectedFireCentre" placeholder="Select"
89+
<mat-select [(ngModel)]="selectedFireCentre" placeholder="Select" [panelClass]="'filter-dropdown'"
9090
(selectionChange)="onOptionToggled($event,'selectedFireCentre', fireCentreOptions)"
9191
multiple>
9292
<mat-option *ngFor="let option of fireCentreOptions" [value]="option.value" (onSelectionChange)="syncAllWithItemToggle($event, option.value, 'selectedFireCentre', fireCentreOptions)">
@@ -99,7 +99,7 @@
9999
<div class="field search-input filter-search-input">
100100
<mat-label class="label">Fiscal Status</mat-label>
101101
<mat-form-field appearance="fill" class="filter-item">
102-
<mat-select [(ngModel)]="selectedFiscalStatus" placeholder="Select"
102+
<mat-select [(ngModel)]="selectedFiscalStatus" placeholder="Select" [panelClass]="'filter-dropdown'"
103103
(selectionChange)="onOptionToggled($event,'selectedFiscalStatus', fiscalStatusOptions)"
104104
multiple>
105105
<mat-option *ngFor="let option of fiscalStatusOptions" [value]="option.value" (onSelectionChange)="syncAllWithItemToggle($event, option.value, 'selectedFiscalStatus', fiscalStatusOptions)">

client/wfprev-war/src/main/angular/src/app/components/search-filter/search-filter.component.scss

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
::ng-deep .mat-pseudo-checkbox {
2-
margin-top: 16px !important;
1+
::ng-deep .filter-dropdown .mat-pseudo-checkbox {
2+
margin-top: 1.1rem;
3+
align-self: baseline;
34
}
45

5-
::ng-deep .mat-mdc-option {
6+
::ng-deep .filter-dropdown .mat-mdc-option {
67
align-items: flex-start !important;
78
}
89

9-
::ng-deep .mdc-list-item__primary-text {
10-
margin-top: 13px !important;
10+
::ng-deep .filter-dropdown .mdc-list-item__primary-text {
11+
margin-top: 1rem !important;
1112
white-space: normal !important;
1213
}
1314

0 commit comments

Comments
 (0)