Skip to content

Design System: New Fluent theme (dxdsfluent) powered by design tokens #34509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
EugeniyKiyashko wants to merge 11 commits into
base: main
Choose a base branch
from
Draft

Design System: New Fluent theme (dxdsfluent) powered by design tokens #34509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1a4d70b
Design System: New Fluent theme (dxdsfluent) powered by design tokens
EugeniyKiyashko Jul 27, 2026
b935389
test
pharret31 Jul 28, 2026
ae640bc
review fixes
pharret31 Jul 28, 2026
2615a9c
fix ts
pharret31 Jul 29, 2026
19a74b9
comment unused color variables
pharret31 Jul 29, 2026
d406a35
improve accessibility testing
EugeniyKiyashko Jul 29, 2026
487b92b
fix lint
pharret31 Jul 29, 2026
38967b0
improve accessibility testing
EugeniyKiyashko Jul 29, 2026
83dc712
Merge branch 'feature/26_2_new_fluent_theme_with_design_tokens' of ht…
EugeniyKiyashko Jul 29, 2026
b0a97f3
remove a11y testing of some demos
pharret31 Jul 29, 2026
126b3a4
fix scheduler axe tests
pharret31 Jul 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 19 additions & 1 deletion .github/workflows/build_all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_1]
workflow_dispatch:

concurrency:
Expand Down Expand Up @@ -104,6 +105,23 @@ jobs:
artifacts/npm/*.tgz
retention-days: 1

- name: Build SBOMs
if: ${{ github.event_name == 'push' || github.event.inputs.SBOM == 'true' }}
env:
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
pnpm set //npm.pkg.github.com/:_authToken="$NODE_AUTH_TOKEN";
pnpm nx build sbom;

- name: Upload SBOM artifacts
if: ${{ github.event_name == 'push' || github.event.inputs.SBOM == 'true' }}
uses: actions/upload-artifact@v7
with:
name: sbom
path: |
packages/sbom/dist/**/*
retention-days: 1

custom_bundles:
runs-on: devextreme-shr2
needs: build
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/default_workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches:
- "[0-9][0-9]_[0-9]"

env:
NX_SKIP_NX_CACHE: ${{ contains(github.event.pull_request.labels.*.name, 'skip-cache') && 'true' || 'false' }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/demos_unit_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_1]
workflow_dispatch:

env:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_1]

env:
NX_SKIP_NX_CACHE: ${{ contains(github.event.pull_request.labels.*.name, 'skip-cache') && 'true' || 'false' }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/paths.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_1]

env:
MAX_LENGTH: 170
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/playgrounds_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_1]

env:
NX_SKIP_NX_CACHE: ${{ contains(github.event.pull_request.labels.*.name, 'skip-cache') && 'true' || 'false' }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/qunit_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_1]
workflow_dispatch:

env:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/renovation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_1]

env:
NX_SKIP_NX_CACHE: ${{ contains(github.event.pull_request.labels.*.name, 'skip-cache') && 'true' || 'false' }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/styles.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_1]

env:
NX_SKIP_NX_CACHE: ${{ contains(github.event.pull_request.labels.*.name, 'skip-cache') && 'true' || 'false' }}
Expand Down
14 changes: 12 additions & 2 deletions .github/workflows/testcafe_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_1]
workflow_dispatch:

