Skip to content

fix(angular-material): sample issues #3549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2024
Merged

fix(angular-material): sample issues #3549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 57 additions & 66 deletions src/app/theming/angular/angular-sample.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,79 +31,70 @@
</div>
</mat-toolbar>

<div igxLayout>
<div class="card-wrapper">
<igx-card elevated>
<igx-card-media height="180px">
<img src="assets/images/card/media/card-image1.png">
</igx-card-media>
<igx-card-header>
<igx-avatar src="assets/images/avatar/11.jpg" shape="circle" size="small"></igx-avatar>
<h5 igxCardHeaderTitle>Salaries</h5>
<h5 igxCardHeaderSubtitle>$ 346,692.72</h5>
</igx-card-header>

<igx-card-actions [vertical]="false">
<button mat-stroked-button color="accent" (click)="openDialog()">More</button>
<igx-dialog #dialog title="Confirmation" message="Do you want to download the full report?">
<div igxDialogActions>
<button igxButton="flat" (click)="dialog.close()">Cancel</button>
<button igxButton="flat" (click)="dialog.close()">OK</button>
</div>
</igx-dialog>
<igx-icon class="success" igxEnd>trending_up</igx-icon>
</igx-card-actions>
</igx-card>
</div>
<div class="card-wrapper">
<igx-card elevated>
<igx-card-media height="180px">
<img src="assets/images/card/media/card-image2.png">
</igx-card-media>
<igx-card-header>
<igx-avatar src="assets/images/avatar/8.jpg" shape="circle" size="small"></igx-avatar>
<h5 igxCardHeaderTitle>Suppliers</h5>
<h5 igxCardHeaderSubtitle>$ 122,745.832</h5>
</igx-card-header>

<igx-card-actions [vertical]="false">
<div class="cards-container">
<igx-card elevated>
<igx-card-media height="180px">
<img src="assets/images/card/media/card-image1.png">
</igx-card-media>
<igx-card-header>
<igx-avatar src="assets/images/avatar/11.jpg" shape="circle" size="small"></igx-avatar>
<h5 igxCardHeaderTitle>Salaries</h5>
<h5 igxCardHeaderSubtitle>$ 346,692.72</h5>
</igx-card-header>
<igx-card-actions [vertical]="false">
<button mat-stroked-button color="accent" (click)="openDialog()">More</button>
<igx-dialog #dialog title="Confirmation" message="Do you want to download the full report?">
<div igxDialogActions>
<button igxButton="flat" (click)="dialog.close()">Cancel</button>
<button igxButton="flat" (click)="dialog.close()">OK</button>
</div>
</igx-dialog>
<igx-icon class="success" igxEnd>trending_up</igx-icon>
</igx-card-actions>
</igx-card>
<igx-card elevated>
<igx-card-media height="180px">
<img src="assets/images/card/media/card-image2.png">
</igx-card-media>
<igx-card-header>
<igx-avatar src="assets/images/avatar/8.jpg" shape="circle" size="small"></igx-avatar>
<h5 igxCardHeaderTitle>Suppliers</h5>
<h5 igxCardHeaderSubtitle>$ 122,745.832</h5>
</igx-card-header>
<igx-card-actions [vertical]="false">
<button mat-stroked-button color="accent" (click)="openDialog()">More</button>
<igx-dialog #dialog title="Confirmation" message="Do you want to download the full report?">
<div igxDialogActions>
<button igxButton="flat" (click)="dialog.close()">Cancel</button>
<button igxButton="flat" (click)="dialog.close()">OK</button>
</div>
</igx-dialog>
<igx-icon class="warning" igxEnd>error</igx-icon>
<igx-icon class="error" igxEnd>trending_down</igx-icon>
</igx-card-actions>
</igx-card>
<igx-card elevated>
<igx-card-media height="180px">
<img src="assets/images/card/media/card-image3.png">
</igx-card-media>
<igx-card-header>
<igx-avatar src="assets/images/avatar/9.jpg" shape="circle" size="small"></igx-avatar>
<h5 igxCardHeaderTitle>Ads & Marketing</h5>
<h5 igxCardHeaderSubtitle>$ 42,646.43</h5>
</igx-card-header>
<igx-card-actions [vertical]="false">
<div igxOverlayOutlet>
<button mat-stroked-button color="accent" (click)="openDialog()">More</button>
<igx-dialog #dialog title="Confirmation" message="Do you want to download the full report?">
<div igxDialogActions>
<button igxButton="flat" (click)="dialog.close()">Cancel</button>
<button igxButton="flat" (click)="dialog.close()">OK</button>
</div>
</igx-dialog>
<igx-icon class="warning" igxEnd>error</igx-icon>
<igx-icon class="error" igxEnd>trending_down</igx-icon>
</igx-card-actions>
</igx-card>
</div>
<div class="card-wrapper">
<igx-card elevated>
<igx-card-media height="180px">
<img src="assets/images/card/media/card-image3.png">
</igx-card-media>
<igx-card-header>
<igx-avatar src="assets/images/avatar/9.jpg" shape="circle" size="small"></igx-avatar>
<h5 igxCardHeaderTitle>Ads & Marketing</h5>
<h5 igxCardHeaderSubtitle>$ 42,646.43</h5>
</igx-card-header>

