From e51a1016d8277739779df5ea309287c75c030e0e Mon Sep 17 00:00:00 2001 From: afc163 Date: Fri, 25 Dec 2015 14:52:41 +0800 Subject: [PATCH] adjust date-picker style as design --- style/components/datepicker/Calendar.less | 19 ++++++++++--------- style/components/datepicker/MonthPanel.less | 2 +- style/components/datepicker/RangePicker.less | 4 ++-- style/components/datepicker/TimePicker.less | 2 +- style/components/datepicker/YearPanel.less | 2 +- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/style/components/datepicker/Calendar.less b/style/components/datepicker/Calendar.less index 8c48b19c8..623d7d724 100644 --- a/style/components/datepicker/Calendar.less +++ b/style/components/datepicker/Calendar.less @@ -69,7 +69,7 @@ .@{calendar-prefix-cls} { position: relative; outline: none; - width: 253px; + width: 231px; border: 1px solid @border-color-base; list-style: none; font-size: @font-size-base; @@ -107,7 +107,7 @@ } &-calendar-body { - padding: 5px 8px; + padding: 4px 8px; } table { @@ -153,10 +153,11 @@ display: block; margin: 0 auto; color: #666; - border-radius: 4px 4px; + border-radius: 4px; width: 20px; height: 20px; line-height: 18px; + border: 1px solid transparent; padding: 0; background: transparent; text-align: center; @@ -173,9 +174,9 @@ } &-today &-date { - border: 1px solid tint(@primary-color, 50%); - line-height: 18px; - background: tint(@primary-color, 90%); + border-color: @primary-color; + font-weight: bold; + color: @primary-color; } &-selected-day &-date { @@ -217,15 +218,15 @@ &-footer { padding: 0 15px; - height: 42px; - line-height: 42px; + height: 38px; + line-height: 38px; border-top: 1px solid @border-color-split; } &-footer-btn { text-align: center; display: block; - line-height: 42px; + line-height: 38px; } &-footer > div { diff --git a/style/components/datepicker/MonthPanel.less b/style/components/datepicker/MonthPanel.less index 3ef789e37..9a9162cf8 100644 --- a/style/components/datepicker/MonthPanel.less +++ b/style/components/datepicker/MonthPanel.less @@ -1,6 +1,6 @@ .@{calendar-prefix-cls}-month-panel { left: 0; - top: 0; + top: 34px; bottom: 0; right: 0; background: #fff; diff --git a/style/components/datepicker/RangePicker.less b/style/components/datepicker/RangePicker.less index df45c9f89..ae7e89dca 100644 --- a/style/components/datepicker/RangePicker.less +++ b/style/components/datepicker/RangePicker.less @@ -18,11 +18,11 @@ } .@{calendar-prefix-cls}-range { - width: 502px; + width: 470px; overflow: hidden; &-part { - width: 250px; + width: 231px; position: relative; } diff --git a/style/components/datepicker/TimePicker.less b/style/components/datepicker/TimePicker.less index ee47b4f36..a6b8942d2 100644 --- a/style/components/datepicker/TimePicker.less +++ b/style/components/datepicker/TimePicker.less @@ -12,7 +12,7 @@ } &-picker-wrap { position: absolute; - left: 108px; + left: 106px; top: 6px; } } diff --git a/style/components/datepicker/YearPanel.less b/style/components/datepicker/YearPanel.less index 2c5955459..b79505cc4 100644 --- a/style/components/datepicker/YearPanel.less +++ b/style/components/datepicker/YearPanel.less @@ -1,6 +1,6 @@ .@{calendar-prefix-cls}-year-panel { left: 0; - top: 0; + top: 34px; bottom: 0; right: 0; background: #fff;