diff --git a/src/components/base/BaseCalendar.vue b/src/components/base/BaseCalendar.vue
index 76926cc..13c1f18 100644
--- a/src/components/base/BaseCalendar.vue
+++ b/src/components/base/BaseCalendar.vue
@@ -191,19 +191,21 @@ export default {
border-bottom: 1px solid var(--border-light-grey-color)
.week-item
color: var(--font-grey-color)
-.week-item:nth-last-child(-n+2)
- color: var(--border-red-color)
+ &:nth-last-child(-n+2)
+ color: var(--border-red-color)
.date-active
color: var(--default-white),
background-color: var(--btn-blue-color)
-.date-active:hover
- opacity: 0.5
+ &:hover
+ opacity: 0.5
.date-other
color: var(--font-grey-color)
+ &:hover
+ background-color: var(--border-light-grey-color)
.date-month
color: var(--font-black-color)
-.date-other:hover, .date-month:hover
- background-color: var(--border-light-grey-color)
+ &:hover
+ background-color: var(--border-light-grey-color)
.date-today:hover, .date-range:hover
background-color: var(--btn-blue-color-2)
.date-today
diff --git a/src/pages/newCalendar/components/CalendarColumn.vue b/src/pages/newCalendar/components/CalendarColumn.vue
new file mode 100644
index 0000000..e43f3b8
--- /dev/null
+++ b/src/pages/newCalendar/components/CalendarColumn.vue
@@ -0,0 +1,45 @@
+
+ .calendar-column-wrapper.flex.flex-col
+ .header.flex.flex-col.items-center.justify-center.top-0
+ span.font-bold.text-base.color-black 24 мая
+ span.text-smm.color-grey Понедельник
+
+
+
+
+
diff --git a/src/pages/newCalendar/components/CalendarHeader.vue b/src/pages/newCalendar/components/CalendarHeader.vue
index 9df7aee..27320d0 100644
--- a/src/pages/newCalendar/components/CalendarHeader.vue
+++ b/src/pages/newCalendar/components/CalendarHeader.vue
@@ -63,8 +63,9 @@
diff --git a/src/pages/newCalendar/components/CalendarWrapper.vue b/src/pages/newCalendar/components/CalendarWrapper.vue
index 38a5aec..8c12a73 100644
--- a/src/pages/newCalendar/components/CalendarWrapper.vue
+++ b/src/pages/newCalendar/components/CalendarWrapper.vue
@@ -1,32 +1,32 @@
- .schedule.flex-1.flex.gap-y-1.flex-col(
+ .schedule.flex-1.flex.flex-col(
:style="{width: openSidebar ? 'calc(100vw - 320px)' : 'calc(100vw - 160px)'}"
)
- calendar-header.w-full
- .schedule-body.rounded.h-full.bg-white.w-full
- .w-full(:style="{height: '60px'}")
- .flex.w-full.relative
+ calendar-header.w-full.mb-1
+ .schedule-body.h-full.bg-white.w-full
+ .column-wrapper.flex.ml-20(:style="{width: '3040px'}")
+ calendar-column
+ .flex.w-full.relative.margin
.time-coil-wrapper.left-0.-mt-12
calendar-clock-column(:time-coil="timeCoil")
calendar-background
- // q-scroll-area.rounded(
- :horizontal-thumb-style="thumbStyle",
- :horizontal-bar-style="barStyle",
- visible
- style="height: 100%; max-width: 100%"
- //)
- .flex.bg-red-700.background(:style="{width: '3040px', height: '400px'}")
- .bar-conteiner.w-full.rounded.bg-white.h-8.absolute.bottom-0
+ .w-full.h-3.bg-white.footer