diff --git a/src/assets/sass/variables.sass b/src/assets/sass/variables.sass index 4631acd..a3177c6 100644 --- a/src/assets/sass/variables.sass +++ b/src/assets/sass/variables.sass @@ -1,14 +1,19 @@ \:root --bg-lavender-color: #e9e9f6 - --bg-white-color: #f8f8ff --bg-ligth-blue-color: #e6eafc --font-dark-blue-color: #252850 --font-black-color: #090a15 + --font-black-color-0: rgba(9, 10, 21, 0) + --font-black-color-1: rgba(9, 10, 21, 0.5) --btn-blue-color: #4772f2 - --btn-light-blue-color: #c6d2f6 + --btn-blue-color-0: rgba(65, 105, 225, 0) + --btn-blue-color-1: rgba(65, 105, 225, 0.3) + --btn-blue-color-2: rgba(65, 105, 225, 0.5) + --btn-blue-color-3: rgba(65, 105, 225, 0.2) + --btn-blue-color-4: rgba(65, 105, 225, 0.8) --font-grey-color: #9294a7 --border-light-grey-color: #d3d4dc --default-shadow: 4px 4px 8px rgba(9, 10, 21, 0.1), -4px -4px 8px rgba(9, 10, 21, 0.1) --bg-hover-row-table: rgba(215, 217, 255, 0.25) - --default-white: #FFFFFF - --btn-red-color: #FF6F6F + --default-white: #fff + --btn-red-color: #ff6f6f diff --git a/src/components/HeaderInputs.vue b/src/components/HeaderInputs.vue index 65c813b..ecf0497 100644 --- a/src/components/HeaderInputs.vue +++ b/src/components/HeaderInputs.vue @@ -1,15 +1,15 @@ @@ -41,10 +41,8 @@ export default { .arrow transform: rotate(180deg) -.wrapper - background-color: var(--bg-white-color) - display: flex - align-items: center +.header-inputs-wrapper + background-color: var(--default-white) .select-container border-radius: 4px 0 0 4px @@ -55,9 +53,6 @@ export default { width: 24px height: 24px -.loupe - font-size: 21px - .custom-input border: none outline: none @@ -68,14 +63,13 @@ export default { .select-wrapper position: relative z-index: 2 - cursor: pointer .select-input width: 100px .options-wrapper width: 172px - background-color: var(--bg-white-color) + background-color: var(--default-white) color: var(--font-dark-blue-color) border-radius: 4px position: absolute @@ -88,23 +82,14 @@ export default { color: var(--font-grey-color) .option-list - cursor: pointer &:last-child margin: 0 &:hover color: var(--btn-blue-color) -.options-text - display: flex - 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..4e7ea63 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..24be3c8 100644 --- a/src/pages/calendar/components/CalendarFormAddEvent.vue +++ b/src/pages/calendar/components/CalendarFormAddEvent.vue @@ -3,7 +3,7 @@ .flex.flex-col.gap-y-2 .flex.justify-between.pt-2 span.not-italic.text-xs.opacity-40.leading-3 Ответственный - .icon-cancel.close-icon.text-xs(@click="closeEventForm") + .icon-cancel.close-icon.text-xs.cursor-pointer(@click="closeEventForm") base-select( id="responsible" width="205px" @@ -14,15 +14,15 @@ :select-open="openSelectResponsible" ) .flex.flex-col.gap-y-2 - span.not-italic.text-xs.opacity-40.leading-3 Оновная информация + span.not-italic.text-xs.opacity-40.leading-3 Основная информация .flex.gap-x-4.items-center .icon-time.text-xl.icon .flex.gap-x-2.items-center .form-item.flex.gap-x-2.px-4.py-2.items-center - input.item-input.no-italic.text-base(v-model="eventData.timeEvent.firstTime" type="time" min="08:00" max="18:00") + input.item-input.no-italic.text-base.cursor-pointer(v-model="eventData.timeEvent.firstTime" type="time" min="08:00" max="18:00") span — .form-item.flex.gap-x-2.px-4.py-2.items-center - input.item-input.no-italic.text-base(v-model="eventData.timeEvent.secondTime" type="time" min="08:00" max="18:00") + input.item-input.no-italic.text-base.cursor-pointer(v-model="eventData.timeEvent.secondTime" type="time" min="08:00" max="18:00") .flex.gap-x-4.items-center .icon-person.text-xl.icon .form-item.flex.gap-x-2.px-4.py-2.items-center @@ -131,11 +131,10 @@ 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 - cursor: pointer border-radius: 4px width: fit-content background-color: var(--bg-ligth-blue-color) @@ -143,18 +142,18 @@ export default { appearance: none border: none outline: none - cursor: pointer - color: rgba(9, 10, 21, 0.5) - background-color: rgba(9, 10, 21, 0) + color: var(--font-black-color) + background-color: var(--font-black-color-0) &::-webkit-calendar-picker-indicator display: none -webkit-appearance: none + &::placeholder + color: var(--font-black-color-1) .icon width: 24px height: 24px color: var(--font-dark-blue-color) .close-icon - cursor: pointer color: var(--font-dark-blue-color) &:hover color: var(--btn-blue-color) 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 {