From bd7c4eabfc7d43321efa0fd752055d1d75b75645 Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Thu, 13 Oct 2022 11:40:11 +0300 Subject: [PATCH 1/6] =?UTF-8?q?=D0=92=D0=BD=D0=B5=D1=81=D0=BB=D0=B0=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/HeaderInputs.vue | 19 +++++-------------- src/components/TheHeader.vue | 12 +++--------- .../base/buttons/BaseArrowButton.vue | 3 +-- src/main.js | 2 ++ src/pages/calendar/TheCalendar.vue | 1 - tailwind.config.js | 1 + 6 files changed, 12 insertions(+), 26 deletions(-) diff --git a/src/components/HeaderInputs.vue b/src/components/HeaderInputs.vue index 65c813b..6ce9128 100644 --- a/src/components/HeaderInputs.vue +++ b/src/components/HeaderInputs.vue @@ -1,14 +1,14 @@ @@ -55,9 +55,6 @@ export default { width: 24px height: 24px -.loupe - font-size: 21px - .custom-input border: none outline: none @@ -68,7 +65,6 @@ export default { .select-wrapper position: relative z-index: 2 - cursor: pointer .select-input width: 100px @@ -88,7 +84,6 @@ export default { color: var(--font-grey-color) .option-list - cursor: pointer &:last-child margin: 0 &:hover @@ -99,12 +94,8 @@ export default { align-items: center .arrow - font-size: 8px color: var(--btn-blue-color) -.icon-ok - font-size: 13px - .icon-down-arrow width: 16px height: 16px diff --git a/src/components/TheHeader.vue b/src/components/TheHeader.vue index 5c573bf..e1e849e 100644 --- a/src/components/TheHeader.vue +++ b/src/components/TheHeader.vue @@ -1,15 +1,15 @@ -, diff --git a/src/pages/calendar/components/CalendarFormAddEvent.vue b/src/pages/calendar/components/CalendarFormAddEvent.vue index 909e55a..e624a7f 100644 --- a/src/pages/calendar/components/CalendarFormAddEvent.vue +++ b/src/pages/calendar/components/CalendarFormAddEvent.vue @@ -131,7 +131,7 @@ export default { .event-form height: fit-content min-width: 448px - background-color: var(--bg-white-color) + background-color: var(--default-white) box-shadow: -4px -4px 16px rgba(9, 10, 21, 0.25), 4px 4px 16px rgba(9, 10, 21, 0.25) border-radius: 4px .form-item diff --git a/src/pages/calendar/components/CalendarHeader.vue b/src/pages/calendar/components/CalendarHeader.vue index 96f7d25..0ce8935 100644 --- a/src/pages/calendar/components/CalendarHeader.vue +++ b/src/pages/calendar/components/CalendarHeader.vue @@ -22,7 +22,6 @@ export default { data() { return { isToday: true, - selectedLayout: "", }; }, computed: { @@ -39,7 +38,7 @@ export default { }, methods: { changeSelectedLayout(option) { - this.selectedLayout = option; + this.$emit("selectedLayout", option); }, previousHandler() { this.$emit("previous-date"); @@ -60,7 +59,7 @@ export default { diff --git a/src/components/base/BaseSelect.vue b/src/components/base/BaseSelect.vue index 547cc0f..26cfbaf 100644 --- a/src/components/base/BaseSelect.vue +++ b/src/components/base/BaseSelect.vue @@ -1,11 +1,11 @@ + + diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue index 746589f..a08e224 100644 --- a/src/pages/calendar/TheCalendar.vue +++ b/src/pages/calendar/TheCalendar.vue @@ -1,21 +1,29 @@ + + diff --git a/src/pages/calendar/components/CalendarColumn.vue b/src/pages/calendar/components/CalendarColumn.vue new file mode 100644 index 0000000..8385369 --- /dev/null +++ b/src/pages/calendar/components/CalendarColumn.vue @@ -0,0 +1,47 @@ + + + + diff --git a/src/pages/calendar/components/CalendarHeader.vue b/src/pages/calendar/components/CalendarHeader.vue index 0ce8935..930fc1a 100644 --- a/src/pages/calendar/components/CalendarHeader.vue +++ b/src/pages/calendar/components/CalendarHeader.vue @@ -1,5 +1,5 @@ +