Merge branch 'dev' into fix/vcst-2508

VirtoCommerce · Dec 23, 2024 · bb05957 · bb05957
2 parents 6a947ab + 8c98652
commit bb05957
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/client-app/shared/layout/components/currency-selector/currency-selector.vue b/client-app/shared/layout/components/currency-selector/currency-selector.vue
@@ -1,5 +1,5 @@
 <template>
-  <VcDropdownMenu placement="bottom-end" width="7.5rem" class="h-full">
+  <VcDropdownMenu placement="bottom-end" width="8rem" class="h-full">
     <template #trigger="{ opened }">
       <button type="button" class="flex h-full items-center gap-x-1.5">
         <span class="text-sm">
@@ -20,16 +20,15 @@
         :key="item.code"
         :active="item.code === currentCurrency.code"
         color="secondary"
+        truncate
         @click="
           select(item.code);
           close();
         "
       >
-        <span
-          class="flex size-5 shrink-0 items-center justify-center rounded-full bg-secondary-600 text-base font-bold text-additional-50"
-        >
-          {{ item.symbol }}
-        </span>
+        <template #prepend>
+          <VcBadge rounded color="secondary" size="lg">{{ item.symbol }}</VcBadge>
+        </template>
 
         <span>{{ item.code }}</span>
       </VcMenuItem>

diff --git a/client-app/ui-kit/components/molecules/line-items/vc-line-items.vue b/client-app/ui-kit/components/molecules/line-items/vc-line-items.vue
@@ -95,6 +95,8 @@
         <template v-if="selectable">
           <VcButton
             class="vc-line-items__button vc-line-items__button--desktop"
+            color="secondary"
+            variant="outline"
             size="xs"
             :disabled="!selectedItemIds.length"
             @click="removeSelectedItems"
@@ -104,6 +106,7 @@
 
           <VcButton
             class="vc-line-items__button vc-line-items__button--mobile"
+            color="secondary"
             size="xs"
             variant="outline"
             @click="removeAllItems"