Skip to content

Commit

Permalink
Merge branch '24_2' of https://github.com/DevExpress/DevExtreme into …
Browse files Browse the repository at this point in the history 
…24_2_ng_ci_testing_v2
  • Loading branch information
@GoodDayForSurf
GoodDayForSurf committed Nov 7, 2024
2 parents 4d406db + 8b6d1ba commit e0229a9
Show file tree
Hide file tree
Showing 92 changed files with 1,145 additions and 268 deletions.
12 changes: 6 additions & 6 deletions apps/demos/Demos/Scheduler/CellTemplates/Angular/app/app.component.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
background-image:
repeating-linear-gradient(
135deg,
rgba(244, 67, 54, 0.1),
rgba(244, 67, 54, 0.1) 4px,
rgba(247, 234, 224, 1),
rgba(247, 234, 224, 1) 4px,
transparent 4px,
transparent 9px
);
color: #9b6467;
color: rgba(178, 74, 0, 1);
}

::ng-deep .dx-scheduler-header-panel-cell .disable-date {
Expand All @@ -42,11 +42,11 @@
}

.dinner {
background: rgba(255, 193, 7, 0.2);
background: #FBF1EB;
}

::ng-deep .dx-scheduler-time-panel-cell .dinner {
color: rgba(255, 193, 7);
color: #C25100;
font-weight: 400;
background: transparent;
}
Expand All @@ -64,7 +64,7 @@
-webkit-mask-position-y: 50%;
-webkit-mask-position-x: 100%;
margin-top: -4px;
background-color: #ffc107;
background-color: #C25100;
}

::ng-deep .dx-scheduler-date-table-cell {
Expand Down
12 changes: 6 additions & 6 deletions apps/demos/Demos/Scheduler/CellTemplates/React/styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
background-image:
repeating-linear-gradient(
135deg,
rgba(244, 67, 54, 0.1),
rgba(244, 67, 54, 0.1) 4px,
rgba(247, 234, 224, 1),
rgba(247, 234, 224, 1) 4px,
transparent 4px,
transparent 9px
);
color: #9b6467;
color: rgba(178, 74, 0, 1);
}

.dx-scheduler-header-panel-cell .disable-date {
Expand All @@ -42,11 +42,11 @@
}

.dinner {
background: rgba(255, 193, 7, 0.2);
background: #FBF1EB;
}

.dx-scheduler-time-panel-cell .dinner {
color: rgba(255, 193, 7);
color: #C25100;
font-weight: 400;
background: transparent;
}
Expand All @@ -64,7 +64,7 @@ td.dx-scheduler-time-panel-cell .dinner .cafe {
-webkit-mask-position-y: 50%;
-webkit-mask-position-x: 100%;
margin-top: -4px;
background-color: #ffc107;
background-color: #C25100;
}

.dx-scheduler-date-table-cell {
Expand Down
12 changes: 6 additions & 6 deletions apps/demos/Demos/Scheduler/CellTemplates/ReactJs/styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
background-image:
repeating-linear-gradient(
135deg,
rgba(244, 67, 54, 0.1),
rgba(244, 67, 54, 0.1) 4px,
rgba(247, 234, 224, 1),
rgba(247, 234, 224, 1) 4px,
transparent 4px,
transparent 9px
);
color: #9b6467;
color: rgba(178, 74, 0, 1);
}

.dx-scheduler-header-panel-cell .disable-date {
Expand All @@ -42,11 +42,11 @@
}

.dinner {
background: rgba(255, 193, 7, 0.2);
background: #FBF1EB;
}

.dx-scheduler-time-panel-cell .dinner {
color: rgba(255, 193, 7);
color: #C25100;
font-weight: 400;
background: transparent;
}
Expand All @@ -64,7 +64,7 @@ td.dx-scheduler-time-panel-cell .dinner .cafe {
-webkit-mask-position-y: 50%;
-webkit-mask-position-x: 100%;
margin-top: -4px;
background-color: #ffc107;
background-color: #C25100;
}

