From d7ec8bb7bd3024638e09eddb27b82f08a1e826cb Mon Sep 17 00:00:00 2001 From: andrewwallacespeckle <139135120+andrewwallacespeckle@users.noreply.github.com> Date: Mon, 31 Mar 2025 15:01:06 +0200 Subject: [PATCH] Update badgeColorClasses to check for color classes (#4297) --- .../ui-components/src/components/common/Badge.vue | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/ui-components/src/components/common/Badge.vue b/packages/ui-components/src/components/common/Badge.vue index 1f031f24c..bb8c1e0bf 100644 --- a/packages/ui-components/src/components/common/Badge.vue +++ b/packages/ui-components/src/components/common/Badge.vue @@ -62,11 +62,15 @@ const props = withDefaults( } ) -const badgeColorClasses = computed(() => - props.colorClasses || props.color === 'primary' - ? 'bg-info-lighter text-primary-focus dark:text-foreground' - : 'bg-highlight-3 text-foreground-2' -) +const badgeColorClasses = computed(() => { + if (props.colorClasses) { + return props.colorClasses + } else if (props.color === 'secondary') { + return 'bg-highlight-3 text-foreground-2' + } else { + return 'bg-info-lighter text-primary-focus dark:text-foreground' + } +}) const badgeDotIconColorClasses = computed( () => props.dotIconColorClasses || 'text-blue-400'