Skip to content
This repository has been archived by the owner on Sep 5, 2024. It is now read-only.

fix(datepicker): fix theme not being applied. fixes #5141 #5163

Closed
wants to merge 1 commit into from
Closed
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/components/autocomplete/autocomplete-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ md-autocomplete.md-THEME_NAME-theme {
}
}
}
.md-autocomplete-suggestions-container.md-THEME_NAME-theme, {
.md-autocomplete-suggestions-container.md-THEME_NAME-theme {
background: '{{background-50}}';
li {
color: '{{background-900}}';
Expand Down
12 changes: 6 additions & 6 deletions src/components/datepicker/calendar-theme.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/** Theme styles for mdCalendar. */

.md-calendar.md-THEME_NAME-theme {
color: '{{foreground-1}}';
md-calendar.md-THEME_NAME-theme {
.md-calendar {
color: '{{foreground-1}}';

tr:last-child td {
border-bottom-color: '{{background-200}}';
tr:last-child td {
border-bottom-color: '{{background-200}}';
}
}
}
.md-THEME_NAME-theme {

.md-calendar-day-header {
background: '{{background-hue-1}}';
Expand Down
14 changes: 6 additions & 8 deletions src/components/datepicker/datePicker-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

md-datepicker.md-THEME_NAME-theme {
background: '{{background-color}}';
}

.md-THEME_NAME-theme {

.md-datepicker-input {
@include input-placeholder-color('{{foreground-3}}');
Expand All @@ -24,10 +21,6 @@ md-datepicker.md-THEME_NAME-theme {
}
}

.md-datepicker-calendar-pane {
border-color: '{{background-300}}';
}

.md-datepicker-triangle-button {
.md-datepicker-expand-triangle {
border-top-color: '{{foreground-3}}';
Expand All @@ -39,14 +32,19 @@ md-datepicker.md-THEME_NAME-theme {
}

// Open state for all of the elements of the picker.
.md-datepicker-open {
&.md-datepicker-open {
.md-datepicker-calendar-icon {
fill: '{{primary-500}}';
}
}
}

.md-datepicker-calendar-pane.md-THEME_NAME-theme {
border-color: '{{background-300}}';

.md-datepicker-calendar,
.md-datepicker-input-mask-opaque {
background: '{{background-color}}';
}
}

1 change: 1 addition & 0 deletions src/components/datepicker/datePicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@
this.calendarPane.id = 'md-date-pane' + $mdUtil.nextUid();

$mdTheming($element);
$mdTheming(angular.element(this.calendarPane));

/** Pre-bound click handler is saved so that the event listener can be removed. */
this.bodyClickHandler = angular.bind(this, this.handleBodyClick);
Expand Down