.dx-scheduler-date-table-cell {
Expand Down
12 changes: 6 additions & 6 deletions apps/demos/Demos/Scheduler/CellTemplates/Vue/styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
background-image:
repeating-linear-gradient(
135deg,
rgba(244, 67, 54, 0.1),
rgba(244, 67, 54, 0.1) 4px,
rgba(247, 234, 224, 1),
rgba(247, 234, 224, 1) 4px,
transparent 4px,
transparent 9px
);
color: #9b6467;
color: rgba(178, 74, 0, 1);
}

.dx-scheduler-header-panel-cell .disable-date {
Expand All @@ -42,11 +42,11 @@
}

.dinner {
background: rgba(255, 193, 7, 0.2);
background: #FBF1EB;
}

.dx-scheduler-time-panel-cell .dinner {
color: rgba(255, 193, 7);
color: #C25100;
font-weight: 400;
background: transparent;
}
Expand All @@ -64,7 +64,7 @@ td.dx-scheduler-time-panel-cell .dinner .cafe {
-webkit-mask-position-y: 50%;
-webkit-mask-position-x: 100%;
margin-top: -4px;
background-color: #ffc107;
background-color: #C25100;
}

.dx-scheduler-date-table-cell {
Expand Down
12 changes: 6 additions & 6 deletions apps/demos/Demos/Scheduler/CellTemplates/jQuery/styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
background-image:
repeating-linear-gradient(
135deg,
rgba(244, 67, 54, 0.1),
rgba(244, 67, 54, 0.1) 4px,
rgba(247, 234, 224, 1),
rgba(247, 234, 224, 1) 4px,
transparent 4px,
transparent 9px
);
color: #9b6467;
color: rgba(178, 74, 0, 1);
}

.dx-scheduler-header-panel-cell .disable-date {
Expand All @@ -42,11 +42,11 @@
}

.dinner {
background: rgba(255, 193, 7, 0.2);
background: #FBF1EB;
}

.dx-scheduler-time-panel-cell .dinner {
color: rgba(255, 193, 7);
color: #C25100;
font-weight: 400;
background: transparent;
}
Expand All @@ -64,7 +64,7 @@ td.dx-scheduler-time-panel-cell .dinner .cafe {
-webkit-mask-position-y: 50%;
-webkit-mask-position-x: 100%;
margin-top: -4px;
background-color: #ffc107;
background-color: #C25100;
}

