Skip to content

Commit

Permalink
Revert "fix(dialog,bottom-sheet): invert backdrop color on dark theme…
Browse files Browse the repository at this point in the history
…s" (angular#14492)

* Revert "build: update nodejs bazel rules (angular#14466)"

This reverts commit a3fef46.

* Revert "docs(form-field): native select reset values not working in examples (angular#14236)"

This reverts commit 97f52c0.

* Revert "fix(menu): allow text wrapping in menu items (angular#11430)"

This reverts commit 3661abe.

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

This reverts commit fe96f38.
  • Loading branch information
vivian-hu-zz authored Dec 13, 2018
1 parent a3da8d2 commit 3eb7e9c
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 16 deletions.
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: defaultDialogConfig.backdropClass,
backdropClass: '',
width: '',
height: '',
minWidth: '',
Expand Down
5 changes: 0 additions & 5 deletions src/lib/bottom-sheet/_bottom-sheet-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,12 @@
@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 = 'mat-bottom-sheet-backdrop';
backdropClass?: string;

/** Whether the user can use escape or clicking outside to close the bottom sheet. */
disableClose?: boolean = false;
Expand Down
5 changes: 0 additions & 5 deletions src/lib/dialog/_dialog-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,12 @@
@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 = 'mat-dialog-backdrop';
backdropClass?: string = '';

/** 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 overlayConfig = new OverlayConfig({
const state = 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) {
overlayConfig.backdropClass = dialogConfig.backdropClass;
state.backdropClass = dialogConfig.backdropClass;
}

return overlayConfig;
return state;
}

/**
Expand Down

0 comments on commit 3eb7e9c

Please sign in to comment.