refs #6681 - PR3 - Resolve conflicts #166

Merged
alexm merged 88 commits from hyervoni-PR-3 into dev 2024-01-29 08:29:45 +00:00
1 changed files with 1 additions and 6 deletions
Showing only changes of commit 9c2267e116 - Show all commits

View File

@ -91,7 +91,7 @@ const toCustomerConsigneeEdit = (consigneeId) => {
}"
@click="toCustomerConsigneeEdit(item.id)"
>
<div class="consignees-card-icon">
<div class="q-ml-xs q-mr-md flex items-center">
<QIcon name="star" size="md" color="primary" />
</div>
<div>
@ -166,11 +166,6 @@ const toCustomerConsigneeEdit = (consigneeId) => {
background-color: var(--vn-light-gray);
}
}
.consignees-card-icon {
margin: 0 15px 0 5px;
display: flex;
align-items: center;
}
</style>
<i18n>