.dx-scheduler-date-table-cell {
Expand Down
26 changes: 25 additions & 1 deletion apps/demos/Demos/Scheduler/Overview/Angular/app/app.component.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,30 @@
::ng-deep .dx-scheduler-date-table-other-month.dx-scheduler-date-table-cell {
opacity: 1;
color: rgba(0, 0, 0, 0.3);
color: rgba(0, 0, 0, 0.3) !important;
}

::ng-deep .dx-color-scheme-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
::ng-deep .dx-color-scheme-carmine .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
::ng-deep .dx-color-scheme-softblue .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
::ng-deep .dx-color-scheme-blue-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
::ng-deep .dx-color-scheme-saas-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
::ng-deep .dx-color-scheme-lime-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
::ng-deep .dx-color-scheme-orange-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
::ng-deep .dx-color-scheme-purple-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
::ng-deep .dx-color-scheme-teal-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell {
color: rgba(0, 0, 0, .6);
}

::ng-deep .dx-color-scheme-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
::ng-deep .dx-color-scheme-darkviolet .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
::ng-deep .dx-color-scheme-darkmoon .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
::ng-deep .dx-color-scheme-blue-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
::ng-deep .dx-color-scheme-saas-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
::ng-deep .dx-color-scheme-lime-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
::ng-deep .dx-color-scheme-orange-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
::ng-deep .dx-color-scheme-purple-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
::ng-deep .dx-color-scheme-teal-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell {
color: rgba(255, 255, 255, 1);
}

::ng-deep .dx-scheduler-group-header-content,
Expand Down
26 changes: 25 additions & 1 deletion apps/demos/Demos/Scheduler/Overview/React/styles.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,30 @@
.dx-scheduler-date-table-other-month.dx-scheduler-date-table-cell {
opacity: 1;
color: rgba(0, 0, 0, 0.3);
color: rgba(0, 0, 0, 0.3) !important;
}

.dx-color-scheme-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-carmine .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-softblue .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-blue-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-saas-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-lime-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-orange-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-purple-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-teal-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell {
color: rgba(0, 0, 0, .6);
}

.dx-color-scheme-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-darkviolet .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-darkmoon .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-blue-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-saas-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-lime-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-orange-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-purple-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-teal-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell {
color: rgba(255, 255, 255, 1);
}

.dx-template-wrapper,
Expand Down
26 changes: 25 additions & 1 deletion apps/demos/Demos/Scheduler/Overview/ReactJs/styles.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,30 @@
.dx-scheduler-date-table-other-month.dx-scheduler-date-table-cell {
opacity: 1;
color: rgba(0, 0, 0, 0.3);
color: rgba(0, 0, 0, 0.3) !important;
}

.dx-color-scheme-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-carmine .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-softblue .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-blue-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-saas-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-lime-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-orange-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-purple-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-teal-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell {
color: rgba(0, 0, 0, .6);
}

.dx-color-scheme-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-darkviolet .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-darkmoon .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-blue-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-saas-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-lime-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-orange-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-purple-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-teal-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell {
color: rgba(255, 255, 255, 1);
}

.dx-template-wrapper,
Expand Down
26 changes: 25 additions & 1 deletion apps/demos/Demos/Scheduler/Overview/Vue/App.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,31 @@ const dataSource = data;
.dx-scheduler-date-table-other-month.dx-scheduler-date-table-cell {
opacity: 1;
color: rgba(0, 0, 0, 0.3);
color: rgba(0, 0, 0, 0.3) !important;
}
.dx-color-scheme-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-carmine .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-softblue .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-blue-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-saas-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-lime-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-orange-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-purple-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-teal-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell {
color: rgba(0, 0, 0, .6);
}
.dx-color-scheme-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-darkviolet .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-darkmoon .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-blue-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-saas-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-lime-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-orange-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-purple-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-teal-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell {
color: rgba(255, 255, 255, 1);
}
.dx-scheduler-date-table-cell .dx-template-wrapper {
Expand Down
26 changes: 25 additions & 1 deletion apps/demos/Demos/Scheduler/Overview/jQuery/styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,31 @@

.dx-scheduler-date-table-other-month.dx-scheduler-date-table-cell {
opacity: 1;
color: rgba(0, 0, 0, 0.3);
color: rgba(0, 0, 0, 0.3) !important;
}

.dx-color-scheme-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-carmine .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-softblue .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-blue-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-saas-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-lime-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-orange-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-purple-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-teal-light .dx-scheduler-work-space-month .dx-scheduler-date-table-cell {
color: rgba(0, 0, 0, .6);
}

.dx-color-scheme-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-darkviolet .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-darkmoon .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-blue-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-saas-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-lime-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-orange-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-purple-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell,
.dx-color-scheme-teal-dark .dx-scheduler-work-space-month .dx-scheduler-date-table-cell {
color: rgba(255, 255, 255, 1);
}

.dx-scheduler-date-table-cell .dx-template-wrapper {
Expand Down
Binary file modified apps/demos/testing/etalons/Scheduler-CellTemplates (fluent.blue.light).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/demos/testing/etalons/Scheduler-CellTemplates (material.blue.light).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/demos/testing/etalons/Scheduler-CellTemplates.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/demos/testing/etalons/Scheduler-Overview (fluent.blue.light).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/demos/testing/etalons/Scheduler-Overview (material.blue.light).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/demos/testing/etalons/Scheduler-Overview.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...uler/etalons/scheduler_CellTemplates_view_dates_changed (fluent.blue.light).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...er/etalons/scheduler_CellTemplates_view_dates_changed (material.blue.light).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...esting/widgets/scheduler/etalons/scheduler_CellTemplates_view_dates_changed.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .../widgets/scheduler/etalons/scheduler_overview_selection (fluent.blue.light).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...idgets/scheduler/etalons/scheduler_overview_selection (material.blue.light).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/demos/testing/widgets/scheduler/etalons/scheduler_overview_selection.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion apps/react-storybook/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"license": "ISC",
"dependencies": {
"devextreme": "workspace:~24.2.0",
"devextreme-react": "workspace:~24.2.0"
"devextreme-react": "workspace:~24.2.0",
"inferno": "^7.4.9"
},
"devDependencies": {
"@storybook/addon-essentials": "7.6.19",
Expand Down
Loading

0 comments on commit e0229a9

Please sign in to comment.