Skip to content
Closed
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 8 additions & 2 deletions .github/workflows/pr-storybook-deploy-manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ jobs:
ref: refs/pull/${{ inputs.pr_number }}/head
fetch-depth: 1

- name: Checkout base repo
if: inputs.action == 'remove'
uses: actions/checkout@v4
with:
fetch-depth: 1

- name: Use Node.js
if: inputs.action == 'deploy'
uses: actions/setup-node@v4
Expand Down Expand Up @@ -81,12 +87,12 @@ jobs:
pnpx nx build devextreme-react-storybook

- name: Deploy/remove PR preview
uses: rossjrw/pr-preview-action@8ff09e486b4c23709012eedd3b42e9f0b95dd0c5 # v1
uses: rossjrw/pr-preview-action@ffa7509e91a3ec8dfc2e5536c4d5c1acdf7a6de9 # v1.8.1
with:
action: ${{ inputs.action }}
pr-number: ${{ inputs.pr_number }}
source-dir: ${{ env.SOURCE_DIR }}
preview-branch: gh-pages
umbrella-dir: preview
comment: false
token: ${{ secrets.GITHUB_TOKEN }}
wait-for-pages-deployment: true
15 changes: 15 additions & 0 deletions .github/workflows/testcafe_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,22 @@ jobs:
runs-on: devextreme-shr2
outputs:
should-run: ${{ steps.check.outputs.should-run }}
styles-changed: ${{ steps.changes.outputs.styles }}
steps:
- uses: actions/checkout@v4
- name: Check RUN_TESTS flag
id: check
run: echo "should-run=${{ env.RUN_TESTS }}" >> $GITHUB_OUTPUT

- uses: dorny/paths-filter@v3
id: changes
with:
filters: |
styles:
- 'packages/devextreme-scss/**'
- 'packages/devextreme/js/**/themes/**'
- 'e2e/testcafe-devextreme/helpers/accessibility/**'

build:
name: Build DevExtreme
needs: check-should-run
Expand Down Expand Up @@ -94,6 +105,9 @@ jobs:
matrix:
ARGS: [
{ componentFolder: "accessibility", name: "accessibility" },
{ componentFolder: "accessibility", name: "accessibility - fluent.dark", theme: 'fluent.blue.dark', styleDependent: true },
{ componentFolder: "accessibility", name: "accessibility - material.light", theme: 'material.blue.light', styleDependent: true },
{ componentFolder: "accessibility", name: "accessibility - material.dark", theme: 'material.blue.dark', styleDependent: true },
{ componentFolder: "common", name: "common" },

{ name: "generic", theme: 'generic.light' },
Expand Down Expand Up @@ -177,6 +191,7 @@ jobs:

- name: Run TestCafe tests
working-directory: ./e2e/testcafe-devextreme
if: ${{ !matrix.ARGS.styleDependent || needs.check-should-run.outputs.styles-changed == 'true' }}
env:
NODE_OPTIONS: --max-old-space-size=8192
run: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ jobs:
fi

testcafe-jquery:
needs: [check-should-run, build-devextreme]
needs: [check-should-run, build-devextreme, determine-framework-tests-scope]
if: |
always() &&
needs.check-should-run.outputs.should-run == 'true' &&
Expand All @@ -593,7 +593,7 @@ jobs:
fail-fast: false
matrix:
STRATEGY: [screenshots, accessibility]
THEME: ['material.blue.light', 'fluent.blue.light']
THEME: ['material.blue.light', 'fluent.blue.light', 'material.blue.dark', 'fluent.blue.dark']
CONSTEL: [jquery(1/3), jquery(2/3), jquery(3/3), jquery]
exclude:
- STRATEGY: accessibility
Expand All @@ -604,6 +604,10 @@ jobs:
CONSTEL: jquery(3/3)
- STRATEGY: screenshots
CONSTEL: jquery
- STRATEGY: screenshots
THEME: 'material.blue.dark'
- STRATEGY: screenshots
THEME: 'fluent.blue.dark'
env:
ACCESSIBILITY_TESTCAFE_REPORT_PATH: "accessibility_testcafe_report"

Expand Down Expand Up @@ -691,6 +695,7 @@ jobs:
- name: Run TestCafe tests (jQuery)
shell: bash
working-directory: apps/demos
if: ${{ !contains(matrix.THEME, 'dark') || needs.determine-framework-tests-scope.outputs.framework-tests-scope != 'none' }}
env:
NODE_OPTIONS: --max-old-space-size=8192
STRATEGY: ${{ matrix.STRATEGY }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
width: 150px;
height: 35px;
font-size: 130%;
opacity: 0.6;
color: var(--dx-color-icon);
text-align: left;
padding-left: 15px;
}
Expand Down
2 changes: 1 addition & 1 deletion apps/demos/Demos/Button/PredefinedTypes/React/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
width: 150px;
height: 35px;
font-size: 130%;
opacity: 0.6;
color: var(--dx-color-icon);
text-align: left;
padding-left: 15px;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
width: 150px;
height: 35px;
font-size: 130%;
opacity: 0.6;
color: var(--dx-color-icon);
text-align: left;
padding-left: 15px;
}
Expand Down
2 changes: 1 addition & 1 deletion apps/demos/Demos/Button/PredefinedTypes/Vue/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ function onClick(e: DxButtonTypes.ClickEvent) {
width: 150px;
height: 35px;
font-size: 130%;
opacity: 0.6;
color: var(--dx-color-icon);
text-align: left;
padding-left: 15px;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
width: 150px;
height: 35px;
font-size: 130%;
opacity: 0.6;
color: var(--dx-color-icon);
text-align: left;
padding-left: 15px;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}

.priority--urgent {
color: #f7630c;
color: var(--dx-color-warning);
}