env:
Expand Down Expand Up @@ -248,6 +249,7 @@ jobs:
style_dependent_matrix=$(cat <<'JSON'
[
{ "componentFolder": "accessibility", "name": "accessibility - fluent.dark", "theme": "fluent.blue.dark", "concurrency": 6 },
{ "componentFolder": "accessibility", "name": "accessibility - dxdsfluent.dark", "theme": "dxdsfluent.blue.dark", "concurrency": 6 },
{ "componentFolder": "accessibility", "name": "accessibility - material.light", "theme": "material.blue.light", "concurrency": 6 },
{ "componentFolder": "accessibility", "name": "accessibility - material.dark", "theme": "material.blue.dark", "concurrency": 6 }
]
Expand All @@ -259,7 +261,15 @@ jobs:
--argjson baseEnd "$base_matrix_end" \
--argjson styleDependent "$style_dependent_matrix" \
--arg stylesChanged "${{ needs.check-should-run.outputs.styles-changed }}" \
'{ include: ($baseStart + (if $stylesChanged == "true" then $styleDependent else [] end) + $baseEnd) }')
'{ include: (
$baseStart
+ (if $stylesChanged == "true" then $styleDependent else [] end)
+ $baseEnd
+ (($baseStart + $baseEnd) | map(
select(.theme == null)
| . + { name: (.name + " - dxdsfluent"), theme: "dxdsfluent.blue.light" }
))
) }')

echo "matrix=$matrix" >> $GITHUB_OUTPUT

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/themebuilder_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_1]

env:
NX_SKIP_NX_CACHE: ${{ contains(github.event.pull_request.labels.*.name, 'skip-cache') && 'true' || 'false' }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ts_declarations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_1]

jobs:
check-ts-bundle:
Expand Down
49 changes: 37 additions & 12 deletions .github/workflows/visual-tests-demos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_1]
workflow_dispatch:

env:
Expand All @@ -21,11 +22,24 @@ jobs:
runs-on: ubuntu-latest
outputs:
should-run: ${{ steps.check.outputs.should-run }}
styles-changed: ${{ steps.changes.outputs.styles }}
steps:
- uses: actions/checkout@v6
- name: Check RUN_TESTS flag
id: check
run: echo "should-run=${{ env.RUN_TESTS }}" >> $GITHUB_OUTPUT

- uses: dorny/paths-filter@v4
id: changes
with:
filters: |
styles:
- 'packages/devextreme-scss/scss/**'
- 'packages/devextreme-scss/icons/**'
- 'packages/devextreme-scss/images/**'
- 'packages/devextreme-scss/fonts/**'
- 'packages/devextreme/js/**/themes/**'

get-changes:
runs-on: ubuntu-latest
needs: check-should-run
Expand Down Expand Up @@ -112,33 +126,44 @@ jobs:
- name: Build matrix
id: matrix
run: |
# Temporarily disabled screenshot shards:
# - material.blue.light: jquery(1/3), jquery(2/3), jquery(3/3)
# - fluent.blue.light: jquery(1/3), jquery(2/3), jquery(3/3)
base_matrix=$(cat <<'JSON'
[
{ "STRATEGY": "screenshots", "THEME": "material.blue.light", "CONSTEL": "jquery(1/3)" },
{ "STRATEGY": "screenshots", "THEME": "material.blue.light", "CONSTEL": "jquery(2/3)" },
{ "STRATEGY": "screenshots", "THEME": "material.blue.light", "CONSTEL": "jquery(3/3)" },
{ "STRATEGY": "screenshots", "THEME": "fluent.blue.light", "CONSTEL": "jquery(1/3)" },
{ "STRATEGY": "screenshots", "THEME": "fluent.blue.light", "CONSTEL": "jquery(2/3)" },
{ "STRATEGY": "screenshots", "THEME": "fluent.blue.light", "CONSTEL": "jquery(3/3)" },
{ "STRATEGY": "screenshots", "THEME": "dxdsfluent.blue.light", "CONSTEL": "jquery(1/9)" },
{ "STRATEGY": "screenshots", "THEME": "dxdsfluent.blue.light", "CONSTEL": "jquery(2/9)" },
{ "STRATEGY": "screenshots", "THEME": "dxdsfluent.blue.light", "CONSTEL": "jquery(3/9)" },
{ "STRATEGY": "screenshots", "THEME": "dxdsfluent.blue.light", "CONSTEL": "jquery(4/9)" },
{ "STRATEGY": "screenshots", "THEME": "dxdsfluent.blue.light", "CONSTEL": "jquery(5/9)" },
{ "STRATEGY": "screenshots", "THEME": "dxdsfluent.blue.light", "CONSTEL": "jquery(6/9)" },
{ "STRATEGY": "screenshots", "THEME": "dxdsfluent.blue.light", "CONSTEL": "jquery(7/9)" },
{ "STRATEGY": "screenshots", "THEME": "dxdsfluent.blue.light", "CONSTEL": "jquery(8/9)" },
{ "STRATEGY": "screenshots", "THEME": "dxdsfluent.blue.light", "CONSTEL": "jquery(9/9)" },
{ "STRATEGY": "accessibility", "THEME": "material.blue.light", "CONSTEL": "jquery" },
{ "STRATEGY": "accessibility", "THEME": "fluent.blue.light", "CONSTEL": "jquery" }
{ "STRATEGY": "accessibility", "THEME": "fluent.blue.light", "CONSTEL": "jquery" },
{ "STRATEGY": "accessibility", "THEME": "dxdsfluent.blue.light", "CONSTEL": "jquery" }
]
JSON
)

