Merge branch 'master' into UC-22

This commit is contained in:
Алексей Дёмин
2022-10-26 16:14:46 +03:00
committed by GitHub
15 changed files with 336 additions and 220 deletions

View File

@@ -4,15 +4,15 @@
img.img-wrapper.mr-2(:src="info.avatarSrc" alt="Charge person avatar")
span.font-bold.text-sm.mr-6px {{ info.name }}
.dot.mr-4
.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.cursor-pointer(@click="changeState")
.options.flex.flex-col.p-4.mt-1.font-medium.text-sm.gap-y-3(v-if="isOpen")
.flex.items-center
.flex.items-center.cursor-pointer
.options-icon-wrapper.icon-star-off.flex.items-center.justify-center.text-base.mr-2
span Снять с ведения
.flex.items-center
.flex.items-center.cursor-pointer
.options-icon-wrapper.icon-table.flex.items-center.justify-center.text-lg.mr-2.pb-px
span Перейти в таблицу
.flex.items-center
.flex.items-center.cursor-pointer
.options-icon-wrapper.flex.items-center.justify-center.icon-user-data.text-base.mr-2
span Данные
</template>

View File

@@ -48,7 +48,7 @@ export default {
height: 56px
background-color: var(--default-white)
position: relative
z-index: 2
z-index: 11
.logo-img
height: 32px

View File

@@ -24,8 +24,6 @@ export default {
default: "Поиск",
},
widthInput: Number,
backgroundInput: String,
fontSizeInput: String,
},
};
</script>

View File

@@ -1,8 +1,8 @@
<template lang="pug">
button.button.flex.w-fit.gap-x-2.text-base.pt-3.pb-2.px-6
.flex.text-xs.w-fit.pt-1(v-if="withIcon")
span.icon-plus
span.text-base.font-semibold {{text}}
.flex.text-xs.w-fit.pt-1(v-if="withIcon" :class="iconPosition")
span.icon-plus(:style="{fontSize:iconSize + 'px'}")
span.text-base.font-semibold(:class="textStyled") {{text}}
</template>
<script>
@@ -15,6 +15,15 @@ export default {
withIcon: {
default: false,
},
iconPosition: {
default: "left",
},
iconSize: {
default: 13,
},
textStyled: {
default: "normal",
},
},
};
</script>
@@ -30,4 +39,16 @@ export default {
&:active
opacity: 1
background-color: var(--font-dark-blue-color)
.left
order: -1
.right
order: 1
padding-top: 1px
border-left: 1px solid var(--bg-white-color-0)
padding-left: 14px
height: 24px
align-items: center
.createEvent
font-weight: 500
padding-right: 2px
</style>