Browse Source

Harmonize date picker styling

pull/7194/head
Thomas Kaul 2 weeks ago
parent
commit
d07fb5e021
  1. 2
      apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
  2. 2
      libs/ui/src/lib/account-balances/account-balances.component.html
  3. 19
      libs/ui/src/lib/fire-calculator/fire-calculator.component.html
  4. 6
      libs/ui/src/lib/fire-calculator/fire-calculator.component.ts

2
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html

@ -167,7 +167,7 @@
name="calendar-clear-outline" name="calendar-clear-outline"
/> />
</mat-datepicker-toggle> </mat-datepicker-toggle>
<mat-datepicker #date disabled="false" /> <mat-datepicker #date />
</mat-form-field> </mat-form-field>
</div> </div>
<div <div

2
libs/ui/src/lib/account-balances/account-balances.component.html

@ -22,7 +22,7 @@
[matDatepicker]="date" [matDatepicker]="date"
[max]="maxDate" [max]="maxDate"
/> />
<mat-datepicker-toggle matSuffix [for]="date"> <mat-datepicker-toggle class="mr-2" matSuffix [for]="date">
<ion-icon <ion-icon
class="text-muted" class="text-muted"
matDatepickerToggleIcon matDatepickerToggleIcon

19
libs/ui/src/lib/fire-calculator/fire-calculator.component.html

@ -39,19 +39,26 @@
class="d-none" class="d-none"
formControlName="retirementDate" formControlName="retirementDate"
matInput matInput
[matDatepicker]="datepicker" [matDatepicker]="date"
[min]="minDate" [min]="minDate"
/> />
<mat-datepicker-toggle <mat-datepicker-toggle
matIconSuffix class="mr-2"
matSuffix
[disabled]="hasPermissionToUpdateUserSettings !== true" [disabled]="hasPermissionToUpdateUserSettings !== true"
[for]="datepicker" [for]="date"
/> >
<ion-icon
class="text-muted"
matDatepickerToggleIcon
name="calendar-clear-outline"
/>
</mat-datepicker-toggle>
<mat-datepicker <mat-datepicker
#datepicker #date
startView="multi-year" startView="multi-year"
[disabled]="hasPermissionToUpdateUserSettings !== true" [disabled]="hasPermissionToUpdateUserSettings !== true"
(monthSelected)="setMonthAndYear($event, datepicker)" (monthSelected)="setMonthAndYear($event, date)"
/> />
</mat-form-field> </mat-form-field>

6
libs/ui/src/lib/fire-calculator/fire-calculator.component.ts

@ -34,6 +34,7 @@ import {
} from '@angular/material/datepicker'; } from '@angular/material/datepicker';
import { MatFormFieldModule } from '@angular/material/form-field'; import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input'; import { MatInputModule } from '@angular/material/input';
import { IonIcon } from '@ionic/angular/standalone';
import { import {
BarController, BarController,
BarElement, BarElement,
@ -56,6 +57,8 @@ import {
startOfMonth, startOfMonth,
sub sub
} from 'date-fns'; } from 'date-fns';
import { addIcons } from 'ionicons';
import { calendarClearOutline } from 'ionicons/icons';
import { isNumber } from 'lodash'; import { isNumber } from 'lodash';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
import { debounceTime } from 'rxjs'; import { debounceTime } from 'rxjs';
@ -67,6 +70,7 @@ import { FireCalculatorService } from './fire-calculator.service';
imports: [ imports: [
CommonModule, CommonModule,
FormsModule, FormsModule,
IonIcon,
MatButtonModule, MatButtonModule,
MatDatepickerModule, MatDatepickerModule,
MatFormFieldModule, MatFormFieldModule,
@ -136,6 +140,8 @@ export class GfFireCalculatorComponent implements OnChanges, OnDestroy {
Tooltip Tooltip
); );
addIcons({ calendarClearOutline });
this.calculatorForm.valueChanges this.calculatorForm.valueChanges
.pipe(takeUntilDestroyed(this.destroyRef)) .pipe(takeUntilDestroyed(this.destroyRef))
.subscribe(() => { .subscribe(() => {

Loading…
Cancel
Save