dark_accessibility_matrix=$(cat <<'JSON'
[
{ "STRATEGY": "accessibility", "THEME": "material.blue.dark", "CONSTEL": "jquery" },
{ "STRATEGY": "accessibility", "THEME": "fluent.blue.dark", "CONSTEL": "jquery" }
{ "STRATEGY": "accessibility", "THEME": "fluent.blue.dark", "CONSTEL": "jquery" },
{ "STRATEGY": "accessibility", "THEME": "dxdsfluent.blue.dark", "CONSTEL": "jquery" }
]
JSON
)

# Dark accessibility (color-contrast) runs when framework tests are in scope
# OR when styles changed — mirroring the style_dependent_matrix gate in testcafe_tests.yml.
matrix=$(jq -c -n \
--argjson base "$base_matrix" \
--argjson darkAccessibility "$dark_accessibility_matrix" \
--arg frameworkTestsScope "${{ needs.determine-framework-tests-scope.outputs.framework-tests-scope }}" \
'{ include: ($base + (if $frameworkTestsScope != "none" then $darkAccessibility else [] end)) }')
--arg stylesChanged "${{ needs.check-should-run.outputs.styles-changed }}" \
'{ include: ($base + (if $frameworkTestsScope != "none" or $stylesChanged == "true" then $darkAccessibility else [] end)) }')

echo "matrix=$matrix" >> $GITHUB_OUTPUT

Expand Down Expand Up @@ -860,7 +885,7 @@ jobs:
angular(9/10),
angular(10/10),
]
THEME: ['fluent.blue.light']
THEME: ['fluent.blue.light', 'dxdsfluent.blue.light']

runs-on: devextreme-shr2
name: ${{ matrix.CONSTEL }}-screenshots-${{ matrix.THEME }}
Expand Down Expand Up @@ -989,7 +1014,7 @@ jobs:
fail-fast: false
matrix:
CONSTEL: [react, vue, angular]
THEME: ['fluent.blue.light']
THEME: ['fluent.blue.light', 'dxdsfluent.blue.light']

runs-on: devextreme-shr2
name: ${{ matrix.CONSTEL }}-screenshots-${{ matrix.THEME }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/wrapper_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_1]

concurrency:
group: wf-${{github.event.pull_request.number || github.ref || github.sha}}-${{github.workflow}}
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/wrapper_tests_e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ on:
paths-ignore:
- 'apps/**/*.md'
push:
branches: [24_2, 25_*]
merge_group:
branches: [24_2, 25_*, 26_*]
workflow_dispatch:

env:
Expand Down
8 changes: 4 additions & 4 deletions apps/demos/Demos/CardView/FieldTemplate/Angular/app/priority/priority.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions apps/demos/Demos/CardView/FieldTemplate/React/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions apps/demos/Demos/CardView/FieldTemplate/ReactJs/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions apps/demos/Demos/CardView/FieldTemplate/Vue/Priority.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading
Loading