mirror of
https://github.com/richard-loafle/fuse-angular.git
synced 2025-01-10 04:25:08 +00:00
Fixed various dialog issues
+ (Shortcuts) Icon colors in shortcuts menu
This commit is contained in:
parent
26e55d7f3d
commit
b8039899db
|
@ -52,37 +52,60 @@
|
||||||
|
|
||||||
<mat-list-item *ngFor="let shortcutItem of shortcutItems"
|
<mat-list-item *ngFor="let shortcutItem of shortcutItems"
|
||||||
(click)="toggleShortcut($event, shortcutItem)">
|
(click)="toggleShortcut($event, shortcutItem)">
|
||||||
|
|
||||||
<div class="w-100-p" fxLayout="row" fxLayoutAlign="start center">
|
<div class="w-100-p" fxLayout="row" fxLayoutAlign="start center">
|
||||||
<mat-icon mat-list-icon class="mr-8" *ngIf="shortcutItem.icon">{{shortcutItem.icon}}</mat-icon>
|
|
||||||
|
<mat-icon mat-list-icon class="mr-8 secondary-text" *ngIf="shortcutItem.icon">
|
||||||
|
{{shortcutItem.icon}}
|
||||||
|
</mat-icon>
|
||||||
|
|
||||||
<span class="h2 w-32 h-32 p-4 mr-8 secondary-text text-bold" fxLayout="row"
|
<span class="h2 w-32 h-32 p-4 mr-8 secondary-text text-bold" fxLayout="row"
|
||||||
fxLayoutAlign="center center" *ngIf="!shortcutItem.icon">
|
fxLayoutAlign="center center" *ngIf="!shortcutItem.icon">
|
||||||
{{shortcutItem.title.substr(0, 1).toUpperCase()}}
|
{{shortcutItem.title.substr(0, 1).toUpperCase()}}
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<p matLine fxFlex>{{shortcutItem.title}}</p>
|
<p matLine fxFlex>{{shortcutItem.title}}</p>
|
||||||
<mat-icon class="ml-8">star</mat-icon>
|
|
||||||
|
<mat-icon class="ml-8 amber-fg">star</mat-icon>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</mat-list-item>
|
</mat-list-item>
|
||||||
|
|
||||||
<mat-list-item *ngIf="shortcutItems.length === 0">
|
<mat-list-item *ngIf="shortcutItems.length === 0">
|
||||||
<p>
|
<p>
|
||||||
<small>No shortcuts yet!</small>
|
<small>No shortcuts yet!</small>
|
||||||
</p>
|
</p>
|
||||||
</mat-list-item>
|
</mat-list-item>
|
||||||
|
|
||||||
</mat-nav-list>
|
</mat-nav-list>
|
||||||
|
|
||||||
<mat-nav-list *ngIf="searching" style="max-height: 312px; overflow: auto" fusePerfectScrollbar>
|
<mat-nav-list *ngIf="searching" style="max-height: 312px; overflow: auto" fusePerfectScrollbar>
|
||||||
|
|
||||||
<mat-list-item *ngFor="let navigationItem of filteredNavigationItems"
|
<mat-list-item *ngFor="let navigationItem of filteredNavigationItems"
|
||||||
(click)="toggleShortcut($event, navigationItem)">
|
(click)="toggleShortcut($event, navigationItem)">
|
||||||
|
|
||||||
<div class="w-100-p" fxLayout="row" fxLayoutAlign="start center">
|
<div class="w-100-p" fxLayout="row" fxLayoutAlign="start center">
|
||||||
<mat-icon mat-list-icon class="mr-8" *ngIf="navigationItem.icon">{{navigationItem.icon}}</mat-icon>
|
|
||||||
|
<mat-icon mat-list-icon class="mr-8 secondary-text" *ngIf="navigationItem.icon">
|
||||||
|
{{navigationItem.icon}}
|
||||||
|
</mat-icon>
|
||||||
|
|
||||||
<span class="h2 w-32 h-32 p-4 mr-8 secondary-text text-bold" fxLayout="row"
|
<span class="h2 w-32 h-32 p-4 mr-8 secondary-text text-bold" fxLayout="row"
|
||||||
fxLayoutAlign="center center" *ngIf="!navigationItem.icon">
|
fxLayoutAlign="center center" *ngIf="!navigationItem.icon">
|
||||||
{{navigationItem.title.substr(0, 1).toUpperCase()}}
|
{{navigationItem.title.substr(0, 1).toUpperCase()}}
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<p matLine fxFlex>{{navigationItem.title}}</p>
|
<p matLine fxFlex>{{navigationItem.title}}</p>
|
||||||
<mat-icon class="ml-8" *ngIf="isInShortcuts(navigationItem)">star</mat-icon>
|
|
||||||
|
<mat-icon class="ml-8 amber-fg" *ngIf="isInShortcuts(navigationItem)">star</mat-icon>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</mat-list-item>
|
</mat-list-item>
|
||||||
|
|
||||||
</mat-nav-list>
|
</mat-nav-list>
|
||||||
|
|
||||||
</mat-menu>
|
</mat-menu>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
<div class="dialog-content-wrapper">
|
<div class="dialog-content-wrapper">
|
||||||
<mat-toolbar class="mat-accent m-0">
|
<mat-toolbar class="mat-accent m-0">
|
||||||
<div fxFlex fxLayout="row" fxLayoutAlign="space-between center">
|
<mat-toolbar-row fxFlex fxLayout="row" fxLayoutAlign="space-between center">
|
||||||
<span class="title dialog-title">{{dialogTitle}}</span>
|
<span class="title dialog-title">{{dialogTitle}}</span>
|
||||||
<button mat-icon-button (click)="dialogRef.close()" aria-label="Close dialog">
|
<button mat-icon-button (click)="dialogRef.close()" aria-label="Close dialog">
|
||||||
<mat-icon>close</mat-icon>
|
<mat-icon>close</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</mat-toolbar-row>
|
||||||
</mat-toolbar>
|
</mat-toolbar>
|
||||||
|
|
||||||
<div mat-dialog-content class="p-24 m-0" fusePerfectScrollbar>
|
<div mat-dialog-content class="p-24 m-0" fusePerfectScrollbar>
|
||||||
|
|
|
@ -19,56 +19,57 @@
|
||||||
<form [formGroup]="contactForm">
|
<form [formGroup]="contactForm">
|
||||||
|
|
||||||
<div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
|
<div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
|
||||||
<mat-icon class="mr-12 mt-12">account_circle</mat-icon>
|
|
||||||
<mat-form-field fxFlex>
|
<mat-form-field fxFlex>
|
||||||
|
<mat-icon matPrefix class="mr-12 s-20 secondary-text">account_circle</mat-icon>
|
||||||
<input name="name" formControlName="name" placeholder="Name" matInput required>
|
<input name="name" formControlName="name" placeholder="Name" matInput required>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
|
<div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
|
||||||
<mat-icon class="mr-12 mt-12"></mat-icon>
|
|
||||||
<mat-form-field fxFlex>
|
<mat-form-field fxFlex>
|
||||||
|
<mat-icon matPrefix class="mr-12 s-20 secondary-text">account_circle</mat-icon>
|
||||||
<input name="lastName" formControlName="lastName" placeholder="Lastname" matInput>
|
<input name="lastName" formControlName="lastName" placeholder="Lastname" matInput>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
|
<div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
|
||||||
<mat-icon class="mr-12 mt-12">star</mat-icon>
|
|
||||||
<mat-form-field fxFlex>
|
<mat-form-field fxFlex>
|
||||||
|
<mat-icon matPrefix class="mr-12 s-20 secondary-text">star</mat-icon>
|
||||||
<input name="nickname" formControlName="nickname" matInput placeholder="Nickname">
|
<input name="nickname" formControlName="nickname" matInput placeholder="Nickname">
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
|
<div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
|
||||||
<mat-icon class="mr-12 mt-12">phone</mat-icon>
|
|
||||||
<mat-form-field fxFlex>
|
<mat-form-field fxFlex>
|
||||||
|
<mat-icon matPrefix class="mr-12 s-20 secondary-text">phone</mat-icon>
|
||||||
<input formControlName="phone" matInput placeholder="Phone number">
|
<input formControlName="phone" matInput placeholder="Phone number">
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
|
<div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
|
||||||
<mat-icon class="mr-12 mt-12">email</mat-icon>
|
|
||||||
<mat-form-field fxFlex>
|
<mat-form-field fxFlex>
|
||||||
|
<mat-icon matPrefix class="mr-12 s-20 secondary-text">email</mat-icon>
|
||||||
<input name="email" formControlName="email" matInput type="email" placeholder="Email">
|
<input name="email" formControlName="email" matInput type="email" placeholder="Email">
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
|
<div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
|
||||||
<mat-icon class="mr-12 mt-12">domain</mat-icon>
|
|
||||||
<mat-form-field fxFlex>
|
<mat-form-field fxFlex>
|
||||||
|
<mat-icon matPrefix class="mr-12 s-20 secondary-text">domain</mat-icon>
|
||||||
<input name="company" formControlName="company" matInput placeholder="Company">
|
<input name="company" formControlName="company" matInput placeholder="Company">
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
|
<div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
|
||||||
<mat-icon class="mr-12 mt-12">work</mat-icon>
|
|
||||||
<mat-form-field fxFlex>
|
<mat-form-field fxFlex>
|
||||||
|
<mat-icon matPrefix class="mr-12 s-20 secondary-text">work</mat-icon>
|
||||||
<input name="jobTitle" formControlName="jobTitle" matInput placeholder="Job title">
|
<input name="jobTitle" formControlName="jobTitle" matInput placeholder="Job title">
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
|
<div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
|
||||||
<mat-form-field class="mr-24" fxFlex>
|
<mat-form-field class="mr-24" fxFlex>
|
||||||
|
<mat-icon matPrefix class="mr-12 s-20 secondary-text">cake</mat-icon>
|
||||||
<input matInput [matDatepicker]="birthdayDatePicker" placeholder="Birthday">
|
<input matInput [matDatepicker]="birthdayDatePicker" placeholder="Birthday">
|
||||||
<mat-datepicker-toggle matSuffix [for]="birthdayDatePicker"></mat-datepicker-toggle>
|
<mat-datepicker-toggle matSuffix [for]="birthdayDatePicker"></mat-datepicker-toggle>
|
||||||
<mat-datepicker #birthdayDatePicker></mat-datepicker>
|
<mat-datepicker #birthdayDatePicker></mat-datepicker>
|
||||||
|
@ -76,16 +77,16 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
|
<div class="mb-24" fxLayout="row" fxLayoutAlign="start start">
|
||||||
<mat-icon class="mr-12 mt-12">home</mat-icon>
|
|
||||||
<mat-form-field fxFlex>
|
<mat-form-field fxFlex>
|
||||||
|
<mat-icon matPrefix class="mr-12 s-20 secondary-text">home</mat-icon>
|
||||||
<input name="address" formControlName="address" matInput placeholder="Address">
|
<input name="address" formControlName="address" matInput placeholder="Address">
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div fxLayout="row" class="textarea-wrapper" fxLayoutAlign="start start">
|
<div fxLayout="row" class="textarea-wrapper" fxLayoutAlign="start start">
|
||||||
<mat-icon class="mr-12 mt-12">note</mat-icon>
|
|
||||||
<mat-form-field fxFlex>
|
<mat-form-field fxFlex>
|
||||||
<textarea name="notes" formControlName="notes" placeholder="Notes" matInput type="text" max-rows="4"></textarea>
|
<textarea name="notes" formControlName="notes" placeholder="Notes" matInput type="text"
|
||||||
|
max-rows="4"></textarea>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
|
|
||||||
.mat-dialog-container {
|
.mat-dialog-container {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
overflow: hidden;
|
|
||||||
|
|
||||||
.mat-toolbar {
|
.mat-toolbar {
|
||||||
flex: 1 0 auto;
|
flex: 1 0 auto;
|
||||||
|
|
|
@ -265,7 +265,7 @@
|
||||||
<div fxLayout="row wrap" fxLayout.gt-md="column">
|
<div fxLayout="row wrap" fxLayout.gt-md="column">
|
||||||
|
|
||||||
<!-- Widget 7 -->
|
<!-- Widget 7 -->
|
||||||
<div class="mb-48" [ngClass.lt-lg]="'mr-32'">
|
<div class="mb-48" [ngClass.lt-lg]="'mr-32'" [ngClass.xs]="'mr-0'">
|
||||||
|
|
||||||
<div class="pb-24 font-size-18 font-weight-300">
|
<div class="pb-24 font-size-18 font-weight-300">
|
||||||
What are your top devices?
|
What are your top devices?
|
||||||
|
@ -337,7 +337,7 @@
|
||||||
<!-- / Widget 7 -->
|
<!-- / Widget 7 -->
|
||||||
|
|
||||||
<!-- Widget 8 -->
|
<!-- Widget 8 -->
|
||||||
<div class="mb-48" [ngClass.lt-lg]="'mr-32'">
|
<div class="mb-48" [ngClass.lt-lg]="'mr-32'" [ngClass.xs]="'mr-0'">
|
||||||
|
|
||||||
<div class="pb-24 font-size-18 font-weight-300">
|
<div class="pb-24 font-size-18 font-weight-300">
|
||||||
How are your sales?
|
How are your sales?
|
||||||
|
@ -439,7 +439,7 @@
|
||||||
<!-- / Widget 8 -->
|
<!-- / Widget 8 -->
|
||||||
|
|
||||||
<!-- Widget 9 -->
|
<!-- Widget 9 -->
|
||||||
<div class="mb-48" [ngClass.lt-lg]="'mr-32'">
|
<div class="mb-48" [ngClass.lt-lg]="'mr-32'" [ngClass.xs]="'mr-0'">
|
||||||
|
|
||||||
<div class="pb-24 font-size-18 font-weight-300" [ngClass.lt-lg]="'pt-0'">
|
<div class="pb-24 font-size-18 font-weight-300" [ngClass.lt-lg]="'pt-0'">
|
||||||
What are your top campaigns?
|
What are your top campaigns?
|
||||||
|
|
|
@ -43,6 +43,15 @@
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
max-width: none;
|
max-width: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.fuse-card {
|
||||||
|
|
||||||
|
@include media-breakpoint-down('md') {
|
||||||
|
width: 100%;
|
||||||
|
min-width: 0;
|
||||||
|
max-width: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
<div class="dialog-content-wrapper">
|
<div class="dialog-content-wrapper">
|
||||||
<mat-toolbar class="mat-accent m-0">
|
<mat-toolbar class="mat-accent m-0">
|
||||||
<div fxFlex fxLayout="row" fxLayoutAlign="space-between center">
|
<mat-toolbar-row fxFlex fxLayout="row" fxLayoutAlign="space-between center">
|
||||||
<span class="title dialog-title">New Message</span>
|
<span class="title dialog-title">New Message</span>
|
||||||
<button mat-icon-button (click)="dialogRef.close()" aria-label="Close dialog">
|
<button mat-icon-button (click)="dialogRef.close()" aria-label="Close dialog">
|
||||||
<mat-icon>close</mat-icon>
|
<mat-icon>close</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</mat-toolbar-row>
|
||||||
</mat-toolbar>
|
</mat-toolbar>
|
||||||
|
|
||||||
<div mat-dialog-content class="p-24 m-0" fusePerfectScrollbar>
|
<div mat-dialog-content class="p-24 m-0" fusePerfectScrollbar>
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
<div class="dialog-content-wrapper">
|
<div class="dialog-content-wrapper">
|
||||||
<mat-toolbar class="mat-accent m-0">
|
<mat-toolbar class="mat-accent m-0">
|
||||||
<div fxFlex fxLayout="row" fxLayoutAlign="space-between center">
|
<mat-toolbar-row fxFlex fxLayout="row" fxLayoutAlign="space-between center">
|
||||||
<span class="title dialog-title">New Message</span>
|
<span class="title dialog-title">New Message</span>
|
||||||
<button mat-icon-button (click)="dialogRef.close()" aria-label="Close dialog">
|
<button mat-icon-button (click)="dialogRef.close()" aria-label="Close dialog">
|
||||||
<mat-icon>close</mat-icon>
|
<mat-icon>close</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</mat-toolbar-row>
|
||||||
</mat-toolbar>
|
</mat-toolbar>
|
||||||
|
|
||||||
<div mat-dialog-content class="p-24 m-0" fusePerfectScrollbar>
|
<div mat-dialog-content class="p-24 m-0" fusePerfectScrollbar>
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
<div *ngIf="!todo" fxLayout="column" fxLayoutAlign="center center" fxFlex>
|
<div *ngIf="!todo" fxLayout="column" fxLayoutAlign="center center" fxFlex>
|
||||||
<mat-icon class="s-120 mb-12 select-todo-icon" *fuseIfOnDom
|
<mat-icon class="s-120 mb-12 select-todo-icon hint-text" *fuseIfOnDom
|
||||||
[@animate]="{value:'*',params:{delay:'300ms',scale:'0.2'}}">check_box
|
[@animate]="{value:'*',params:{delay:'300ms',scale:'0.2'}}">check_box
|
||||||
</mat-icon>
|
</mat-icon>
|
||||||
<span class="hint-text mat-h1 select-todo-text" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'400ms'}}">Select
|
<span class="hint-text mat-h1 select-todo-text" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'400ms'}}">
|
||||||
a todo
|
Select a todo
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user