refactor(CButton): improve colors and variants handling

mrholek · mrholek · commit 51cf9a92d73d · 2024-07-24T15:45:53.000+02:00
diff --git a/packages/coreui-vue/src/components/button/CButton.ts b/packages/coreui-vue/src/components/button/CButton.ts
@@ -93,8 +93,9 @@ export const CButton = defineComponent({
         {
           class: [
             'btn',
-            props.variant ? `btn-${props.variant}-${props.color}` : `btn-${props.color}`,
             {
+              [`btn-${props.color}`]: props.color && !props.variant,
+              [`btn-${props.variant}-${props.color}`]: props.color && props.variant,
               [`btn-${props.size}`]: props.size,
               active: props.active,
               disabled: props.disabled,

Original file line number	Diff line number	Diff line change
`@@ -93,8 +93,9 @@ export const CButton = defineComponent({`
`93`	`93`	`{`
`94`	`94`	`class: [`
`95`	`95`	`'btn',`
`96`		- props.variant ? `btn-${props.variant}-${props.color}` : `btn-${props.color}`,
`97`	`96`	`{`
	`97`	+ [`btn-${props.color}`]: props.color && !props.variant,
	`98`	+ [`btn-${props.variant}-${props.color}`]: props.color && props.variant,
`98`	`99`	[`btn-${props.size}`]: props.size,
`99`	`100`	`active: props.active,`
`100`	`101`	`disabled: props.disabled,`