.priority--high {
Expand Down
2 changes: 1 addition & 1 deletion apps/demos/Demos/CardView/FieldTemplate/React/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
}

.task__priority--urgent {
color: #f7630c;
color: var(--dx-color-warning);
}

.task__priority--high {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
}

.task__priority--urgent {
color: #f7630c;
color: var(--dx-color-warning);
}

.task__priority--high {
Expand Down
2 changes: 1 addition & 1 deletion apps/demos/Demos/CardView/FieldTemplate/Vue/Priority.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const priorityClassName = computed(() =>
}

.task__priority--urgent {
color: #f7630c;
color: var(--dx-color-warning);
}

.task__priority--high {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
}

.task__priority--urgent {
color: #f7630c;
color: var(--dx-color-warning);
}

.task__priority--high {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}

.status--commission {
color: #f7630c;
color: var(--dx-color-warning);
}

.status--terminated {
Expand Down
2 changes: 1 addition & 1 deletion apps/demos/Demos/CardView/Overview/React/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}

.status--commission {
color: #f7630c;
color: var(--dx-color-warning);
}

.status--terminated {
Expand Down
2 changes: 1 addition & 1 deletion apps/demos/Demos/CardView/Overview/ReactJs/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}

.status--commission {
color: #f7630c;
color: var(--dx-color-warning);
}

.status--terminated {
Expand Down
2 changes: 1 addition & 1 deletion apps/demos/Demos/CardView/Overview/Vue/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ const cardView = ref<DxCardView>();
}

.status--commission {
color: #f7630c;
color: var(--dx-color-warning);
}

.status--terminated {
Expand Down
2 changes: 1 addition & 1 deletion apps/demos/Demos/CardView/Overview/jQuery/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}

.status--commission {
color: #f7630c;
color: var(--dx-color-warning);
}

.status--terminated {
Expand Down
3 changes: 2 additions & 1 deletion apps/demos/Demos/Charts/SignalRService/test-code.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
}

::ng-deep .left .list .dx-list-group-header {
color: #f05b41;
font-weight: normal;
font-size: 18px;
}
Expand Down Expand Up @@ -102,5 +101,5 @@
font-size: 11px;
line-height: 12px;
padding-left: 2px;
opacity: 0.7;
color: var(--dx-texteditor-label-color);
}
3 changes: 1 addition & 2 deletions apps/demos/Demos/Common/ListsOverview/React/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
}

.left .list .dx-list-group-header {
color: #f05b41;
font-weight: normal;
font-size: 18px;
}
Expand Down Expand Up @@ -102,5 +101,5 @@
font-size: 11px;
line-height: 12px;
padding-left: 2px;
opacity: 0.7;
color: var(--dx-texteditor-label-color);
}
3 changes: 1 addition & 2 deletions apps/demos/Demos/Common/ListsOverview/ReactJs/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
}

.left .list .dx-list-group-header {
color: #f05b41;
font-weight: normal;
font-size: 18px;
}
Expand Down Expand Up @@ -102,5 +101,5 @@
font-size: 11px;
line-height: 12px;
padding-left: 2px;
opacity: 0.7;
color: var(--dx-texteditor-label-color);
}
3 changes: 1 addition & 2 deletions apps/demos/Demos/Common/ListsOverview/Vue/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
}

.left .list .dx-list-group-header {
color: #f05b41;
font-weight: normal;
font-size: 18px;
}
Expand Down Expand Up @@ -102,5 +101,5 @@
font-size: 11px;
line-height: 12px;
padding-left: 6px;
opacity: 0.7;
color: var(--dx-texteditor-label-color);
}
3 changes: 1 addition & 2 deletions apps/demos/Demos/Common/ListsOverview/jQuery/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
}

.left .list .dx-list-group-header {
color: #f05b41;
font-weight: normal;
font-size: 18px;
}
Expand Down Expand Up @@ -102,5 +101,5 @@
font-size: 11px;
line-height: 12px;
padding-left: 2px;
opacity: 0.7;
color: var(--dx-texteditor-label-color);
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ sup {

::ng-deep .right-content .sub-title {
font-size: 120%;
color: rgba(152, 152, 152, 0.8);
color: var(--dx-texteditor-color-label);
}

::ng-deep .title-container {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ sup {

.right-content .sub-title {
font-size: 120%;
color: rgba(152, 152, 152, 0.8);
color: var(--dx-texteditor-color-label);
}

.title-container {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ sup {

.right-content .sub-title {
font-size: 120%;
color: rgba(152, 152, 152, 0.8);
color: var(--dx-texteditor-color-label);
}

.title-container {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ sup {

.right-content .sub-title {
font-size: 120%;
color: rgba(152, 152, 152, 0.8);
color: var(--dx-texteditor-color-label);
}

.title-container {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ sup {

.right-content .sub-title {
font-size: 120%;
color: rgba(152, 152, 152, 0.8);
color: var(--dx-texteditor-color-label);
}

.title-container {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
}

.label {
color: #767676;
color: var(--dx-texteditor-color-label);
}
2 changes: 1 addition & 1 deletion apps/demos/Demos/ContextMenu/Basics/React/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
}

.label {
color: #767676;
color: var(--dx-texteditor-color-label);
}
2 changes: 1 addition & 1 deletion apps/demos/Demos/ContextMenu/Basics/ReactJs/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
}

.label {
color: #767676;
color: var(--dx-texteditor-color-label);
}
2 changes: 1 addition & 1 deletion apps/demos/Demos/ContextMenu/Basics/Vue/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ function itemClick({ itemData }: DxContextMenuTypes.ItemClickEvent<ContextMenuIt
}

.label {
color: #767676;
color: var(--dx-texteditor-color-label);
}
</style>
Loading
Loading