admin/astra-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into new_avatar

Browse Source
This commit is contained in:
Kirill Andrusyak
2022-10-27 18:27:20 +03:00
committed by GitHub
parent 3869a64888 d17845edae
commit 8b212d7dbd
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/TheHeader.vue
View File

@@ -3,8 +3,8 @@
.flex.items-center.box-border.cursor-pointer.mr-auto .flex.items-center.box-border.cursor-pointer.mr-auto
img.logo-img.mr-16(src="@/assets/images/logo.svg" alt="Logo") img.logo-img.mr-16(src="@/assets/images/logo.svg" alt="Logo")
header-inputs header-inputs
.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 header-add-client-button.mr-9
button.header-buttons.flex.justify-center.items-center.mr-8.p-0 button.header-buttons.flex.justify-center.items-center.mr-8.p-0
@@ -20,17 +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 HeaderActiveClientPanel from "./HeaderActiveClientPanel.vue";
import HeaderAddClientButton from "./HeaderAddClientButton.vue"; import HeaderAddClientButton from "./HeaderAddClientButton.vue";
import BaseAvatar from "@/components/base/BaseAvatar"; import BaseAvatar from "@/components/base/BaseAvatar";
export default { export default {
name: "TheHeader", name: "TheHeader",
components: { components: { HeaderInputs, HeaderAddClientButton, BaseAvatar },
BaseAvatar,
HeaderInputs,
HeaderActiveClientPanel,
HeaderAddClientButton,
},
data() { data() {
return { return {
avatarSrc: img, avatarSrc: img,

2
src/pages/calendar/components/CalendarSidebar.vue
View File

@@ -38,7 +38,7 @@
.flex.items-center .flex.items-center
img.avatar-wrapper(:src="avatar" alt="Team member") img.avatar-wrapper(:src="avatar" alt="Team member")
.flex.ml-2.not-italic.font-medium.text-xxs {{ changeName(teammate.last_name, teammate.first_name, teammate.patronymic) }} .flex.ml-2.not-italic.font-medium.text-xxs {{ changeName(teammate.last_name, teammate.first_name, teammate.patronymic) }}
span.icon-change-place.cursor-pointer.w-5 span.icon-change-place.cursor-pointer.w-5.flex.items-center.justify-center.w-6.h-6
.button-wrapper.flex.justify-center.mb-23px .button-wrapper.flex.justify-center.mb-23px
base-button(left-icon="icon-long-arrow", rounded, size="40", icon-left-size="18", secondary, :style="{ transform: `rotate(${turnButton})`}", @click="changeSize") base-button(left-icon="icon-long-arrow", rounded, size="40", icon-left-size="18", secondary, :style="{ transform: `rotate(${turnButton})`}", @click="changeSize")
</template> </template>