diff --git a/src/App.vue b/src/App.vue index 00401e8..8723825 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,7 +27,7 @@ html width: 100% line-height: normal body - background-color: var(--bg-lavender-color) + background-color: var(--bg-body-color) margin: 0 padding: 0 diff --git a/src/assets/sass/variables.sass b/src/assets/sass/variables.sass index aae4d93..03030b0 100644 --- a/src/assets/sass/variables.sass +++ b/src/assets/sass/variables.sass @@ -1,5 +1,6 @@ \:root --bg-lavender-color: #e9e9f6 + --bg-body-color: #e8e8f3 --bg-ligth-blue-color: #e6eafc --font-dark-blue-color: #252850 --font-black-color: #090a15 @@ -56,3 +57,5 @@ --pagination-item-shadow: 0 3px 1px -2px rgb(0 0 0 / 20%), 0 2px 2px 0 rgb(0 0 0 / 14%), 0 1px 5px 0 rgb(0 0 0 / 12%) --pagination-current-item-shadow: 0 2px 4px -1px rgb(0 0 0 / 20%), 0 4px 5px 0 rgb(0 0 0 / 14%), 0 1px 10px 0 rgb(0 0 0 / 12%) --bg-disable-grey-color: #f0f0f0 + --bg-grey-color: rgba(37, 40, 80, 0.15) + --bg-aqua-blue: #55c5e8 diff --git a/src/pages/schedule/TheSchedule.vue b/src/pages/schedule/TheSchedule.vue index 7922d70..474e3e0 100644 --- a/src/pages/schedule/TheSchedule.vue +++ b/src/pages/schedule/TheSchedule.vue @@ -6,10 +6,11 @@ :width="60", :height="60" ) - .relative.flex.flex-col.px-6.py-6.h-full.w-full.gap-y-5(v-else) + .relative.flex.flex-col.h-full.w-full.gap-y-7px(v-else) schedule-header( :start-month="startMonth", :change-show-time="changeShowTime", + :change-show-status="changeShowStatus", :show-time="showTime", @switch-previous-month="switchPreviousMonth", @switch-next-month="switchNextMonth" @@ -129,7 +130,10 @@ export default { this.replacementSheet.schedules = e.schedules; }, changeShowTime() { - this.showTime = !this.showTime; + this.showTime = true; + }, + changeShowStatus() { + this.showTime = false; }, trimOwnerName(lastName, firstName, patronymic) { let checkedFirstName = firstName !== null ? firstName[0] + "." : ""; @@ -354,7 +358,6 @@ export default { overflow: auto border-top-left-radius: 4px border-top-right-radius: 4px - background-color: var(--default-white) .schedule-enter-from opacity: 0 diff --git a/src/pages/schedule/components/ScheduleHeader.vue b/src/pages/schedule/components/ScheduleHeader.vue index b318f3b..3d6c83b 100644 --- a/src/pages/schedule/components/ScheduleHeader.vue +++ b/src/pages/schedule/components/ScheduleHeader.vue @@ -1,49 +1,73 @@ + + diff --git a/src/pages/schedule/components/ScheduleTable.vue b/src/pages/schedule/components/ScheduleTable.vue index 86d10ec..24af508 100644 --- a/src/pages/schedule/components/ScheduleTable.vue +++ b/src/pages/schedule/components/ScheduleTable.vue @@ -1,5 +1,23 @@