Merge pull request #47 from dderbentsov/UC-11

Изменила img на icon font
This commit is contained in:
Daria Golova
2022-10-19 18:52:17 +03:00
committed by GitHub
5 changed files with 14 additions and 9 deletions

View File

@@ -7,19 +7,19 @@
.icon-wrapper.icon-down-arrow.flex.items-center.justify-center.text-xxs(@click="changeState") .icon-wrapper.icon-down-arrow.flex.items-center.justify-center.text-xxs(@click="changeState")
.options.flex.flex-col.p-4.mt-1.font-medium.text-sm.gap-y-3(v-if="isOpen") .options.flex.flex-col.p-4.mt-1.font-medium.text-sm.gap-y-3(v-if="isOpen")
.flex.items-center .flex.items-center
img.options-icon-wrapper.mr-2(src="@/assets/icons/white-star.svg") .options-icon-wrapper.icon-star-off.flex.items-center.justify-center.text-base.mr-2
span Снять с ведения span Снять с ведения
.flex.items-center .flex.items-center
img.options-icon-wrapper.mr-2(src="@/assets/icons/table.svg") .options-icon-wrapper.icon-table.flex.items-center.justify-center.text-lg.mr-2.pb-px
span Перейти в таблицу span Перейти в таблицу
.flex.items-center .flex.items-center
.options-icon-wrapper.flex.items-center.justify-center.icon-user-data.text-base.mr-2(src="@/assets/icons/table.svg") .options-icon-wrapper.flex.items-center.justify-center.icon-user-data.text-base.mr-2
span Данные span Данные
</template> </template>
<script> <script>
export default { export default {
name: "HeaderChargePerson", name: "HeaderActiveClientPanel",
props: { props: {
info: Object, info: Object,
}, },

View File

@@ -2,7 +2,7 @@
.header-inputs-wrapper.flex.items-center.font-medium.text-base(:class="{ open: isOpen }") .header-inputs-wrapper.flex.items-center.font-medium.text-base(:class="{ open: isOpen }")
.select-container(@click="changeState") .select-container(@click="changeState")
.select-wrapper.flex.items-center.cursor-pointer.mx-4.my-2 .select-wrapper.flex.items-center.cursor-pointer.mx-4.my-2
img.icon-wrapper.flex.justify-center.items-center(src="@/assets/icons/search.svg" alt="Search") .icon-wrapper.icon-search.flex.text-lg.justify-center.items-center
span.custom-input.select-input.inline-block.box-border.align-middle.pl-2.pr-1 {{ selectedFilter }} span.custom-input.select-input.inline-block.box-border.align-middle.pl-2.pr-1 {{ selectedFilter }}
.arrow.icon-down-arrow.text-xsm.mt-px.flex.justify-center.items-center .arrow.icon-down-arrow.text-xsm.mt-px.flex.justify-center.items-center
.options-wrapper.flex.flex-col.box-border.p-4.mt-1(v-if="isOpen") .options-wrapper.flex.flex-col.box-border.p-4.mt-1(v-if="isOpen")
@@ -77,6 +77,10 @@ export default {
&::placeholder &::placeholder
color: var(--font-grey-color) color: var(--font-grey-color)
.icon-search
color: var(--btn-blue-color)
opacity: 0.5
.option-list .option-list
&:last-child &:last-child
margin: 0 margin: 0

View File

@@ -4,7 +4,7 @@
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-charge-person(: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
@@ -19,11 +19,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 HeaderChargePerson from "./HeaderChargePerson.vue"; import HeaderActiveClientPanel from "./HeaderActiveClientPanel.vue";
import HeaderAddClientButton from "./HeaderAddClientButton.vue"; import HeaderAddClientButton from "./HeaderAddClientButton.vue";
export default { export default {
name: "TheHeader", name: "TheHeader",
components: { HeaderInputs, HeaderChargePerson, HeaderAddClientButton }, components: { HeaderInputs, HeaderActiveClientPanel, HeaderAddClientButton },
data() { data() {
return { return {
avatarSrc: img, avatarSrc: img,

View File

@@ -1,5 +1,5 @@
<template lang="pug"> <template lang="pug">
button.arrow-button.flex.items-center.icon-down-arrow.text-base.px-2.pt-1 button.arrow-button.flex.items-center.icon-down-arrow.text-base.px-2.pt-3px
</template> </template>
<script> <script>

View File

@@ -26,6 +26,7 @@ module.exports = {
spacing: { spacing: {
"6px": "6px", "6px": "6px",
"10px": "10px", "10px": "10px",
"3px": "3px",
}, },
}, },
}, },