diff --git a/src/assets/css/components/components/common/TimeRange/date-time-range.scss b/src/assets/css/components/components/common/TimeRange/date-time-range.scss index 95e979a3..a4251d60 100644 --- a/src/assets/css/components/components/common/TimeRange/date-time-range.scss +++ b/src/assets/css/components/components/common/TimeRange/date-time-range.scss @@ -1,6 +1,7 @@ .date-range-box { font-size: 14px; border-radius: 2px; + margin-right: 10px; display: flex; cursor: pointer; @@ -31,12 +32,12 @@ padding: 0 10px; display: flex; justify-content: space-around; - height: 26px; background: #FFFFFF; - border: 1px solid #E7EAED; - box-shadow: 0 2px 4px 0 rgba(51, 51, 51, 0.02); + border: 1px solid #DEDEDE; + box-shadow: 0 2px 4px 0 rgba(51,51,51,0.02); border-radius: 2px; - line-height: 26px; + height: 28px; + line-height: 28px; transition: width .3s; .cn-icon { @@ -60,10 +61,19 @@ padding: 14px 0 7px 8px; } + .calendar-popover-text.calendar-popover__small { + i { + font-weight: 300; + color: #575757; + } + } .calendar-popover-text { white-space: nowrap; display: inline-block; margin: 0 5px; + .cn-icon-Data { + color: #575757; + } } .calendar-popover-text:first-of-type { diff --git a/src/assets/css/components/components/common/TimeRange/time-refresh.scss b/src/assets/css/components/components/common/TimeRange/time-refresh.scss index c6b8c237..8231bea5 100644 --- a/src/assets/css/components/components/common/TimeRange/time-refresh.scss +++ b/src/assets/css/components/components/common/TimeRange/time-refresh.scss @@ -4,8 +4,9 @@ .cn-icon-refresh{ font-size: 14px; + color: #575757; } - .cn-icon-dropdown{ + .cn-icon-dropdown { font-size: 14px; transition: all .3s; display: inline-block; @@ -17,7 +18,8 @@ position: absolute; z-index: 2; background: #FFFFFF; - box-shadow: -1px 1px 10px -1px rgba(205,205,205,0.77); + border: 1px solid #DEDEDE; + box-shadow: 0 2px 4px 0 rgba(51,51,51,0.02); border-radius: 2px; top: 30px; right: 0; @@ -47,8 +49,22 @@ color: #0091FF; } } + .el-button--mini.cn-button { + span { + font-size: 14px; + color: #2C72C6; + font-weight: 400; + .cn-button-label { + padding: 0 8px 0 3px; + } + i { + font-size: 14px; + color: #575757; + } + } + } .el-button--mini{ padding: 4px 6px !important; - min-height: 26px !important; + min-height: 28px !important; } } diff --git a/src/components/common/TimeRange/DateTimeRange.vue b/src/components/common/TimeRange/DateTimeRange.vue index 5570a4d6..dab15a6b 100644 --- a/src/components/common/TimeRange/DateTimeRange.vue +++ b/src/components/common/TimeRange/DateTimeRange.vue @@ -1,7 +1,7 @@