From 47a72b995c8204ad90169a64f65235e0dd753c11 Mon Sep 17 00:00:00 2001 From: Jony Date: Mon, 13 Feb 2017 21:31:02 +0800 Subject: [PATCH] datepicker: fix incorrect disabled style and add today style (#2791) --- .../theme-default/src/date-picker/date-table.css | 13 ++++++++++++- .../theme-default/src/date-picker/month-table.css | 4 ++-- .../theme-default/src/date-picker/year-table.css | 4 ++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/packages/theme-default/src/date-picker/date-table.css b/packages/theme-default/src/date-picker/date-table.css index 651de0452..c4a12f602 100644 --- a/packages/theme-default/src/date-picker/date-table.css +++ b/packages/theme-default/src/date-picker/date-table.css @@ -32,6 +32,17 @@ &.today { color: var(--datepicker-text-hover-color); + position: relative; + &:before { + content: " "; + position: absolute; + top: 0px; + right: 0px; + width: 0; + height: 0; + border-top: 0.5em solid var(--datepicker-active-color); + border-left: .5em solid transparent; + } } &.available:hover { @@ -45,7 +56,7 @@ } } - &.current, + &.current:not(.disabled), &.start-date, &.end-date { background-color: var(--datepicker-active-color) !important; diff --git a/packages/theme-default/src/date-picker/month-table.css b/packages/theme-default/src/date-picker/month-table.css index e9a687f33..9aad0e3d5 100644 --- a/packages/theme-default/src/date-picker/month-table.css +++ b/packages/theme-default/src/date-picker/month-table.css @@ -29,10 +29,10 @@ } } - &.current .cell { + &.current:not(.disabled) .cell { background-color: var(--datepicker-active-color) !important; color: var(--color-white); } } } -} \ No newline at end of file +} diff --git a/packages/theme-default/src/date-picker/year-table.css b/packages/theme-default/src/date-picker/year-table.css index 5aff5a2c7..fba2ae1fb 100644 --- a/packages/theme-default/src/date-picker/year-table.css +++ b/packages/theme-default/src/date-picker/year-table.css @@ -33,10 +33,10 @@ } } - &.current .cell { + &.current:not(.disabled) .cell { background-color: var(--datepicker-active-color) !important; color: var(--color-white); } } } -} \ No newline at end of file +}