diff --git a/src/pages/schedule/TheSchedule.vue b/src/pages/schedule/TheSchedule.vue index 1b4cf76..ded7da4 100644 --- a/src/pages/schedule/TheSchedule.vue +++ b/src/pages/schedule/TheSchedule.vue @@ -237,5 +237,4 @@ export default { .schedule-wrapper background-color: var(--default-white) - height: calc(100vh - 64px) diff --git a/src/pages/schedule/components/FormChangeShift.vue b/src/pages/schedule/components/FormChangeShift.vue index 9142f44..322bc1f 100644 --- a/src/pages/schedule/components/FormChangeShift.vue +++ b/src/pages/schedule/components/FormChangeShift.vue @@ -9,7 +9,7 @@ .flex.flex-col.gap-y-6 .flex.flex-col.gap-y-2 span.text-smm.font-semibold Дата - base-input-date.input-date + base-input-date .flex.flex-col(class="gap-y-1.5") span.text-smm.font-semibold Текущий сотрудник base-custom-select.h-10(v-model="currentEmployee") @@ -58,7 +58,4 @@ export default { height: 40px border: 1.5px solid var(--border-light-grey-color) border-radius: 4px - -.input-date - border: 1.5px solid var(--border-light-grey-color) diff --git a/src/pages/schedule/components/ScheduleBar.vue b/src/pages/schedule/components/ScheduleBar.vue index 1b795d8..50424a2 100644 --- a/src/pages/schedule/components/ScheduleBar.vue +++ b/src/pages/schedule/components/ScheduleBar.vue @@ -70,6 +70,7 @@ export default { height: 224px border: 1.5px solid var(--border-light-grey-color-1) border-radius: 4px + width: calc(100vw - 136px) .time-wrapper height: 102px diff --git a/src/pages/schedule/components/ScheduleBody.vue b/src/pages/schedule/components/ScheduleBody.vue index 5d1d1ce..4460e7e 100644 --- a/src/pages/schedule/components/ScheduleBody.vue +++ b/src/pages/schedule/components/ScheduleBody.vue @@ -1,8 +1,8 @@ @@ -289,9 +286,14 @@ export default { border: 1.5px solid var(--border-light-grey-color-1) border-radius: 4px border-right: none + border-bottom: none min-height: 87px width: calc(100vw - 136px) +.schedule-wrapper + overflow-y: scroll + max-height: 351px + .schedule-body &:hover background-color: var(--border-light-grey-color-1) @@ -303,8 +305,14 @@ export default { border-top-left-radius: 2px border-top-right-radius: 2px +.schedule-select + border-top: 1.5px solid var(--border-light-grey-color-1) + &:hover + background-color: var(--border-light-grey-color-1) + .column-wrapper overflow: auto + overflow-x: hidden .column-color background-color: var(--bg-white-color-1) @@ -317,9 +325,13 @@ export default { border-bottom: 1.5px solid var(--border-light-grey-color-1) .name + color: var(--btn-blue-color) + border-bottom: 1.5px solid var(--border-light-grey-color-1) + border-right: 1.5px solid var(--border-light-grey-color-1) + +.select-name width: 25% border-right: 1.5px solid var(--border-light-grey-color-1) - color: var(--btn-blue-color) .name-employee width: 25% @@ -347,11 +359,11 @@ export default { content: var(--text-status) .from-date - background-color: limegreen + background-color: limegreen !important .to-date - background-color: red + background-color: red !important .middle-dates - background-color: yellow + background-color: yellow !important