Изменила кнопки и аватары

This commit is contained in:
Daria Golova
2022-10-28 13:49:14 +03:00
parent 4c2cce443b
commit fc20bea224
5 changed files with 21 additions and 67 deletions

View File

@@ -1,28 +0,0 @@
<template lang="pug">
button.add-client-button.flex.items-center.justify-center
.icon-wrapper.flex.items-center.justify-center.icon-plus.text-xsm
.icon-wrapper.flex.items-center.justify-center.icon-person.text-m
</template>
<script>
export default {
name: "HeaderAddClientButton",
};
</script>
<style lang="sass" scoped>
.add-client-button
width: 80px
height: 40px
background-color: var(--btn-blue-color)
color: var(--default-white)
border-radius: 4px
&:hover
background-color: var(--btn-blue-color-4)
&:active
background-color: var(--font-dark-blue-color)
.icon-wrapper
width: 24px
height: 24px
</style>

View File

@@ -6,11 +6,11 @@
//- .charge-person-container //- .charge-person-container
//- header-active-client-panel(:info="chargePersonInfo") //- header-active-client-panel(:info="chargePersonInfo")
.flex.ml-auto .flex.ml-auto
header-add-client-button.mr-9 base-button.mr-9(left-icon="icon-plus", :icon-left-size="10", :size="40", right-icon="icon-person", :icon-right-size="18")
button.header-buttons.flex.justify-center.items-center.mr-8.p-0 button.header-buttons.flex.justify-center.items-center.mr-8.p-0
.icon-bell.text-xxl .icon-bell.text-xxl
.flex.justify-centflexer.items-center .flex.justify-centflexer.items-center
BaseAvatar(:size="32").mr-2 base-avatar(:size="32").mr-2
img(:src="avatarSrc") img(:src="avatarSrc")
button.header-buttons button.header-buttons
.icon-down-arrow.text-xxs.flex.justify-center.items-center.p-0 .icon-down-arrow.text-xxs.flex.justify-center.items-center.p-0
@@ -20,11 +20,11 @@
import img from "@/assets/images/avatar.svg"; import img from "@/assets/images/avatar.svg";
import chargePersonAvatar from "@/assets/images/charge-person-avatar.svg"; import chargePersonAvatar from "@/assets/images/charge-person-avatar.svg";
import HeaderInputs from "./HeaderInputs.vue"; import HeaderInputs from "./HeaderInputs.vue";
import HeaderAddClientButton from "./HeaderAddClientButton.vue";
import BaseAvatar from "@/components/base/BaseAvatar"; import BaseAvatar from "@/components/base/BaseAvatar";
import BaseButton from "@/components/base/BaseButton.vue";
export default { export default {
name: "TheHeader", name: "TheHeader",
components: { HeaderInputs, HeaderAddClientButton, BaseAvatar }, components: { HeaderInputs, BaseAvatar, BaseButton },
data() { data() {
return { return {
avatarSrc: img, avatarSrc: img,
@@ -64,10 +64,6 @@ export default {
height: 24px height: 24px
color: var(--font-dark-blue-color) color: var(--font-dark-blue-color)
.avatar-img
width: 32px
height: 32px
.charge-person-container .charge-person-container
position: absolute position: absolute
</style> </style>

View File

@@ -1,20 +0,0 @@
<template lang="pug">
button.arrow-button.flex.items-center.icon-down-arrow.text-base.px-2.pt-3px
</template>
<script>
export default {
name: "ArrowButton",
};
</script>
<style lang="sass" scoped>
.arrow-button
width: 32px
height: 32px
background-color: var(--btn-blue-color-1)
color: var(--btn-blue-color)
border-radius: 50%
&:hover
background-color: var(--btn-blue-color-2)
</style>

View File

@@ -2,10 +2,11 @@
.calendar-column-wrapper.flex.flex-col .calendar-column-wrapper.flex.flex-col
.header.flex.items-center.justify-between.py-2.px-6.top-0 .header.flex.items-center.justify-between.py-2.px-6.top-0
.flex.items-center .flex.items-center
img.avatar-wrapper.mr-2(src="@/assets/images/team-member.svg" alt="Team member") base-avatar.mr-2(:size="32")
img(src="@/assets/images/team-member.svg" alt="Team member")
span.owner-name.font-medium.text-base.mr-6 {{ ownerName }} span.owner-name.font-medium.text-base.mr-6 {{ ownerName }}
img.icon-wrapper.cursor-pointer(src="@/assets/icons/lock.svg") img.icon-wrapper.cursor-pointer(src="@/assets/icons/lock.svg")
base-doc-ok-button base-button.btn(left-icon="icon-doc-ok", :icon-left-size="24", :size="32", secondary)
.body .body
calendar-event-card( calendar-event-card(
v-for="event in dayEvents" v-for="event in dayEvents"
@@ -16,11 +17,12 @@
</template> </template>
<script> <script>
import BaseDocOkButton from "@/components/base/buttons/BaseDocOkButton.vue"; import BaseAvatar from "@/components/base/BaseAvatar";
import BaseButton from "@/components/base/BaseButton.vue";
import CalendarEventCard from "./CalendarEventCard.vue"; import CalendarEventCard from "./CalendarEventCard.vue";
export default { export default {
name: "CalendarColumn", name: "CalendarColumn",
components: { BaseDocOkButton, CalendarEventCard }, components: { CalendarEventCard, BaseButton, BaseAvatar },
props: { props: {
ownerData: Object, ownerData: Object,
dayEvents: Array, dayEvents: Array,
@@ -88,9 +90,9 @@ export default {
position: relative position: relative
z-index: 3 z-index: 3
.avatar-wrapper .btn
width: 32px opacity: 0.5
height: 32px padding: 7px 13px !important
.icon-wrapper .icon-wrapper
width: 24px width: 24px

View File

@@ -1,8 +1,10 @@
<template lang="pug"> <template lang="pug">
.calendar-header-wrapper.flex.items-center.justify-between.py-3.pl-5.pr-6 .calendar-header-wrapper.flex.items-center.justify-between.py-3.pl-5.pr-6
.flex .flex
base-arrow-button.left-arrow.mr-4(@click="previousHandler") base-button.left-arrow.mr-4(left-icon="icon-down-arrow", rounded, secondary,
base-arrow-button.right-arrow.mr-6(@click="nextHandler") :iconLeftSize="16", :size="32", @click="previousHandler")
base-button.right-arrow.mr-6(left-icon="icon-down-arrow", rounded, secondary,
:iconLeftSize="16", :size="32", @click="nextHandler")
.text.flex.items-center .text.flex.items-center
span.font-medium.text-base {{ dateString }} span.font-medium.text-base {{ dateString }}
span.today.font-bold.text-xxs(v-if="isCurrentDate") Сегодня span.today.font-bold.text-xxs(v-if="isCurrentDate") Сегодня
@@ -10,11 +12,11 @@
</template> </template>
<script> <script>
import BaseArrowButton from "@/components/base/buttons/BaseArrowButton.vue"; import BaseButton from "@/components/base/BaseButton.vue";
import CalendarLayoutSwitch from "./CalendarLayoutSwitch.vue"; import CalendarLayoutSwitch from "./CalendarLayoutSwitch.vue";
export default { export default {
name: "CalendarHeader", name: "CalendarHeader",
components: { BaseArrowButton, CalendarLayoutSwitch }, components: { CalendarLayoutSwitch, BaseButton },
props: { props: {
currentDate: Object, currentDate: Object,
isCurrentDate: Boolean, isCurrentDate: Boolean,
@@ -54,9 +56,11 @@ export default {
z-index: 10 z-index: 10
.left-arrow .left-arrow
padding: 3px 4px 0 4px !important
transform: rotate(90deg) transform: rotate(90deg)
.right-arrow .right-arrow
padding: 3px 4px 0 4px !important
transform: rotate(270deg) transform: rotate(270deg)
.text .text