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

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

This reverts commit a3fef46a8e.

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

This reverts commit 97f52c0924.

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

This reverts commit 3661abe061.

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

This reverts commit fe96f38c10.
This commit is contained in:
vivian-hu
2018-12-12 16:17:33 -08:00
committed by GitHub
parent a3da8d2b5b
commit 3eb7e9c480
6 changed files with 6 additions and 16 deletions
+1 -1
View File
@@ -28,7 +28,7 @@ export class DialogDemo {
disableClose: false,
panelClass: 'custom-overlay-pane-class',
hasBackdrop: true,
backdropClass: defaultDialogConfig.backdropClass,
backdropClass: '',
width: '',
height: '',
minWidth: '',
@@ -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) {
+1 -1
View File
@@ -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;
-5
View File
@@ -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) {
+1 -1
View File
@@ -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;
+3 -3
View File
@@ -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,
@@ -203,10 +203,10 @@ export class MatDialog implements OnDestroy {
});
if (dialogConfig.backdropClass) {
overlayConfig.backdropClass = dialogConfig.backdropClass;
state.backdropClass = dialogConfig.backdropClass;
}
return overlayConfig;
return state;
}
/**