Test header

From ae640bce09ced5eefed4dcb78dda15e1963b1852 Mon Sep 17 00:00:00 2001 From: Andrei Kharitonov Date: Tue, 28 Jul 2026 17:50:23 +0200 Subject: [PATCH 3/3] review fixes --- .../Angular/app/priority/priority.component.css | 8 ++++---- apps/demos/Demos/CardView/FieldTemplate/React/styles.css | 8 ++++---- .../demos/Demos/CardView/FieldTemplate/ReactJs/styles.css | 8 ++++---- apps/demos/Demos/CardView/FieldTemplate/Vue/Priority.vue | 8 ++++---- apps/demos/Demos/CardView/FieldTemplate/jQuery/styles.css | 8 ++++---- .../Demos/CardView/Overview/Angular/app/app.component.css | 6 +++--- apps/demos/Demos/CardView/Overview/React/styles.css | 6 +++--- apps/demos/Demos/CardView/Overview/ReactJs/styles.css | 6 +++--- apps/demos/Demos/CardView/Overview/Vue/App.vue | 6 +++--- apps/demos/Demos/CardView/Overview/jQuery/styles.css | 6 +++--- .../Demos/DataGrid/Cell/Angular/app/app.component.css | 4 ++-- apps/demos/Demos/DataGrid/Cell/React/styles.css | 4 ++-- apps/demos/Demos/DataGrid/Cell/ReactJs/styles.css | 4 ++-- apps/demos/Demos/DataGrid/Cell/Vue/App.vue | 4 ++-- apps/demos/Demos/DataGrid/Cell/jQuery/styles.css | 4 ++-- .../Demos/Form/SmartPaste/Angular/app/app.component.css | 2 +- apps/demos/Demos/Form/SmartPaste/React/styles.css | 2 +- apps/demos/Demos/Form/SmartPaste/ReactJs/styles.css | 2 +- apps/demos/Demos/Form/SmartPaste/Vue/App.vue | 2 +- apps/demos/Demos/Form/SmartPaste/jQuery/styles.css | 2 +- .../Demos/Splitter/Overview/Angular/app/app.component.css | 2 +- apps/demos/Demos/Splitter/Overview/React/styles.css | 2 +- apps/demos/Demos/Splitter/Overview/ReactJs/styles.css | 2 +- apps/demos/Demos/Splitter/Overview/Vue/PaneContent.vue | 2 +- apps/demos/Demos/Splitter/Overview/jQuery/styles.css | 2 +- .../scss/widgets/dxdsfluent/gantt/_colors.scss | 4 +++- .../scss/widgets/dxdsfluent/textEditor/_colors.scss | 2 +- 27 files changed, 59 insertions(+), 57 deletions(-) diff --git a/apps/demos/Demos/CardView/FieldTemplate/Angular/app/priority/priority.component.css b/apps/demos/Demos/CardView/FieldTemplate/Angular/app/priority/priority.component.css index 34b5d4124b37..63fb9f726bf8 100644 --- a/apps/demos/Demos/CardView/FieldTemplate/Angular/app/priority/priority.component.css +++ b/apps/demos/Demos/CardView/FieldTemplate/Angular/app/priority/priority.component.css @@ -4,19 +4,19 @@ } .priority--low { - color: var(--dx-color-success); + color: var(--dxds-color-content-utility-green-default-rest); } .priority--normal { - color: var(--dx-color-primary); + color: var(--dxds-color-content-utility-blue-default-rest); } .priority--urgent { - color: var(--dx-color-warning); + color: var(--dxds-color-content-utility-yellow-default-rest); } .priority--high { - color: var(--dx-color-danger); + color: var(--dxds-color-content-utility-red-default-rest); } .indicator { diff --git a/apps/demos/Demos/CardView/FieldTemplate/React/styles.css b/apps/demos/Demos/CardView/FieldTemplate/React/styles.css index 251952fd3267..036a224cb917 100644 --- a/apps/demos/Demos/CardView/FieldTemplate/React/styles.css +++ b/apps/demos/Demos/CardView/FieldTemplate/React/styles.css @@ -18,19 +18,19 @@ } .task__priority--low { - color: var(--dx-color-success); + color: var(--dxds-color-content-utility-green-default-rest); } .task__priority--normal { - color: var(--dx-color-primary); + color: var(--dxds-color-content-utility-blue-default-rest); } .task__priority--urgent { - color: var(--dx-color-warning); + color: var(--dxds-color-content-utility-yellow-default-rest); } .task__priority--high { - color: var(--dx-color-danger); + color: var(--dxds-color-content-utility-red-default-rest); } .task__indicator { diff --git a/apps/demos/Demos/CardView/FieldTemplate/ReactJs/styles.css b/apps/demos/Demos/CardView/FieldTemplate/ReactJs/styles.css index 251952fd3267..036a224cb917 100644 --- a/apps/demos/Demos/CardView/FieldTemplate/ReactJs/styles.css +++ b/apps/demos/Demos/CardView/FieldTemplate/ReactJs/styles.css @@ -18,19 +18,19 @@ } .task__priority--low { - color: var(--dx-color-success); + color: var(--dxds-color-content-utility-green-default-rest); } .task__priority--normal { - color: var(--dx-color-primary); + color: var(--dxds-color-content-utility-blue-default-rest); } .task__priority--urgent { - color: var(--dx-color-warning); + color: var(--dxds-color-content-utility-yellow-default-rest); } .task__priority--high { - color: var(--dx-color-danger); + color: var(--dxds-color-content-utility-red-default-rest); } .task__indicator { diff --git a/apps/demos/Demos/CardView/FieldTemplate/Vue/Priority.vue b/apps/demos/Demos/CardView/FieldTemplate/Vue/Priority.vue index 7e48ef837204..3f7408f03de7 100644 --- a/apps/demos/Demos/CardView/FieldTemplate/Vue/Priority.vue +++ b/apps/demos/Demos/CardView/FieldTemplate/Vue/Priority.vue @@ -28,19 +28,19 @@ const priorityClassName = computed(() => } .task__priority--low { - color: var(--dx-color-success); + color: var(--dxds-color-content-utility-green-default-rest); } .task__priority--normal { - color: var(--dx-color-primary); + color: var(--dxds-color-content-utility-blue-default-rest); } .task__priority--urgent { - color: var(--dx-color-warning); + color: var(--dxds-color-content-utility-yellow-default-rest); } .task__priority--high { - color: var(--dx-color-danger); + color: var(--dxds-color-content-utility-red-default-rest); } .task__indicator { diff --git a/apps/demos/Demos/CardView/FieldTemplate/jQuery/styles.css b/apps/demos/Demos/CardView/FieldTemplate/jQuery/styles.css index 766e8352cc55..2c8040ef2169 100644 --- a/apps/demos/Demos/CardView/FieldTemplate/jQuery/styles.css +++ b/apps/demos/Demos/CardView/FieldTemplate/jQuery/styles.css @@ -14,19 +14,19 @@ } .task__priority--low { - color: var(--dx-color-success); + color: var(--dxds-color-content-utility-green-default-rest); } .task__priority--normal { - color: var(--dx-color-primary); + color: var(--dxds-color-content-utility-blue-default-rest); } .task__priority--urgent { - color: var(--dx-color-warning); + color: var(--dxds-color-content-utility-yellow-default-rest); } .task__priority--high { - color: var(--dx-color-danger); + color: var(--dxds-color-content-utility-red-default-rest); } .task__indicator { diff --git a/apps/demos/Demos/CardView/Overview/Angular/app/app.component.css b/apps/demos/Demos/CardView/Overview/Angular/app/app.component.css index 6475d0783ac9..f25ca98b8bdb 100644 --- a/apps/demos/Demos/CardView/Overview/Angular/app/app.component.css +++ b/apps/demos/Demos/CardView/Overview/Angular/app/app.component.css @@ -15,15 +15,15 @@ } .status--salaried { - color: var(--dx-color-success); + color: var(--dxds-color-content-utility-green-default-rest); } .status--commission { - color: var(--dx-color-warning); + color: var(--dxds-color-content-utility-yellow-default-rest); } .status--terminated { - color: var(--dx-color-danger); + color: var(--dxds-color-content-utility-red-default-rest); } .indicator { diff --git a/apps/demos/Demos/CardView/Overview/React/styles.css b/apps/demos/Demos/CardView/Overview/React/styles.css index 6475d0783ac9..f25ca98b8bdb 100644 --- a/apps/demos/Demos/CardView/Overview/React/styles.css +++ b/apps/demos/Demos/CardView/Overview/React/styles.css @@ -15,15 +15,15 @@ } .status--salaried { - color: var(--dx-color-success); + color: var(--dxds-color-content-utility-green-default-rest); } .status--commission { - color: var(--dx-color-warning); + color: var(--dxds-color-content-utility-yellow-default-rest); } .status--terminated { - color: var(--dx-color-danger); + color: var(--dxds-color-content-utility-red-default-rest); } .indicator { diff --git a/apps/demos/Demos/CardView/Overview/ReactJs/styles.css b/apps/demos/Demos/CardView/Overview/ReactJs/styles.css index 6475d0783ac9..f25ca98b8bdb 100644 --- a/apps/demos/Demos/CardView/Overview/ReactJs/styles.css +++ b/apps/demos/Demos/CardView/Overview/ReactJs/styles.css @@ -15,15 +15,15 @@ } .status--salaried { - color: var(--dx-color-success); + color: var(--dxds-color-content-utility-green-default-rest); } .status--commission { - color: var(--dx-color-warning); + color: var(--dxds-color-content-utility-yellow-default-rest); } .status--terminated { - color: var(--dx-color-danger); + color: var(--dxds-color-content-utility-red-default-rest); } .indicator { diff --git a/apps/demos/Demos/CardView/Overview/Vue/App.vue b/apps/demos/Demos/CardView/Overview/Vue/App.vue index dca62c0e82f1..ca223a46e143 100644 --- a/apps/demos/Demos/CardView/Overview/Vue/App.vue +++ b/apps/demos/Demos/CardView/Overview/Vue/App.vue @@ -151,15 +151,15 @@ const cardView = ref(); } .status--salaried { - color: var(--dx-color-success); + color: var(--dxds-color-content-utility-green-default-rest); } .status--commission { - color: var(--dx-color-warning); + color: var(--dxds-color-content-utility-yellow-default-rest); } .status--terminated { - color: var(--dx-color-danger); + color: var(--dxds-color-content-utility-red-default-rest); } .indicator { diff --git a/apps/demos/Demos/CardView/Overview/jQuery/styles.css b/apps/demos/Demos/CardView/Overview/jQuery/styles.css index 6475d0783ac9..f25ca98b8bdb 100644 --- a/apps/demos/Demos/CardView/Overview/jQuery/styles.css +++ b/apps/demos/Demos/CardView/Overview/jQuery/styles.css @@ -15,15 +15,15 @@ } .status--salaried { - color: var(--dx-color-success); + color: var(--dxds-color-content-utility-green-default-rest); } .status--commission { - color: var(--dx-color-warning); + color: var(--dxds-color-content-utility-yellow-default-rest); } .status--terminated { - color: var(--dx-color-danger); + color: var(--dxds-color-content-utility-red-default-rest); } .indicator { diff --git a/apps/demos/Demos/DataGrid/Cell/Angular/app/app.component.css b/apps/demos/Demos/DataGrid/Cell/Angular/app/app.component.css index 50bb63833175..9731160e6a93 100644 --- a/apps/demos/Demos/DataGrid/Cell/Angular/app/app.component.css +++ b/apps/demos/Demos/DataGrid/Cell/Angular/app/app.component.css @@ -17,7 +17,7 @@ } ::ng-deep #gridContainer .inc .diff { - color: var(--dx-color-success); + color: var(--dxds-color-content-utility-green-default-rest); } ::ng-deep #gridContainer .inc .diff::before { @@ -29,7 +29,7 @@ } ::ng-deep #gridContainer .dec .diff { - color: var(--dx-color-danger); + color: var(--dxds-color-content-utility-red-default-rest); } ::ng-deep #gridContainer .inc .diff::after, diff --git a/apps/demos/Demos/DataGrid/Cell/React/styles.css b/apps/demos/Demos/DataGrid/Cell/React/styles.css index 9bb55d414ad6..f0abf63b1631 100644 --- a/apps/demos/Demos/DataGrid/Cell/React/styles.css +++ b/apps/demos/Demos/DataGrid/Cell/React/styles.css @@ -17,7 +17,7 @@ } #gridContainer .inc .diff { - color: var(--dx-color-success); + color: var(--dxds-color-content-utility-green-default-rest); } #gridContainer .inc .diff::before { @@ -29,7 +29,7 @@ } #gridContainer .dec .diff { - color: var(--dx-color-danger); + color: var(--dxds-color-content-utility-red-default-rest); } #gridContainer .inc .diff::after, diff --git a/apps/demos/Demos/DataGrid/Cell/ReactJs/styles.css b/apps/demos/Demos/DataGrid/Cell/ReactJs/styles.css index 9bb55d414ad6..f0abf63b1631 100644 --- a/apps/demos/Demos/DataGrid/Cell/ReactJs/styles.css +++ b/apps/demos/Demos/DataGrid/Cell/ReactJs/styles.css @@ -17,7 +17,7 @@ } #gridContainer .inc .diff { - color: var(--dx-color-success); + color: var(--dxds-color-content-utility-green-default-rest); } #gridContainer .inc .diff::before { @@ -29,7 +29,7 @@ } #gridContainer .dec .diff { - color: var(--dx-color-danger); + color: var(--dxds-color-content-utility-red-default-rest); } #gridContainer .inc .diff::after, diff --git a/apps/demos/Demos/DataGrid/Cell/Vue/App.vue b/apps/demos/Demos/DataGrid/Cell/Vue/App.vue index 0f3bad962866..b0c3f0a3b4e2 100644 --- a/apps/demos/Demos/DataGrid/Cell/Vue/App.vue +++ b/apps/demos/Demos/DataGrid/Cell/Vue/App.vue @@ -80,7 +80,7 @@ import { weekData } from './data.ts'; } #gridContainer .inc .diff { - color: var(--dx-color-success); + color: var(--dxds-color-content-utility-green-default-rest); } #gridContainer .inc .diff::before { @@ -92,7 +92,7 @@ import { weekData } from './data.ts'; } #gridContainer .dec .diff { - color: var(--dx-color-danger); + color: var(--dxds-color-content-utility-red-default-rest); } #gridContainer .inc .diff::after, diff --git a/apps/demos/Demos/DataGrid/Cell/jQuery/styles.css b/apps/demos/Demos/DataGrid/Cell/jQuery/styles.css index 9bb55d414ad6..f0abf63b1631 100644 --- a/apps/demos/Demos/DataGrid/Cell/jQuery/styles.css +++ b/apps/demos/Demos/DataGrid/Cell/jQuery/styles.css @@ -17,7 +17,7 @@ } #gridContainer .inc .diff { - color: var(--dx-color-success); + color: var(--dxds-color-content-utility-green-default-rest); } #gridContainer .inc .diff::before { @@ -29,7 +29,7 @@ } #gridContainer .dec .diff { - color: var(--dx-color-danger); + color: var(--dxds-color-content-utility-red-default-rest); } #gridContainer .inc .diff::after, diff --git a/apps/demos/Demos/Form/SmartPaste/Angular/app/app.component.css b/apps/demos/Demos/Form/SmartPaste/Angular/app/app.component.css index 1d535bc49120..db8d43560ba1 100644 --- a/apps/demos/Demos/Form/SmartPaste/Angular/app/app.component.css +++ b/apps/demos/Demos/Form/SmartPaste/Angular/app/app.component.css @@ -9,7 +9,7 @@ } .instruction { - color: var(--dx-texteditor-color-label); + color: var(--dxds-color-content-neutral-subdued-rest); } .textarea-container { diff --git a/apps/demos/Demos/Form/SmartPaste/React/styles.css b/apps/demos/Demos/Form/SmartPaste/React/styles.css index e59f73d1412c..95f3b69d5aca 100644 --- a/apps/demos/Demos/Form/SmartPaste/React/styles.css +++ b/apps/demos/Demos/Form/SmartPaste/React/styles.css @@ -9,7 +9,7 @@ } .instruction { - color: var(--dx-texteditor-color-label); + color: var(--dxds-color-content-neutral-subdued-rest); } .textarea-container { diff --git a/apps/demos/Demos/Form/SmartPaste/ReactJs/styles.css b/apps/demos/Demos/Form/SmartPaste/ReactJs/styles.css index e59f73d1412c..95f3b69d5aca 100644 --- a/apps/demos/Demos/Form/SmartPaste/ReactJs/styles.css +++ b/apps/demos/Demos/Form/SmartPaste/ReactJs/styles.css @@ -9,7 +9,7 @@ } .instruction { - color: var(--dx-texteditor-color-label); + color: var(--dxds-color-content-neutral-subdued-rest); } .textarea-container { diff --git a/apps/demos/Demos/Form/SmartPaste/Vue/App.vue b/apps/demos/Demos/Form/SmartPaste/Vue/App.vue index 43dcabe6af3b..84fa46a8e73a 100644 --- a/apps/demos/Demos/Form/SmartPaste/Vue/App.vue +++ b/apps/demos/Demos/Form/SmartPaste/Vue/App.vue @@ -274,7 +274,7 @@ onMounted(() => { } .instruction { - color: var(--dx-texteditor-color-label); + color: var(--dxds-color-content-neutral-subdued-rest); } .textarea-container { diff --git a/apps/demos/Demos/Form/SmartPaste/jQuery/styles.css b/apps/demos/Demos/Form/SmartPaste/jQuery/styles.css index ba505451e09c..2f486a9c68e0 100644 --- a/apps/demos/Demos/Form/SmartPaste/jQuery/styles.css +++ b/apps/demos/Demos/Form/SmartPaste/jQuery/styles.css @@ -9,7 +9,7 @@ } .instruction { - color: var(--dx-texteditor-color-label); + color: var(--dxds-color-content-neutral-subdued-rest); } .textarea-container { diff --git a/apps/demos/Demos/Splitter/Overview/Angular/app/app.component.css b/apps/demos/Demos/Splitter/Overview/Angular/app/app.component.css index e2f2229cb057..398a4b1e087f 100644 --- a/apps/demos/Demos/Splitter/Overview/Angular/app/app.component.css +++ b/apps/demos/Demos/Splitter/Overview/Angular/app/app.component.css @@ -23,7 +23,7 @@ } ::ng-deep .pane-option { - color: var(--dx-texteditor-color-label); + color: var(--dxds-color-content-neutral-subdued-rest); font-size: 10px; } diff --git a/apps/demos/Demos/Splitter/Overview/React/styles.css b/apps/demos/Demos/Splitter/Overview/React/styles.css index 21c5dbb1b0c3..22cbcc764fdb 100644 --- a/apps/demos/Demos/Splitter/Overview/React/styles.css +++ b/apps/demos/Demos/Splitter/Overview/React/styles.css @@ -27,7 +27,7 @@ } .pane-option { - color: var(--dx-texteditor-color-label); + color: var(--dxds-color-content-neutral-subdued-rest); font-size: 10px; } diff --git a/apps/demos/Demos/Splitter/Overview/ReactJs/styles.css b/apps/demos/Demos/Splitter/Overview/ReactJs/styles.css index 21c5dbb1b0c3..22cbcc764fdb 100644 --- a/apps/demos/Demos/Splitter/Overview/ReactJs/styles.css +++ b/apps/demos/Demos/Splitter/Overview/ReactJs/styles.css @@ -27,7 +27,7 @@ } .pane-option { - color: var(--dx-texteditor-color-label); + color: var(--dxds-color-content-neutral-subdued-rest); font-size: 10px; } diff --git a/apps/demos/Demos/Splitter/Overview/Vue/PaneContent.vue b/apps/demos/Demos/Splitter/Overview/Vue/PaneContent.vue index a2953446a99c..48b820775ac4 100644 --- a/apps/demos/Demos/Splitter/Overview/Vue/PaneContent.vue +++ b/apps/demos/Demos/Splitter/Overview/Vue/PaneContent.vue @@ -63,7 +63,7 @@ const filteredData = computed(() => Object.fromEntries( } .pane-option { - color: var(--dx-texteditor-color-label); + color: var(--dxds-color-content-neutral-subdued-rest); font-size: 10px; } diff --git a/apps/demos/Demos/Splitter/Overview/jQuery/styles.css b/apps/demos/Demos/Splitter/Overview/jQuery/styles.css index 14b1d58d9673..59d219e4224e 100644 --- a/apps/demos/Demos/Splitter/Overview/jQuery/styles.css +++ b/apps/demos/Demos/Splitter/Overview/jQuery/styles.css @@ -23,7 +23,7 @@ } .pane-option { - color: var(--dx-texteditor-color-label); + color: var(--dxds-color-content-neutral-subdued-rest); font-size: 10px; } diff --git a/packages/devextreme-scss/scss/widgets/dxdsfluent/gantt/_colors.scss b/packages/devextreme-scss/scss/widgets/dxdsfluent/gantt/_colors.scss index d0219ba4919e..f7b040af7337 100644 --- a/packages/devextreme-scss/scss/widgets/dxdsfluent/gantt/_colors.scss +++ b/packages/devextreme-scss/scss/widgets/dxdsfluent/gantt/_colors.scss @@ -13,13 +13,16 @@ $gantt-collapsable-row-bg: ds.$color-surface-neutral-deep-rest !default; * marker. See DIVERGENCES.md. */ $gantt-icon-color: null !default; +$gantt-accent: null !default; @if $mode == "light" { $gantt-icon-color: #161616 !default; // dx-data-uri-static: ds.$color-content-neutral-default-rest + $gantt-accent: ds.$color-surface-primary-default-rest !default; } @if $mode == "dark" { $gantt-icon-color: #fff !default; // dx-data-uri-static: ds.$color-content-neutral-default-rest + $gantt-accent: #3c92e9 !default; // dx-data-uri-static: ds.$color-surface-primary-default-rest } $gantt-parent-task-background-color: ds.$color-surface-success-default-rest !default; $gantt-task-color: ds.$color-content-neutral-default-inverted-rest !default; @@ -27,7 +30,6 @@ $gantt-task-background-color: ds.$color-surface-neutral-default-inverted-rest !d $gantt-task-progress-background-color: rgb(from #{ds.$color-surface-neutral-default-inverted-rest} r g b / 0.2) !default; // Theme-layer values used by this widget's style files (phase 0.5 layer normalization) -$gantt-accent: ds.$color-surface-primary-default-rest !default; $gantt-bg: ds.$color-surface-neutral-default-rest !default; $gantt-border-color: ds.$color-border-neutral-default-rest !default; $gantt-text-color: ds.$color-content-neutral-default-rest !default; diff --git a/packages/devextreme-scss/scss/widgets/dxdsfluent/textEditor/_colors.scss b/packages/devextreme-scss/scss/widgets/dxdsfluent/textEditor/_colors.scss index 1032ee85e9ba..9abc788ad8ce 100644 --- a/packages/devextreme-scss/scss/widgets/dxdsfluent/textEditor/_colors.scss +++ b/packages/devextreme-scss/scss/widgets/dxdsfluent/textEditor/_colors.scss @@ -5,7 +5,7 @@ $texteditor-color: ds.$text-input-color-default-content-rest !default; -$texteditor-placeholder-color: ds.$text-content-color-default-placeholder-rest !default; +$texteditor-placeholder-color: ds.$color-content-neutral-subdued-rest !default; $texteditor-outlined-bg: ds.$text-input-color-default-bg-rest !default;