Skip to content

Commit f2a55e3

Browse files
committed
fix(datepicker): no color for today in dark theme (#UIM-769) (#702)
# Conflicts: # packages/mosaic/design-tokens/_variables.scss # packages/mosaic/design-tokens/tokens.ts
1 parent 7d43e55 commit f2a55e3

File tree

5 files changed

+48
-19
lines changed

5 files changed

+48
-19
lines changed

packages/mosaic/core/theming/_components-theming.scss

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,11 @@
117117
state-focused-shadow: $checkbox-light-color-scheme-states-focused-shadow
118118
);
119119

120+
$datepicker: (
121+
state-selected-color: $datepicker-body-light-color-scheme-states-selected-color,
122+
state-selected-background: $datepicker-body-light-color-scheme-states-selected-background
123+
);
124+
120125
$form-field: (
121126
border: $form-field-light-color-scheme-border,
122127
background: $form-field-light-color-scheme-background,
@@ -256,6 +261,7 @@
256261
button: $button,
257262
card: $card,
258263
checkbox: $checkbox,
264+
datepicker: $datepicker,
259265
form-field: $form-field,
260266
forms: $forms,
261267
link: $link,
@@ -389,6 +395,11 @@
389395
state-focused-shadow: $checkbox-dark-color-scheme-states-focused-shadow
390396
);
391397

398+
$datepicker: (
399+
state-selected-color: $datepicker-body-dark-color-scheme-states-selected-color,
400+
state-selected-background: $datepicker-body-dark-color-scheme-states-selected-background
401+
);
402+
392403
$form-field: (
393404
border: $form-field-dark-color-scheme-border,
394405
background: $form-field-dark-color-scheme-background,
@@ -528,6 +539,7 @@
528539
button: $button,
529540
card: $card,
530541
checkbox: $checkbox,
542+
datepicker: $datepicker,
531543
form-field: $form-field,
532544
forms: $forms,
533545
link: $link,

packages/mosaic/datepicker/_datepicker-theme.scss

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,15 @@
66
$mc-datepicker-selected-fade-amount: 0.6;
77
$mc-datepicker-today-fade-amount: 0.2;
88

9-
@mixin _mc-datepicker-color($color) {
10-
.mc-calendar__body-cell-content.mc-selected {
11-
background: $color;
12-
}
13-
14-
.mc-calendar__body_disabled > .mc-selected {
15-
// todo background-color: fade-out($color, $mc-datepicker-selected-fade-amount);
16-
background-color: $color;
17-
}
18-
}
19-
209
@mixin mc-datepicker-theme($theme) {
2110
$foreground: map-get($theme, foreground);
2211
$background: map-get($theme, background);
2312

2413
$primary: map-get($theme, primary);
2514
$second: map-get($theme, second);
2615

16+
$datepicker: map-get(map-get($theme, components), datepicker);
17+
2718
.mc-calendar__table-header {
2819
color: mc-color($second, 400);
2920
}
@@ -71,25 +62,27 @@ $mc-datepicker-today-fade-amount: 0.2;
7162
}
7263

7364
.mc-calendar__body-today {
74-
color: mc-color($primary);
65+
color: map-get($datepicker, state-selected-color);
7566
}
7667

7768
.mc-calendar__body_disabled > .mc-calendar__body-today:not(.mc-selected) {
7869
// todo border-color: fade-out(map-get($foreground, text), $mc-datepicker-today-fade-amount);
7970
border-color: map-get($background, background-disabled);
8071
}
8172

82-
@include _mc-datepicker-color(map-get(map-get($theme, states), selected-color));
73+
.mc-calendar__body-cell-content.mc-selected {
74+
background: map-get($datepicker, state-selected-background);
75+
}
76+
77+
.mc-calendar__body_disabled > .mc-selected {
78+
background-color: map-get($datepicker, state-selected-background);
79+
}
8380

8481
.mc-datepicker__content {
8582
@include popup-params($theme);
8683

8784
color: map-get($foreground, text);
8885
}
89-
90-
.mc-active {
91-
color: mc-color($primary);
92-
}
9386
}
9487

9588
@mixin mc-datepicker-typography($config) {

packages/mosaic/design-tokens/_variables.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
// Do not edit directly
3-
// Generated on Tue, 24 Aug 2021 08:22:45 GMT
3+
// Generated on Thu, 07 Oct 2021 08:29:06 GMT
44

55
$light-color-scheme-primary-default: #338FCC;
66
$light-color-scheme-second-default: #B3B3B3;
@@ -326,6 +326,10 @@ $checkbox-size-toggle-box-shadow: inset 0 0 1px 0 rgba(0, 0, 0, 0.2);
326326
$checkbox-font-default: body;
327327
$datepicker-toggle-size-width: 30px;
328328
$datepicker-toggle-size-height: 30px;
329+
$datepicker-body-light-color-scheme-states-selected-color: #338FCC;
330+
$datepicker-body-light-color-scheme-states-selected-background: #D8EAF7;
331+
$datepicker-body-dark-color-scheme-states-selected-color: #338FCC;
332+
$datepicker-body-dark-color-scheme-states-selected-background: #114E77;
329333
$datepicker-body-size-label-paddings: 8px 28px 12px 12px;
330334
$datepicker-body-size-cell-min-size: 32px;
331335
$datepicker-body-size-cell-margin: 5%;

packages/mosaic/design-tokens/tokens.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* tslint:disable:naming-convention object-literal-key-quotes quotemark whitespace */
22
/**
33
* Do not edit directly
4-
* Generated on Mon, 30 Aug 2021 13:44:07 GMT
4+
* Generated on Thu, 07 Oct 2021 08:29:06 GMT
55
*/
66

77
export const LightColorSchemePrimaryDefault = "#338FCC";
@@ -435,6 +435,10 @@ export const CheckboxSizeToggleBoxShadow = "inset 0 0 1px 0 rgba(0, 0, 0, 0.2)";
435435
export const CheckboxFontDefault = "body";
436436
export const DatepickerToggleSizeWidth = "30px";
437437
export const DatepickerToggleSizeHeight = "30px";
438+
export const DatepickerBodyLightColorSchemeStatesSelectedColor = "#338FCC";
439+
export const DatepickerBodyLightColorSchemeStatesSelectedBackground = "#D8EAF7";
440+
export const DatepickerBodyDarkColorSchemeStatesSelectedColor = "#338FCC";
441+
export const DatepickerBodyDarkColorSchemeStatesSelectedBackground = "#114E77";
438442
export const DatepickerBodySizeLabelPaddings = "8px 28px 12px 12px";
439443
export const DatepickerBodySizeCellMinSize = "32px";
440444
export const DatepickerBodySizeCellMargin = "5%";

packages/mosaic/design-tokens/tokens/components/datepicker.json5

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,22 @@
66
}
77
},
88
'datepicker-body': {
9+
'light-color-scheme': {
10+
states: {
11+
selected: {
12+
color: { value: '{light-color-scheme.primary.default.value}' },
13+
background: { value: '{light-color-scheme.primary.palette.value.100.value}' }
14+
}
15+
}
16+
},
17+
'dark-color-scheme': {
18+
states: {
19+
selected: {
20+
color: { value: '{dark-color-scheme.primary.palette.value.500.value}' },
21+
background: { value: '{dark-color-scheme.primary.palette.value.700.value}' }
22+
}
23+
}
24+
},
925
size: {
1026
label: {
1127
'paddings': { value: '8px 28px 12px 12px' }

0 commit comments

Comments
 (0)