Skip to content

Commit 41471f5

Browse files
committed
refactor(CDateRangePicker): update styles
1 parent 2c1725e commit 41471f5

File tree

2 files changed

+23
-4
lines changed

2 files changed

+23
-4
lines changed

scss/_calendar.scss

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,16 +170,16 @@
170170
&.range-hover .calendar-cell-inner,
171171
&.range-hover.selected .calendar-cell-inner {
172172
&::before {
173-
border-top: 1px solid var(--#{$variable-prefix}calendar-cell-selected-bg);
174-
border-bottom: 1px solid var(--#{$variable-prefix}calendar-cell-selected-bg);
173+
border-top: 1px dashed var(--#{$variable-prefix}calendar-cell-selected-bg);
174+
border-bottom: 1px dashed var(--#{$variable-prefix}calendar-cell-selected-bg);
175175
@include border-radius(0);
176176
}
177177
}
178178

179179
&.range-hover:first-child .calendar-cell-inner,
180180
&:not(.range-hover) + .range-hover .calendar-cell-inner {
181181
&::before {
182-
border-left: 1px solid var(--#{$variable-prefix}calendar-cell-selected-bg);
182+
border-left: 1px dashed var(--#{$variable-prefix}calendar-cell-selected-bg);
183183
@include border-start-radius($border-radius);
184184
}
185185
}
@@ -188,11 +188,17 @@
188188
&.range-hover.last .calendar-cell-inner,
189189
&.range-hover + .range-hover:hover .calendar-cell-inner {
190190
&::before {
191-
border-right: 1px solid var(--#{$variable-prefix}calendar-cell-selected-bg);
191+
border-right: 1px dashed var(--#{$variable-prefix}calendar-cell-selected-bg);
192192
@include border-end-radius($border-radius);
193193
}
194194
}
195195

196+
&.range-hover.selected:hover .calendar-cell-inner {
197+
&::before {
198+
border: 0;
199+
}
200+
}
201+
196202
&.selected:not(.previous):not(.next) .calendar-cell-inner,
197203
&.selected:not(.previous):not(.next).start .calendar-cell-inner,
198204
&.selected:not(.previous):not(.next).end .calendar-cell-inner {

scss/_date-picker.scss

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,26 @@
1212
}
1313
}
1414

15+
.date-picker-body {
16+
display: grid;
17+
grid-template-areas:
18+
"ranges calendars"
19+
"ranges timepickers";
20+
grid-template-rows: auto;
21+
grid-template-columns: auto auto;
22+
23+
}
24+
1525
.date-picker-ranges {
26+
grid-area: ranges;
1627
width: var(--#{$variable-prefix}date-picker-ranges-width);
1728
padding: var(--#{$variable-prefix}date-picker-ranges-padding);
1829
border-right: var(--#{$variable-prefix}date-picker-ranges-border);
1930
}
2031

2132
.date-picker-calendars {
2233
display: flex;
34+
grid-area: calendars;
2335

2436
.date-picker-calendar {
2537
&:not(:last-child) {
@@ -54,6 +66,7 @@
5466
.date-picker-timepickers {
5567
display: flex;
5668
flex-wrap: wrap;
69+
grid-area: timepickers;
5770
justify-content: space-between;
5871
border-top: var(--#{$variable-prefix}date-picker-timepicker-border-top);
5972

0 commit comments

Comments
 (0)