Skip to content
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.

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

fix(dialog,bottom-sheet): invert backdrop color on dark themes #13065

Merged
merged 1 commit into from
Dec 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/dev-app/dialog/dialog-demo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export class DialogDemo {
disableClose: false,
panelClass: 'custom-overlay-pane-class',
hasBackdrop: true,
backdropClass: '',
backdropClass: defaultDialogConfig.backdropClass,
width: '',
height: '',
minWidth: '',
Expand Down
5 changes: 5 additions & 0 deletions src/lib/bottom-sheet/_bottom-sheet-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,17 @@
@mixin mat-bottom-sheet-theme($theme) {
$background: map-get($theme, background);
$foreground: map-get($theme, foreground);
$backdrop-color: invert(mat-color($background, card, 0.288));

.mat-bottom-sheet-container {
@include _mat-theme-elevation(16, $theme);
background: mat-color($background, dialog);
color: mat-color($foreground, text);
}

.mat-bottom-sheet-backdrop {
background: $backdrop-color;
}
}

@mixin mat-bottom-sheet-typography($config) {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/bottom-sheet/bottom-sheet-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export class MatBottomSheetConfig<D = any> {
hasBackdrop?: boolean = true;

/** Custom class for the backdrop. */
backdropClass?: string;
backdropClass?: string = 'mat-bottom-sheet-backdrop';

/** Whether the user can use escape or clicking outside to close the bottom sheet. */
disableClose?: boolean = false;
Expand Down
5 changes: 5 additions & 0 deletions src/lib/dialog/_dialog-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,17 @@
@mixin mat-dialog-theme($theme) {
$background: map-get($theme, background);
$foreground: map-get($theme, foreground);
$backdrop-color: invert(mat-color($background, card, 0.288));

.mat-dialog-container {
@include _mat-theme-elevation(24, $theme);
background: mat-color($background, dialog);
color: mat-color($foreground, text);
}

.mat-dialog-backdrop {
background: $backdrop-color;
}
}

@mixin mat-dialog-typography($config) {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/dialog/dialog-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export class MatDialogConfig<D = any> {
hasBackdrop?: boolean = true;

/** Custom class for the backdrop, */
backdropClass?: string = '';
backdropClass?: string = 'mat-dialog-backdrop';

/** Whether the user can use escape or clicking on the backdrop to close the modal. */
disableClose?: boolean = false;
Expand Down
6 changes: 3 additions & 3 deletions src/lib/dialog/dialog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ export class MatDialog implements OnDestroy {
* @returns The overlay configuration.
*/
private _getOverlayConfig(dialogConfig: MatDialogConfig): OverlayConfig {
const state = new OverlayConfig({
const overlayConfig = new OverlayConfig({
positionStrategy: this._overlay.position().global(),
scrollStrategy: dialogConfig.scrollStrategy || this._scrollStrategy(),
panelClass: dialogConfig.panelClass,
Expand All @@ -203,10 +203,10 @@ export class MatDialog implements OnDestroy {
});

if (dialogConfig.backdropClass) {
state.backdropClass = dialogConfig.backdropClass;
overlayConfig.backdropClass = dialogConfig.backdropClass;
}

return state;
return overlayConfig;
}

/**
Expand Down