Skip to content

Commit b48b637

Browse files
committed
fix(NeBadgeV2): minor fixes
1 parent 74ebaf6 commit b48b637

File tree

2 files changed

+41
-18
lines changed

2 files changed

+41
-18
lines changed

src/components/NeBadgeV2.vue

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ import { faXmark } from '@fortawesome/free-solid-svg-icons'
1010
1111
const {
1212
size = 'sm',
13-
kind = 'indigo',
13+
kind = 'gray',
1414
pill = true,
1515
dismissable = false,
1616
customKindClasses = '',
1717
dismissAriaLabel = 'Dismiss'
1818
} = defineProps<{
19-
size?: 'xs' | 'sm' | 'md'
19+
size?: 'xs' | 'sm'
2020
kind?: 'primary' | 'indigo' | 'gray' | 'green' | 'amber' | 'rose' | 'blue' | 'custom'
2121
pill?: boolean
2222
dismissable?: boolean
@@ -30,17 +30,20 @@ const textClasses = computed(() => {
3030
switch (size) {
3131
case 'xs':
3232
return 'text-xs'
33-
case 'md':
34-
return 'text-base'
3533
case 'sm':
3634
default:
3735
return 'text-sm'
3836
}
3937
})
4038
4139
const paddingClasses = computed(() => {
42-
////
43-
return 'px-2.5'
40+
switch (size) {
41+
case 'xs':
42+
return 'px-3'
43+
case 'sm':
44+
default:
45+
return 'px-2.5'
46+
}
4447
})
4548
4649
const spacingClasses = computed(() => {
@@ -51,8 +54,8 @@ const kindClasses = computed(() => {
5154
switch (kind) {
5255
case 'primary':
5356
return 'bg-primary-100 text-primary-800 dark:bg-primary-700 dark:text-primary-100'
54-
case 'gray':
55-
return 'bg-gray-200 text-gray-800 dark:bg-gray-600 dark:text-gray-100'
57+
case 'indigo':
58+
return 'bg-indigo-100 text-indigo-800 dark:bg-indigo-700 dark:text-indigo-100'
5659
case 'green':
5760
return 'bg-green-100 text-green-800 dark:bg-green-700 dark:text-green-50'
5861
case 'amber':
@@ -63,18 +66,18 @@ const kindClasses = computed(() => {
6366
return 'bg-blue-100 text-blue-800 dark:bg-blue-700 dark:text-blue-100'
6467
case 'custom':
6568
return `${customKindClasses}`
66-
case 'indigo':
69+
case 'gray':
6770
default:
68-
return 'bg-indigo-100 text-indigo-800 dark:bg-indigo-700 dark:text-indigo-100'
71+
return 'bg-gray-200 text-gray-800 dark:bg-gray-600 dark:text-gray-100'
6972
}
7073
})
7174
7275
const dismissButtonClasses = computed(() => {
7376
switch (kind) {
7477
case 'primary':
7578
return 'hover:bg-primary-200 hover:dark:bg-primary-600'
76-
case 'gray':
77-
return 'hover:bg-gray-300 hover:dark:bg-gray-500'
79+
case 'indigo':
80+
return 'hover:bg-indigo-200 hover:dark:bg-indigo-500'
7881
case 'green':
7982
return 'hover:bg-green-200 hover:dark:bg-green-600'
8083
case 'amber':
@@ -83,9 +86,11 @@ const dismissButtonClasses = computed(() => {
8386
return 'hover:bg-rose-200 hover:dark:bg-rose-600'
8487
case 'blue':
8588
return 'hover:bg-blue-200 hover:dark:bg-blue-600'
86-
case 'indigo':
89+
case 'custom':
90+
return 'hover:bg-white/20'
91+
case 'gray':
8792
default:
88-
return 'hover:bg-indigo-200 hover:dark:bg-indigo-500'
93+
return 'hover:bg-gray-300 hover:dark:bg-gray-500'
8994
}
9095
})
9196
</script>

stories/NeBadgeV2.stories.ts

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@
33

44
import { Meta, StoryObj } from '@storybook/vue3-vite'
55
import { NeBadgeV2 } from '../src/main'
6+
import { faAward } from '@fortawesome/free-solid-svg-icons'
7+
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
68

79
const meta: Meta<typeof NeBadgeV2> = {
810
title: 'NeBadgeV2',
911
component: NeBadgeV2,
1012
tags: ['autodocs'],
1113
argTypes: {
1214
size: {
13-
options: ['xs', 'sm', 'md'],
15+
options: ['xs', 'sm'],
1416
control: { type: 'inline-radio' }
1517
},
1618
kind: {
@@ -20,7 +22,7 @@ const meta: Meta<typeof NeBadgeV2> = {
2022
},
2123
args: {
2224
size: 'sm',
23-
kind: 'indigo',
25+
kind: 'gray',
2426
pill: true,
2527
dismissable: false,
2628
customKindClasses: '',
@@ -52,9 +54,9 @@ export const Kinds: Story = {
5254
},
5355
template: `
5456
<div class="flex flex-wrap gap-8">
55-
<NeBadgeV2 v-bind="args" kind="indigo">indigo</NeBadgeV2>
56-
<NeBadgeV2 v-bind="args" kind="primary">primary</NeBadgeV2>
5757
<NeBadgeV2 v-bind="args" kind="gray">gray</NeBadgeV2>
58+
<NeBadgeV2 v-bind="args" kind="primary">primary</NeBadgeV2>
59+
<NeBadgeV2 v-bind="args" kind="indigo">indigo</NeBadgeV2>
5860
<NeBadgeV2 v-bind="args" kind="green">green</NeBadgeV2>
5961
<NeBadgeV2 v-bind="args" kind="amber">amber</NeBadgeV2>
6062
<NeBadgeV2 v-bind="args" kind="rose">rose</NeBadgeV2>
@@ -80,6 +82,22 @@ export const CustomKind: Story = {
8082
}
8183
}
8284

85+
const withIconTemplate = `<NeBadgeV2 v-bind="args">
86+
<FontAwesomeIcon :icon="faAward" class="size-4" />
87+
Badge
88+
</NeBadgeV2>`
89+
90+
export const WithIcon: Story = {
91+
render: (args) => ({
92+
components: { NeBadgeV2, FontAwesomeIcon },
93+
setup() {
94+
return { args, faAward }
95+
},
96+
template: withIconTemplate
97+
}),
98+
args: {}
99+
}
100+
83101
export const Dismissable: Story = {
84102
render: (args) => ({
85103
components: { NeBadgeV2 },

0 commit comments

Comments
 (0)