From c53bbbaa1177d5b0a2b87f0a9dc536dcd19baa84 Mon Sep 17 00:00:00 2001 From: mmalerba Date: Mon, 22 May 2017 14:46:03 -0700 Subject: [PATCH] cleanup(datepicker): move pane styles from calendar to datepicker-content (#4504) --- src/lib/datepicker/_datepicker-theme.scss | 2 +- src/lib/datepicker/datepicker-content.scss | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/lib/datepicker/_datepicker-theme.scss b/src/lib/datepicker/_datepicker-theme.scss index 50a4be417d6..a16e066868e 100644 --- a/src/lib/datepicker/_datepicker-theme.scss +++ b/src/lib/datepicker/_datepicker-theme.scss @@ -11,7 +11,7 @@ $mat-datepicker-selected-fade-amount: 0.6; $mat-datepicker-today-fade-amount: 0.2; - .mat-calendar { + .mat-datepicker-content { background-color: mat-color($background, card); } diff --git a/src/lib/datepicker/datepicker-content.scss b/src/lib/datepicker/datepicker-content.scss index 63a81951a07..a817ed9a646 100644 --- a/src/lib/datepicker/datepicker-content.scss +++ b/src/lib/datepicker/datepicker-content.scss @@ -19,12 +19,19 @@ $md-datepicker-touch-max-width: 750px; $md-datepicker-touch-max-height: 788px; +.mat-datepicker-content { + @include mat-elevation(8); + + display: block; +} + .mat-calendar { width: $md-datepicker-non-touch-calendar-width; - @include mat-elevation(8); } .mat-datepicker-content-touch { + @include mat-elevation(0); + display: block; // make sure the dialog scrolls rather than being cropped on ludicrously small screens max-height: 80vh; @@ -41,6 +48,5 @@ $md-datepicker-touch-max-height: 788px; min-height: $md-datepicker-touch-min-height; max-width: $md-datepicker-touch-max-width; max-height: $md-datepicker-touch-max-height; - @include mat-elevation(0); } }