Skip to content

Commit cb58fcd

Browse files
authored
Scheduler - Form - dynamic subject icon color (DevExpress#31490)
Signed-off-by: Eldar Iusupzhanov <84278206+Tucchhaa@users.noreply.github.com>
1 parent 03caece commit cb58fcd

14 files changed

Lines changed: 149 additions & 61 deletions

File tree

-217 Bytes
Loading
-319 Bytes
Loading
Loading

packages/devextreme-scss/scss/widgets/fluent/scheduler/_colors.scss

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ $scheduler-workspace-accent-color: $base-accent !default;
6464
$scheduler-current-time-cell-color: $base-accent !default;
6565
$scheduler-time-indicator-color: #eb5757 !default;
6666
$scheduler-dd-appointment-hover-text-color: $base-inverted-text-color !default;
67-
$scheduler-form-subject-icon-color: null !default;
6867
$scheduler-form-icon-color: $base-icon-color !default;
6968
$scheduler-popup-title-bg: $scheduler-workspace-background-color !default;
7069
$scheduler-workspace-month-text-color: color.change($base-text-color, $alpha: 0.54) !default;
@@ -90,7 +89,6 @@ $agenda-appointment-text-color: $base-text-color !default;
9089
$header-panel-cell-date: null !default;
9190

9291
@if $mode == "light" {
93-
$scheduler-form-subject-icon-color: lighten(saturate(adjust-hue($base-accent, 3), 2.21), 44.31) !default;
9492
$scheduler-workspace-month-text-color: #707070;
9593
$scheduler-appointment-text-color: #000 !default;
9694
$scheduler-panel-text-color: #707070;
@@ -112,7 +110,6 @@ $header-panel-cell-date: null !default;
112110
}
113111

114112
@if $mode == "dark" {
115-
$scheduler-form-subject-icon-color: darken(desaturate(adjust-hue($base-accent, -3), 11.06), 36.27);
116113
$scheduler-workspace-month-text-color: #999;
117114
$scheduler-appointment-base-color: darken($base-accent, 48%) !default;
118115
$scheduler-appointment-text-color: #fff !default;

packages/devextreme-scss/scss/widgets/fluent/scheduler/_index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ $fluent-scheduler-agenda-time-panel-cell-padding: 8px;
629629
}
630630

631631
.dx-scheduler-form-subject-group .dx-scheduler-form-icon {
632-
color: $scheduler-form-subject-icon-color;
632+
color: $scheduler-appointment-base-color;
633633
}
634634

635635
.dx-scheduler-form-description-group .dx-scheduler-form-icon,

packages/devextreme-scss/scss/widgets/generic/scheduler/_colors.scss

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ $scheduler-current-time-cell-color: $base-accent !default;
6868
$scheduler-time-indicator-color: null !default;
6969
$scheduler-dd-appointment-hover-text-color: null !default;
7070
$scheduler-form-icon-color: $base-icon-color !default;
71-
$scheduler-form-subject-icon-color: null !default;
7271
$scheduler-popup-title-bg: $scheduler-workspace-background-color !default;
7372
$scheduler-workspace-month-text-color: null !default;
7473
$scheduler-dropdown-appointment-date-color: null !default;
@@ -116,7 +115,6 @@ $agenda-appointment-text-color: null !default;
116115
$scheduler-panel-text-color: $base-header-color !default;
117116
$scheduler-time-indicator-color: lighten($scheduler-current-time-cell-color, 15%) !default;
118117
$scheduler-dd-appointment-hover-text-color: $base-inverted-text-color !default;
119-
$scheduler-form-subject-icon-color: darken(desaturate($base-accent, 44.18), 25.88) !default;
120118
$scheduler-workspace-month-text-color: $month-text-color-light !default;
121119
$scheduler-dropdown-appointment-date-color: lighten($base-text-color, 38.5%) !default;
122120
$scheduler-workspace-active-cell-color: $scheduler-accent-border-color !default;
@@ -151,7 +149,6 @@ $agenda-appointment-text-color: null !default;
151149
$scheduler-appointment-base-color: $base-accent !default;
152150
$scheduler-appointment-text-color: $base-text-color !default;
153151
$scheduler-dd-appointment-hover-text-color: $base-inverted-text-color !default;
154-
$scheduler-form-subject-icon-color: $base-accent !default;
155152
$scheduler-appointment-focus-color: extcolor.difference(#fff, $base-text-color) !default;
156153
$scheduler-appointment-start-color: $base-inverted-bg !default;
157154
$scheduler-workspace-focused-cell-color: lighten($base-accent, 5%) !default;
@@ -195,7 +192,6 @@ $agenda-appointment-text-color: null !default;
195192
$scheduler-panel-text-color: $base-text-color !default;
196193
$scheduler-time-indicator-color: lighten($scheduler-current-time-cell-color, 15%) !default;
197194
$scheduler-dd-appointment-hover-text-color: $base-inverted-text-color !default;
198-
$scheduler-form-subject-icon-color: darken(desaturate($base-accent, 44.18), 25.88) !default;
199195
$scheduler-workspace-month-text-color: $month-text-color-dark !default;
200196
$scheduler-dropdown-appointment-date-color: lighten($base-text-color, 38.5%) !default;
201197
$scheduler-workspace-active-cell-color: $scheduler-accent-border-color !default;
@@ -237,7 +233,6 @@ $agenda-appointment-text-color: null !default;
237233
$scheduler-panel-text-color: $base-text-color !default;
238234
$scheduler-time-indicator-color: lighten($scheduler-current-time-cell-color, 15%) !default;
239235
$scheduler-dd-appointment-hover-text-color: #fff !default;
240-
$scheduler-form-subject-icon-color: darken(desaturate($base-accent, 44.18), 25.88) !default;
241236
$scheduler-workspace-month-text-color: $month-text-color-dark !default;
242237
$scheduler-dropdown-appointment-date-color: lighten($base-text-color, 38.5%) !default;
243238
$scheduler-workspace-active-cell-color: $scheduler-accent-border-color !default;
@@ -277,7 +272,6 @@ $agenda-appointment-text-color: null !default;
277272
$scheduler-panel-text-color: $base-header-color !default;
278273
$scheduler-time-indicator-color: lighten($scheduler-current-time-cell-color, 15%) !default;
279274
$scheduler-dd-appointment-hover-text-color: $base-text-color !default;
280-
$scheduler-form-subject-icon-color: darken(desaturate($base-accent, 44.18), 25.88) !default;
281275
$scheduler-workspace-month-text-color: $month-text-color-dark !default;
282276
$scheduler-dropdown-appointment-date-color: lighten($base-text-color, 38.5%) !default;
283277
$scheduler-workspace-active-cell-color: $scheduler-accent-border-color !default;
@@ -317,7 +311,6 @@ $agenda-appointment-text-color: null !default;
317311
$scheduler-panel-text-color: lighten($base-text-color, 38.5%) !default;
318312
$scheduler-time-indicator-color: lighten($scheduler-current-time-cell-color, 15%) !default;
319313
$scheduler-dd-appointment-hover-text-color: $base-inverted-text-color !default;
320-
$scheduler-form-subject-icon-color: lighten(desaturate(adjust-hue($base-accent, 1), 7.32), 43.33) !default;
321314
$scheduler-workspace-month-text-color: lighten($base-text-color, 38.5%) !default;
322315
$scheduler-dropdown-appointment-date-color: lighten($base-text-color, 38.5%) !default;
323316
$scheduler-time-panel-background-color: $scheduler-workspace-background-color !default;
@@ -359,7 +352,6 @@ $agenda-appointment-text-color: null !default;
359352
$scheduler-panel-text-color: $base-text-color !default;
360353
$scheduler-time-indicator-color: lighten($scheduler-current-time-cell-color, 15%) !default;
361354
$scheduler-dd-appointment-hover-text-color: $base-inverted-text-color !default;
362-
$scheduler-form-subject-icon-color: lighten(desaturate(adjust-hue($base-accent, 1), 7.32), 43.33) !default;
363355
$scheduler-workspace-month-text-color: $month-text-color-light !default;
364356
$scheduler-dropdown-appointment-date-color: lighten($base-text-color, 38.5%) !default;
365357
$scheduler-workspace-active-cell-color: $scheduler-accent-border-color !default;
@@ -398,7 +390,6 @@ $agenda-appointment-text-color: null !default;
398390
$scheduler-panel-text-color: $base-text-color !default;
399391
$scheduler-time-indicator-color: lighten($scheduler-current-time-cell-color, 15%) !default;
400392
$scheduler-dd-appointment-hover-text-color: $base-inverted-text-color !default;
401-
$scheduler-form-subject-icon-color: lighten(desaturate(adjust-hue($base-accent, 1), 7.32), 43.33) !default;
402393
$scheduler-workspace-month-text-color: $month-text-color-light !default;
403394
$scheduler-dropdown-appointment-date-color: lighten($base-text-color, 38.5%) !default;
404395
$scheduler-workspace-active-cell-color: $scheduler-accent-border-color !default;

packages/devextreme-scss/scss/widgets/generic/scheduler/_index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ $generic-scheduler-agenda-group-header-padding: $generic-scheduler-agenda-time-c
277277
}
278278

279279
.dx-scheduler-form-subject-group .dx-scheduler-form-icon {
280-
color: $scheduler-form-subject-icon-color;
280+
color: $scheduler-appointment-base-color;
281281
}
282282

283283
.dx-scheduler-form-description-group .dx-scheduler-form-icon,

packages/devextreme-scss/scss/widgets/material/scheduler/_colors.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ $scheduler-current-time-cell-color: $base-accent !default;
6464
$scheduler-time-indicator-color: #eb5757 !default;
6565
$scheduler-dd-appointment-hover-text-color: $base-inverted-text-color !default;
6666
$scheduler-form-icon-color: $base-icon-color !default;
67-
$scheduler-form-subject-icon-color: color.change($base-accent, $alpha: 0.24) !default;
6867
$scheduler-popup-title-bg: $scheduler-workspace-background-color !default;
6968
$scheduler-workspace-month-text-color: color.change($base-text-color, $alpha: 0.54) !default;
7069
$scheduler-dropdown-appointment-date-color: color.change($base-text-color, $alpha: 0.54) !default;

packages/devextreme-scss/scss/widgets/material/scheduler/_index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ $material-scheduler-agenda-time-panel-cell-padding: 8px;
581581
}
582582

583583
.dx-scheduler-form-subject-group .dx-scheduler-form-icon {
584-
color: $scheduler-form-subject-icon-color;
584+
color: $scheduler-appointment-base-color;
585585
}
586586

587587
.dx-scheduler-form-description-group .dx-scheduler-form-icon,

packages/devextreme/js/__internal/scheduler/__tests__/__mock__/model/popup.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ export class PopupModel {
2727
return this.element.querySelector('.dx-scheduler-form-recurrence-group');
2828
}
2929

30+
get subjectIcon(): Element | null {
31+
return this.element.querySelector('.dx-scheduler-form-subject-group .dx-scheduler-form-icon .dx-icon');
32+
}
33+
3034
get startDate(): Element | null {
3135
return this.element.querySelector('.dx-scheduler-form-start-date-editor .dx-datebox.dx-widget');
3236
}

0 commit comments

Comments
 (0)