Skip to content

Commit

Permalink
fix(datepicker): fix background color when todays date is selected
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonferrua committed Oct 30, 2017
1 parent 789db48 commit 75f0f6a
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
15 changes: 11 additions & 4 deletions ui/components/datepickers/base/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,13 @@
&:hover:not(.slds-disabled-text) > .slds-day,
&:focus:not(.slds-disabled-text) > .slds-day,
&.slds-is-today > .slds-day {
background: $color-background-row-hover;
cursor: pointer;
}

&.slds-is-today > .slds-day {
background-color: $color-background-row-selected;
}

&:focus {
outline: 0;

Expand All @@ -72,15 +75,19 @@
* @selector .slds-is-selected
* @restrict .slds-datepicker td
*/
&.slds-is-selected:not(.slds-is-today) > .slds-day {
// &.slds-is-selected {
// color: $color-text-brand-primary;
// }

&.slds-is-selected > .slds-day {
background: $brand-accessible;
color: $color-text-button-brand-hover;
color: $color-text-brand-primary;
}

&.slds-is-selected:focus > .slds-day {
background: $brand-accessible-active;
box-shadow: $brand-accessible-active 0 0 3px;
color: currentColor;
color: $color-text-brand-primary;
}
}

Expand Down
4 changes: 4 additions & 0 deletions ui/components/datepickers/range/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@
overflow: visible;
}

&.slds-is-today > .slds-day {
box-shadow: $color-background-alt 0 0 0 1px inset;
}

+ .slds-is-selected-multi > .slds-day:before {
@include calendar-selection-fill;
}
Expand Down

0 comments on commit 75f0f6a

Please sign in to comment.