Skip to content

Commit f153a58

Browse files
Material & Fluent themes: ensure compliance with color-contrast requirements according to a11y standards (#32162)
1 parent a6f9de8 commit f153a58

946 files changed

Lines changed: 664 additions & 810 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/testcafe_tests.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,22 @@ jobs:
2323
runs-on: devextreme-shr2
2424
outputs:
2525
should-run: ${{ steps.check.outputs.should-run }}
26+
styles-changed: ${{ steps.changes.outputs.styles }}
2627
steps:
28+
- uses: actions/checkout@v4
2729
- name: Check RUN_TESTS flag
2830
id: check
2931
run: echo "should-run=${{ env.RUN_TESTS }}" >> $GITHUB_OUTPUT
3032

33+
- uses: dorny/paths-filter@v3
34+
id: changes
35+
with:
36+
filters: |
37+
styles:
38+
- 'packages/devextreme-scss/**'
39+
- 'packages/devextreme/js/**/themes/**'
40+
- 'e2e/testcafe-devextreme/helpers/accessibility/**'
41+
3142
build:
3243
name: Build DevExtreme
3344
needs: check-should-run
@@ -94,6 +105,9 @@ jobs:
94105
matrix:
95106
ARGS: [
96107
{ componentFolder: "accessibility", name: "accessibility" },
108+
{ componentFolder: "accessibility", name: "accessibility - fluent.dark", theme: 'fluent.blue.dark', styleDependent: true },
109+
{ componentFolder: "accessibility", name: "accessibility - material.light", theme: 'material.blue.light', styleDependent: true },
110+
{ componentFolder: "accessibility", name: "accessibility - material.dark", theme: 'material.blue.dark', styleDependent: true },
97111
{ componentFolder: "common", name: "common" },
98112

99113
{ name: "generic", theme: 'generic.light' },
@@ -177,6 +191,7 @@ jobs:
177191
178192
- name: Run TestCafe tests
179193
working-directory: ./e2e/testcafe-devextreme
194+
if: ${{ !matrix.ARGS.styleDependent || needs.check-should-run.outputs.styles-changed == 'true' }}
180195
env:
181196
NODE_OPTIONS: --max-old-space-size=8192
182197
run: |
Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ jobs:
584584
fi
585585
586586
testcafe-jquery:
587-
needs: [check-should-run, build-devextreme]
587+
needs: [check-should-run, build-devextreme, determine-framework-tests-scope]
588588
if: |
589589
always() &&
590590
needs.check-should-run.outputs.should-run == 'true' &&
@@ -593,7 +593,7 @@ jobs:
593593
fail-fast: false
594594
matrix:
595595
STRATEGY: [screenshots, accessibility]
596-
THEME: ['material.blue.light', 'fluent.blue.light']
596+
THEME: ['material.blue.light', 'fluent.blue.light', 'material.blue.dark', 'fluent.blue.dark']
597597
CONSTEL: [jquery(1/3), jquery(2/3), jquery(3/3), jquery]
598598
exclude:
599599
- STRATEGY: accessibility
@@ -604,6 +604,10 @@ jobs:
604604
CONSTEL: jquery(3/3)
605605
- STRATEGY: screenshots
606606
CONSTEL: jquery
607+
- STRATEGY: screenshots
608+
THEME: 'material.blue.dark'
609+
- STRATEGY: screenshots
610+
THEME: 'fluent.blue.dark'
607611
env:
608612
ACCESSIBILITY_TESTCAFE_REPORT_PATH: "accessibility_testcafe_report"
609613

@@ -691,6 +695,7 @@ jobs:
691695
- name: Run TestCafe tests (jQuery)
692696
shell: bash
693697
working-directory: apps/demos
698+
if: ${{ !contains(matrix.THEME, 'dark') || needs.determine-framework-tests-scope.outputs.framework-tests-scope != 'none' }}
694699
env:
695700
NODE_OPTIONS: --max-old-space-size=8192
696701
STRATEGY: ${{ matrix.STRATEGY }}

apps/demos/Demos/Button/PredefinedTypes/Angular/app/app.component.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
width: 150px;
1919
height: 35px;
2020
font-size: 130%;
21-
opacity: 0.6;
21+
color: var(--dx-color-icon);
2222
text-align: left;
2323
padding-left: 15px;
2424
}

apps/demos/Demos/Button/PredefinedTypes/React/styles.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
width: 150px;
1919
height: 35px;
2020
font-size: 130%;
21-
opacity: 0.6;
21+
color: var(--dx-color-icon);
2222
text-align: left;
2323
padding-left: 15px;
2424
}

apps/demos/Demos/Button/PredefinedTypes/ReactJs/styles.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
width: 150px;
1919
height: 35px;
2020
font-size: 130%;
21-
opacity: 0.6;
21+
color: var(--dx-color-icon);
2222
text-align: left;
2323
padding-left: 15px;
2424
}

apps/demos/Demos/Button/PredefinedTypes/Vue/App.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ function onClick(e: DxButtonTypes.ClickEvent) {
167167
width: 150px;
168168
height: 35px;
169169
font-size: 130%;
170-
opacity: 0.6;
170+
color: var(--dx-color-icon);
171171
text-align: left;
172172
padding-left: 15px;
173173
}

apps/demos/Demos/Button/PredefinedTypes/jQuery/styles.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
width: 150px;
1515
height: 35px;
1616
font-size: 130%;
17-
opacity: 0.6;
17+
color: var(--dx-color-icon);
1818
text-align: left;
1919
padding-left: 15px;
2020
}

apps/demos/Demos/CardView/FieldTemplate/Angular/app/priority/priority.component.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313

1414
.priority--urgent {
15-
color: #f7630c;
15+
color: var(--dx-color-warning);
1616
}
1717

1818
.priority--high {

apps/demos/Demos/CardView/FieldTemplate/React/styles.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
}
2727

2828
.task__priority--urgent {
29-
color: #f7630c;
29+
color: var(--dx-color-warning);
3030
}
3131

3232
.task__priority--high {

apps/demos/Demos/CardView/FieldTemplate/ReactJs/styles.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
}
2727

2828
.task__priority--urgent {
29-
color: #f7630c;
29+
color: var(--dx-color-warning);
3030
}
3131

3232
.task__priority--high {

0 commit comments

Comments
 (0)