From 75f0f6a8d3f302c8e3266cbc8b9fec0d7700efb5 Mon Sep 17 00:00:00 2001 From: Brandon Ferrua Date: Mon, 30 Oct 2017 15:21:17 -0700 Subject: [PATCH] fix(datepicker): fix background color when todays date is selected --- ui/components/datepickers/base/_index.scss | 15 +++++++++++---- ui/components/datepickers/range/_index.scss | 4 ++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ui/components/datepickers/base/_index.scss b/ui/components/datepickers/base/_index.scss index c4537db0b4..9f9bb8d0c7 100644 --- a/ui/components/datepickers/base/_index.scss +++ b/ui/components/datepickers/base/_index.scss @@ -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; @@ -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; } } diff --git a/ui/components/datepickers/range/_index.scss b/ui/components/datepickers/range/_index.scss index fb6a2df69b..c02423bb2a 100644 --- a/ui/components/datepickers/range/_index.scss +++ b/ui/components/datepickers/range/_index.scss @@ -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; }