Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/devextreme-scss/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"author": "Developer Express Inc.",
"license": "SEE LICENSE IN LICENSE.md",
"devDependencies": {
"@devexpress/design-tokens-internal": "262.26.0",
"@devexpress/design-tokens-internal": "262.54.0",
"@stylistic/eslint-plugin": "catalog:",
"@stylistic/stylelint-plugin": "3.1.3",
"@tokens-studio/sd-transforms": "2.0.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,18 @@ $viz-content-orange: ds.$color-content-orange !default;
$viz-content-subtle: ds.$color-content-subtle !default;
$viz-content-subtler: ds.$color-content-subtler !default;
$viz-crosshair: ds.$color-content-red !default;
$viz-danger: ds.$color-bg-danger !default;
$viz-gray-subtle: ds.$color-bg-gray-subtle !default;
$viz-grid: ds.$color-border-subtle !default;
$viz-orange: ds.$color-bg-orange !default;
$viz-primary: ds.$color-bg-primary !default;
$viz-purple: ds.$color-bg-purple !default;
$viz-purple-subtle: ds.$color-bg-purple-subtle !default;
$viz-success: ds.$color-bg-success !default;
$viz-tooltip-bg: ds.$color-bg-inverted !default;
$viz-tooltip-content: ds.$color-content-inverted !default;
$viz-warning: ds.$color-bg-warning !default;
$viz-yellow: ds.$color-bg-yellow !default;

$mention-bg: ds.$color-bg-selected !default;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,18 @@
--dx-viz-content-subtle: #{$viz-content-subtle};
--dx-viz-content-subtler: #{$viz-content-subtler};
--dx-viz-crosshair: #{$viz-crosshair};
--dx-viz-danger: #{$viz-danger};
--dx-viz-gray-subtle: #{$viz-gray-subtle};
--dx-viz-grid: #{$viz-grid};
--dx-viz-orange: #{$viz-orange};
--dx-viz-primary: #{$viz-primary};
--dx-viz-purple: #{$viz-purple};
--dx-viz-purple-subtle: #{$viz-purple-subtle};
--dx-viz-success: #{$viz-success};
--dx-viz-tooltip-bg: #{$viz-tooltip-bg};
--dx-viz-tooltip-content: #{$viz-tooltip-content};
--dx-viz-warning: #{$viz-warning};
--dx-viz-yellow: #{$viz-yellow};

@include links.publish();
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../../../_design-system/variables/ds" as ds;
@use "../colors" as *;

$file-manager-border: ds.$color-border !default;
$file-manager-file-toolbar-bg: ds.$color-bg-canvas !default;
Expand All @@ -18,8 +19,19 @@ $file-manager-file-item-border-focused: ds.$color-border-primary !default;
$file-manager-item-content-focused: ds.$color-content-inverted !default;
$file-manager-dirs-tree-item-bg-focused: ds.$color-bg-active !default;

$file-manager-icon-success-content: #107c10 !default; // dx-data-uri-static: ds.$color-bg-success (mode-invariant)
$file-manager-icon-danger-content: #c50f1f !default; // dx-data-uri-static: ds.$color-bg-danger (mode-invariant)
$file-manager-icon-success-content: null !default;
$file-manager-icon-danger-content: null !default;

@if $mode == "light" {
$file-manager-icon-success-content: #107c10 !default; // dx-data-uri-static: ds.$color-bg-success
$file-manager-icon-danger-content: #c50f1f !default; // dx-data-uri-static: ds.$color-bg-danger
}

@if $mode == "dark" {
$file-manager-icon-success-content: #066f07 !default; // dx-data-uri-static: ds.$color-bg-success
$file-manager-icon-danger-content: #b20017 !default; // dx-data-uri-static: ds.$color-bg-danger
}

$file-manager-icon-static-content: #fff !default; // dx-data-uri-static: ds.$color-content-static-dark (mode-invariant)

$file-manager-drop-zone-placeholder-border: ds.$color-border-primary !default;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ $gantt-content-disabled: ds.$color-content-disabled !default;

$gantt-task-bg: ds.$color-bg-primary-shared !default;
$gantt-parent-task-bg: ds.$color-bg-success !default;
$gantt-parent-task-content: ds.$color-content-on-success !default;
$gantt-task-res-content: ds.$color-content-inverted !default;
$gantt-task-res-bg: ds.$color-bg-inverted !default;
$gantt-task-progress-bg: rgb(from #{ds.$color-bg-inverted} r g b / 0.2) !default;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;

.dx-gantt-titleIn {
color: var(--dx-gantt-parent-task-content);
}

&:not(.dx-gantt-noPrg) .dx-gantt-tPrg {
background-color: var(--dx-gantt-task-progress-bg);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
--dx-gantt-header-item-height: #{$gantt-header-item-height};
--dx-gantt-milestone-size: #{$gantt-milestone-size};
--dx-gantt-parent-task-bg: #{$gantt-parent-task-bg};
--dx-gantt-parent-task-content: #{$gantt-parent-task-content};
--dx-gantt-selection-bg: #{$gantt-selection-bg};
--dx-gantt-si-padding-inline-end: #{$gantt-si-padding-inline-end};
--dx-gantt-si-padding-inline-start: #{$gantt-si-padding-inline-start};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,7 @@
$viz-blue: ds.$color-bg-blue !default;
$viz-gray: ds.$color-bg-gray !default;
$viz-green: ds.$color-bg-green !default;
$viz-orange: ds.$color-bg-orange !default;
$viz-pink: ds.$color-bg-pink !default;
$viz-primary: ds.$color-bg-primary !default;
$viz-purple: ds.$color-bg-purple !default;
$viz-red: ds.$color-bg-red !default;
$viz-yellow: ds.$color-bg-yellow !default;

$viz-danger: ds.$color-bg-danger !default;
$viz-success: ds.$color-bg-success !default;
$viz-warning: ds.$color-bg-warning !default;

$viz-tile-border: ds.$color-content-static-dark !default;
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,14 @@

@mixin publish {
--dx-viz-blue: #{$viz-blue};
--dx-viz-danger: #{$viz-danger};
--dx-viz-export-font-weight: #{$viz-export-font-weight};
--dx-viz-font-weight: #{$viz-font-weight};
--dx-viz-gray: #{$viz-gray};
--dx-viz-green: #{$viz-green};
--dx-viz-label-font-weight: #{$viz-label-font-weight};
--dx-viz-legend-title-font-weight: #{$viz-legend-title-font-weight};
--dx-viz-orange: #{$viz-orange};
--dx-viz-pink: #{$viz-pink};
--dx-viz-primary: #{$viz-primary};
--dx-viz-purple: #{$viz-purple};
--dx-viz-red: #{$viz-red};
--dx-viz-success: #{$viz-success};
--dx-viz-tile-border: #{$viz-tile-border};
--dx-viz-title-font-weight: #{$viz-title-font-weight};
--dx-viz-warning: #{$viz-warning};
--dx-viz-yellow: #{$viz-yellow};
}
13 changes: 12 additions & 1 deletion packages/devextreme-scss/tests/data-uri-mode-parity.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,18 @@ import { join } from 'path';

const artifactsCss = join(__dirname, '..', '..', 'devextreme', 'artifacts', 'css');

const MODE_DEPENDENT: { rule: string; property: string; reason: string }[] = [];
const MODE_DEPENDENT: { rule: string; property: string; reason: string }[] = [
{
rule: '.dx-filemanager-i.dx-filemanager-i-done,.dx-filemanager-i.dx-icon.dx-filemanager-i-done',
property: 'background-image',
reason: 'the icon is painted with ds.$color-bg-success, which the token package gives a different value in the dark mode',
},
{
rule: '.dx-filemanager-i.dx-filemanager-i-danger,.dx-filemanager-i.dx-icon.dx-filemanager-i-danger',
property: 'background-image',
reason: 'the icon is painted with ds.$color-bg-danger, which the token package gives a different value in the dark mode',
},
];

interface Decl {
rule: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1078,6 +1078,7 @@
"--dx-gantt-header-item-height",
"--dx-gantt-milestone-size",
"--dx-gantt-parent-task-bg",
"--dx-gantt-parent-task-content",
"--dx-gantt-selection-bg",
"--dx-gantt-si-padding-inline-end",
"--dx-gantt-si-padding-inline-start",
Expand Down
14 changes: 7 additions & 7 deletions packages/devextreme-scss/tools/naming/viz-contract.json
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,13 @@
{
"name": "--dx-viz-yellow",
"role": "color-bg-yellow",
"declaredPerMode": false,
"declaredPerMode": true,
"paints": "the fourth series colour and the lowest point of a sparkline"
},
{
"name": "--dx-viz-orange",
"role": "color-bg-orange",
"declaredPerMode": false,
"declaredPerMode": true,
"paints": "a map line at rest"
},
{
Expand All @@ -150,31 +150,31 @@
{
"name": "--dx-viz-purple",
"role": "color-bg-purple",
"declaredPerMode": false,
"declaredPerMode": true,
"paints": "the sixth series colour"
},
{
"name": "--dx-viz-success",
"role": "color-bg-success",
"declaredPerMode": false,
"declaredPerMode": true,
"paints": "the good end of an indicating set: the first range of a gauge range container"
},
{
"name": "--dx-viz-warning",
"role": "color-bg-warning",
"declaredPerMode": false,
"declaredPerMode": true,
"paints": "the middle of an indicating set"
},
{
"name": "--dx-viz-danger",
"role": "color-bg-danger",
"declaredPerMode": false,
"declaredPerMode": true,
"paints": "the bad end of an indicating set, and the slider marker of a range selector while the range being dragged is not allowed"
},
{
"name": "--dx-viz-primary",
"role": "color-bg-primary",
"declaredPerMode": false,
"declaredPerMode": true,
"paints": "the range selector: the selected range, the slider handle and its marker. The one place a chart follows --dx-accent-color, because the range selector is an editor and its selection is the accented control of the page it sits on"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ const { getTheme } = publicThemes as unknown as { getTheme: (name: string) => Th

const LITERALS = 'fluent next literals';
const LITERAL_PALETTE = {
simpleSet: ['#0078d4', '#c83d3d', '#008f04', '#eaa300', '#e43ba6', '#865cbf'],
simpleSet: ['#0c69b7', '#c83d3d', '#008f04', '#eaa300', '#e43ba6', '#865cbf'],
indicatingSet: ['#107c10', '#f7630c', '#c50f1f'],
gradientSet: ['#0078d4', '#008f04'],
gradientSet: ['#0c69b7', '#008f04'],
accentColor: '#0f6cbd',
};
const FLUENT_NEXT_THEMES = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ describe('a palette of published names', () => {

it('hands the names themselves to the widget while the palette suffices', () => {
expect(asked(6, 'blend')).toEqual([
'var(--dx-viz-blue, #0078d4)',
'var(--dx-viz-blue, #0c69b7)',
'var(--dx-viz-red, #c83d3d)',
'var(--dx-viz-green, #008f04)',
'var(--dx-viz-yellow, #eaa300)',
Expand All @@ -27,19 +27,19 @@ describe('a palette of published names', () => {
const colors = asked(12, 'alternate');

expect(colors).toHaveLength(12);
expect(colors[6]).toBe('rgb(from var(--dx-viz-blue, #0078d4) calc(r + 50) calc(g + 50) calc(b + 50))');
expect(colors[6]).toBe('rgb(from var(--dx-viz-blue, #0c69b7) calc(r + 50) calc(g + 50) calc(b + 50))');
});

it('fans the cycles out in css when the palette is extrapolated', () => {
const colors = asked(12, 'extrapolate');

expect(colors[0]).toBe('hsl(from var(--dx-viz-blue, #0078d4) h s calc(l + 1 * (max(calc(l - 75), min(50, calc(l * 0.9))) - l)))');
expect(colors[6]).toBe('hsl(from var(--dx-viz-blue, #0078d4) h s calc(l + 1 * (min(calc(l + 75), max(80, calc(l + (100 - l) * 0.15))) - l)))');
expect(colors[0]).toBe('hsl(from var(--dx-viz-blue, #0c69b7) h s calc(l + 1 * (max(calc(l - 75), min(50, calc(l * 0.9))) - l)))');
expect(colors[6]).toBe('hsl(from var(--dx-viz-blue, #0c69b7) h s calc(l + 1 * (min(calc(l + 75), max(80, calc(l + (100 - l) * 0.15))) - l)))');
});

it('keeps the gradient in css too', () => {
expect(getGradientPalette('fluent next', undefined).getColor(0.25))
.toBe('color-mix(in srgb, var(--dx-viz-blue, #0078d4) 75%, var(--dx-viz-green, #008f04))');
.toBe('color-mix(in srgb, var(--dx-viz-blue, #0c69b7) 75%, var(--dx-viz-green, #008f04))');
});

it.each([['test'], [-1], [2], [undefined]])('answers with nothing when the ratio is %s', (ratio) => {
Expand All @@ -50,8 +50,8 @@ describe('a palette of published names', () => {
const discrete = getDiscretePalette('fluent next', 3, undefined);

expect([discrete.getColor(0), discrete.getColor(1), discrete.getColor(2)]).toEqual([
'color-mix(in srgb, var(--dx-viz-blue, #0078d4) 100%, var(--dx-viz-blue, #0078d4))',
'color-mix(in srgb, var(--dx-viz-blue, #0078d4) 50%, var(--dx-viz-green, #008f04))',
'color-mix(in srgb, var(--dx-viz-blue, #0c69b7) 100%, var(--dx-viz-blue, #0c69b7))',
'color-mix(in srgb, var(--dx-viz-blue, #0c69b7) 50%, var(--dx-viz-green, #008f04))',
'color-mix(in srgb, var(--dx-viz-green, #008f04) 100%, var(--dx-viz-green, #008f04))',
]);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ const VIZ_DANGER = '--dx-viz-danger';
const VIZ_BLUE = '--dx-viz-blue';
const VIZ_GRAY = '--dx-viz-gray';
const VIZ_ORANGE = '--dx-viz-orange';
const VIZ_PURPLE = '--dx-viz-purple';
const VIZ_RED = '--dx-viz-red';
const VIZ_SUCCESS = '--dx-viz-success';
const VIZ_WARNING = '--dx-viz-warning';
const VIZ_YELLOW = '--dx-viz-yellow';

const VIZ_TILE_BORDER = '--dx-viz-tile-border';
Expand Down Expand Up @@ -65,10 +68,13 @@ const LIGHT = {

[VIZ_DANGER]: '#c50f1f',

[VIZ_BLUE]: '#0078d4',
[VIZ_GRAY]: '#757575',
[VIZ_BLUE]: '#0c69b7',
[VIZ_GRAY]: '#676767',
[VIZ_ORANGE]: '#f7630c',
[VIZ_PURPLE]: '#865cbf',
[VIZ_RED]: '#c83d3d',
[VIZ_SUCCESS]: '#107c10',
[VIZ_WARNING]: '#f7630c',
[VIZ_YELLOW]: '#eaa300',

[VIZ_TILE_BORDER]: '#ffffff',
Expand All @@ -95,6 +101,16 @@ const DARK: Record<PublishedName, string> = {
[VIZ_PURPLE_SUBTLE]: '#563780',
[VIZ_TOOLTIP_BG]: '#ffffff',
[VIZ_TOOLTIP_CONTENT]: '#161616',

[VIZ_PRIMARY]: '#015fab',

[VIZ_DANGER]: '#b20017',

[VIZ_ORANGE]: '#d25101',
[VIZ_PURPLE]: '#7650ab',
[VIZ_SUCCESS]: '#066f07',
[VIZ_WARNING]: '#d25100',
[VIZ_YELLOW]: '#cd8e00',
};

// eslint-disable-next-line @typescript-eslint/no-explicit-any -- description theme option tree
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/js/__internal/viz/palette.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { normalizeEnum } from '@ts/viz/core/utils';
const FLUENT_NEXT_VIZ = {
primary: 'var(--dx-viz-primary, #0f6cbd)',

blue: 'var(--dx-viz-blue, #0078d4)',
blue: 'var(--dx-viz-blue, #0c69b7)',
red: 'var(--dx-viz-red, #c83d3d)',
green: 'var(--dx-viz-green, #008f04)',
yellow: 'var(--dx-viz-yellow, #eaa300)',
Expand Down
Loading
Loading