<igx-card-actions [vertical]="false">
<div igxOverlayOutlet>
<button mat-stroked-button color="accent" (click)="openDialog()">More</button>
<igx-dialog #dialog title="Confirmation" message="Do you want to download the full report?">
<div igxDialogActions>
<button igxButton="flat" (click)="dialog.close()">Cancel</button>
<button igxButton="flat" (click)="dialog.close()">OK</button>
</div>
</igx-dialog>
</div>
<igx-icon class="success" igxEnd>trending_up</igx-icon>
</igx-card-actions>
</igx-card>
</div>
</div>
<igx-icon class="success" igxEnd>trending_up</igx-icon>
</igx-card-actions>
</igx-card>
</div>
<igx-expansion-panel class="card-panel">
<igx-expansion-panel-header>
Expand Down
34 changes: 27 additions & 7 deletions src/app/theming/angular/angular-sample.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ $custom-mat-dark-theme: mat.m2-define-dark-theme((
::ng-deep {
@include mat.core();

.light-menu-theme {
.mat-menu {
@include mat.menu-theme($custom-mat-light-theme);
}

.dark-menu-theme {
@include mat.menu-theme($custom-mat-dark-theme);
@include mat.menu-color($custom-mat-dark-theme);
}
}

Expand All @@ -90,9 +90,12 @@ mat-toolbar div {
}
}

.card-wrapper {
margin: 16px;
flex: 1 0 25%;
.cards-container {
display: grid;
grid-template-columns: repeat(3, 1fr);
margin: rem(16px);
gap: rem(16px);
align-items: stretch;
}

.slider-wrapper {
Expand Down Expand Up @@ -169,18 +172,35 @@ igx-expansion-panel-body {

::ng-deep {
@include dark-theme($custom-dark-palette);
@include mat.all-component-themes($custom-mat-dark-theme);
@include mat.all-component-colors($custom-mat-dark-theme);

.primary {
color: color($custom-dark-palette, 'primary', 100);
margin-left: 32px;
}

.mat-mdc-slider.secondary .mdc-slider__track--inactive,
.mat-mdc-slider.secondary .mdc-slider__thumb-knob {
background-color: color($custom-mat-dark-theme, 'accent');
}

.mat-mdc-slider.secondary .mdc-slider__track--active_fill,
.mat-mdc-slider.secondary .mdc-slider__thumb-knob {
border-color: color($custom-mat-dark-theme, 'accent');
}

.mat-mdc-slider.secondary .mat-mdc-slider-visual-thumb .mat-ripple > * {
background-color: color($custom-mat-dark-theme, 'accent');
opacity: .12;
}

.mat-step-header .mat-step-icon-selected {
background-color: color($custom-dark-palette, 'secondary');
}

.mat-stepper-horizontal {
.mat-stepper-horizontal,
.mat-mdc-form-field-focus-overlay,
.mdc-text-field--filled:not(.mdc-text-field--disabled) {
background: color($custom-dark-palette, 'surface');
}

Expand Down
1 change: 1 addition & 0 deletions src/app/theming/angular/angular-sample.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export class AngularMaterialComponent implements OnInit {

private toggleOverlayClasses(theme: 'light' | 'dark') {
const overlayClasses = this.overlayContainer.getContainerElement().classList;
overlayClasses.add('mat-menu');

switch (theme) {
case 'light':
Expand Down
Loading