diff --git a/apps/demos/Demos/Scheduler/Overview/Angular/app/app.component.css b/apps/demos/Demos/Scheduler/Overview/Angular/app/app.component.css index afd43782211e..a4c619487f71 100644 --- a/apps/demos/Demos/Scheduler/Overview/Angular/app/app.component.css +++ b/apps/demos/Demos/Scheduler/Overview/Angular/app/app.component.css @@ -1,35 +1,62 @@ +::ng-deep .dx-scheduler-group-header, +::ng-deep .dx-scheduler-date-table-cell { + position: relative; +} + +::ng-deep .dx-color-scheme-light, +::ng-deep .dx-color-scheme-carmine, +::ng-deep .dx-color-scheme-softblue, +::ng-deep .dx-color-scheme-blue-light, +::ng-deep .dx-color-scheme-saas-light, +::ng-deep .dx-color-scheme-lime-light, +::ng-deep .dx-color-scheme-orange-light, +::ng-deep .dx-color-scheme-purple-light, +::ng-deep .dx-color-scheme-teal-light { + --text-color-1: rgba(0, 0, 0, .6); + --text-color-2: rgba(255, 255, 255, 1); + --disabled-color: rgba(0, 0, 0, 0.38); + --background-color-1: rgba(50, 134, 56, 1); + --background-color-2: rgba(194, 81, 0, 1); +} + +::ng-deep .dx-color-scheme-dark, +::ng-deep .dx-color-scheme-darkviolet, +::ng-deep .dx-color-scheme-darkmoon, +::ng-deep .dx-color-scheme-blue-dark, +::ng-deep .dx-color-scheme-saas-dark, +::ng-deep .dx-color-scheme-lime-dark, +::ng-deep .dx-color-scheme-orange-dark, +::ng-deep .dx-color-scheme-purple-dark, +::ng-deep .dx-color-scheme-teal-dark { + --text-color-1: rgba(255, 255, 255, 1); + --text-color-2: rgba(54, 54, 64, 1); + --disabled-color: rgba(255, 255, 255, 0.38); + --background-color-1: rgba(159, 213, 161, 1); + --background-color-2: rgba(255, 181, 127, 1); + +} + +::ng-deep .dx-scheduler-header .dx-toolbar .dx-button, +::ng-deep .dx-scheduler-header .dx-toolbar .dx-button .dx-icon { + color: var(--text-color-1); +} + ::ng-deep .dx-scheduler-date-table-other-month.dx-scheduler-date-table-cell { opacity: 1; - 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); + color: var(--disabled-color) !important; } -::ng-deep .dx-scheduler-group-header-content, -::ng-deep .dx-scheduler-date-table-cell { - position: relative; +::ng-deep .dx-scheduler-work-space-month .dx-scheduler-date-table-cell { + color: var(--text-color-1); +} + +::ng-deep .dx-scheduler-work-space-month .dx-scheduler-appointment { + color: var(--text-color-2); + line-height: 22px; +} + +::ng-deep .dx-scheduler-work-space-month .dx-scheduler-appointment .dx-scheduler-appointment-content { + padding-top: 0; } ::ng-deep .dx-scheduler-date-table-cell .dx-template-wrapper { @@ -39,12 +66,32 @@ padding-right: 6px; } -::ng-deep .avatar { - width: 155px; +::ng-deep .avatar { + width: 124px; float: left; overflow: hidden; position: relative; - height: 125px; + height: 124px; + border: 1px solid rgba(0, 0, 0, 0.24); + border-radius: 50%; + background-color: rgba(255, 255, 255, 1); +} + +::ng-deep .avatar img { + position: relative; + width: 126px; + height: 130px; + object-fit: contain; +} + +::ng-deep .avatar[title="John Heart"] img { + top: 5px; + left: 3px; +} + +::ng-deep .avatar[title="Greta Sims"] img { + top: 5px; + left: -7px; } ::ng-deep .name { @@ -55,52 +102,65 @@ } ::ng-deep .name h2 { - color: #fff; + color: var(--text-color-2); font-size: 28px; text-align: left; - padding: 0 0 5px 175px; + padding: 0 0 0 170px; margin: 0; + height: 40px; + line-height: 40px; } ::ng-deep .info { width: auto; text-align: left; height: 100%; - font-size: 11pt; + font-size: 14px; + line-height: 20px; font-weight: normal; - padding: 25px 20px; + padding: 25px 20px 25px 40px; + color: #707070; +} + +::ng-deep .dx-color-scheme-contrast .info { + color: #fff; } ::ng-deep .day-cell { + width: 100%; height: 100%; background-position: center center; background-repeat: no-repeat; } +::ng-deep .dx-scheduler-appointment { + color: rgba(255, 255, 255, 1); +} + ::ng-deep .employee-1 { - background-color: rgba(86, 202, 133, 0.1); + background-color: rgba(55, 126, 58, 0.08); } ::ng-deep .employee-2 { - background-color: rgba(255, 151, 71, 0.1); + background-color: rgba(194, 81, 0, 0.08); } ::ng-deep .employee-weekend-1 { - background-color: rgba(86, 202, 133, 0.2); + background-color: rgba(55, 126, 58, 0.12); } ::ng-deep .employee-weekend-2 { - background-color: rgba(255, 151, 71, 0.2); + background-color: rgba(194, 81, 0, 0.12); } ::ng-deep .training-background-0 { - background-image: url("../../../../images/gym/icon-abs.png"); + background-image: url("../../../../images/Scheduler/Overview/icon-abs.png"); } ::ng-deep .training-background-1 { - background-image: url("../../../../images/gym/icon-step.png"); + background-image: url("../../../../images/Scheduler/Overview/icon-step.png"); } ::ng-deep .training-background-2 { - background-image: url("../../../../images/gym/icon-fitball.png"); + background-image: url("../../../../images/Scheduler/Overview/icon-fitball.png"); } diff --git a/apps/demos/Demos/Scheduler/Overview/Angular/app/app.component.html b/apps/demos/Demos/Scheduler/Overview/Angular/app/app.component.html index 7e3bb9b44064..2cd0fee88166 100644 --- a/apps/demos/Demos/Scheduler/Overview/Angular/app/app.component.html +++ b/apps/demos/Demos/Scheduler/Overview/Angular/app/app.component.html @@ -8,7 +8,7 @@ [startDayHour]="8" [endDayHour]="18" [showAllDayPanel]="false" - [height]="600" + [height]="710" [groups]="['employeeID']" resourceCellTemplate="resourceCellTemplate" dataCellTemplate="dataCellTemplate" @@ -25,7 +25,7 @@

{{ employee.text }}

-
+
{{ employee.text }} photo
diff --git a/apps/demos/Demos/Scheduler/Overview/Angular/app/app.service.ts b/apps/demos/Demos/Scheduler/Overview/Angular/app/app.service.ts index ccb593f1e824..6a0b62221343 100644 --- a/apps/demos/Demos/Scheduler/Overview/Angular/app/app.service.ts +++ b/apps/demos/Demos/Scheduler/Overview/Angular/app/app.service.ts @@ -27,15 +27,15 @@ export class Data { const employees: Employee[] = [{ text: 'John Heart', id: 1, - color: '#56ca85', - avatar: '../../../../images/gym/coach-man.png', + color: 'var(--background-color-1)', + avatar: '../../../../images/employees/19.png', age: 27, discipline: 'ABS, Fitball, StepFit', }, { - text: 'Sandra Johnson', + text: 'Greta Sims', id: 2, - color: '#ff9747', - avatar: '../../../../images/gym/coach-woman.png', + color: 'var(--background-color-2)', + avatar: '../../../../images/employees/31.png', age: 25, discipline: 'ABS, Fitball, StepFit', }]; diff --git a/apps/demos/Demos/Scheduler/Overview/React/App.tsx b/apps/demos/Demos/Scheduler/Overview/React/App.tsx index efb027610670..87977bb0326e 100644 --- a/apps/demos/Demos/Scheduler/Overview/React/App.tsx +++ b/apps/demos/Demos/Scheduler/Overview/React/App.tsx @@ -20,7 +20,7 @@ const App = () => ( views={views} defaultCurrentView="month" defaultCurrentDate={currentDate} - height={600} + height={710} showAllDayPanel={true} firstDayOfWeek={1} startDayHour={8} diff --git a/apps/demos/Demos/Scheduler/Overview/React/ResourceCell.tsx b/apps/demos/Demos/Scheduler/Overview/React/ResourceCell.tsx index 2ea79a94aa97..99f4f0595e21 100644 --- a/apps/demos/Demos/Scheduler/Overview/React/ResourceCell.tsx +++ b/apps/demos/Demos/Scheduler/Overview/React/ResourceCell.tsx @@ -12,7 +12,7 @@ const ResourceCell = (props: ResourceCellProps) => {

{text}

-
+
{`${text} ( views={views} defaultCurrentView="month" defaultCurrentDate={currentDate} - height={600} + height={710} showAllDayPanel={true} firstDayOfWeek={1} startDayHour={8} diff --git a/apps/demos/Demos/Scheduler/Overview/ReactJs/ResourceCell.js b/apps/demos/Demos/Scheduler/Overview/ReactJs/ResourceCell.js index 61681cc2fceb..6f080eb30b8a 100644 --- a/apps/demos/Demos/Scheduler/Overview/ReactJs/ResourceCell.js +++ b/apps/demos/Demos/Scheduler/Overview/ReactJs/ResourceCell.js @@ -16,7 +16,10 @@ const ResourceCell = (props) => { >

{text}

-
+
{`${text} diff --git a/apps/demos/Demos/Scheduler/Overview/Vue/DataCell.vue b/apps/demos/Demos/Scheduler/Overview/Vue/DataCell.vue index c1b31e2ec7aa..c3e656a2ff4f 100644 --- a/apps/demos/Demos/Scheduler/Overview/Vue/DataCell.vue +++ b/apps/demos/Demos/Scheduler/Overview/Vue/DataCell.vue @@ -43,36 +43,41 @@ function getCurrentTraining(date, employeeID) { diff --git a/apps/demos/Demos/Scheduler/Overview/Vue/ResourceCell.vue b/apps/demos/Demos/Scheduler/Overview/Vue/ResourceCell.vue index 13e00db3a192..e2d3b3ca4ef8 100644 --- a/apps/demos/Demos/Scheduler/Overview/Vue/ResourceCell.vue +++ b/apps/demos/Demos/Scheduler/Overview/Vue/ResourceCell.vue @@ -6,7 +6,7 @@ >

{{ employee.text }}

-
+