MALIO-DEV/malio-layer-ui
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#MUI-23] Revoir la config couleur tailwind (#18)

Browse Source 
| Numéro du ticket | Titre du ticket |
|------------------|-----------------|
|                  |                 |

## Description de la PR

## Modification du .env

## Check list

- [ ] Pas de régression
- [ ] TU/TI/TF rédigée
- [ ] TU/TI/TF OK
- [ ] CHANGELOG modifié

Reviewed-on: #18
Co-authored-by: tristan <tristan@yuno.malio.fr>
Co-committed-by: tristan <tristan@yuno.malio.fr>
This commit was merged in pull request #18.
This commit is contained in:
Autin
2026-03-24 09:05:23 +00:00
committed by Autin
parent 3deba3f369
commit 968b7087b5
19 changed files with 106 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/components/malio/button/ButtonIcon.test.ts
View File

@@ -106,7 +106,7 @@ describe('MalioButtonIcon', () => {
const wrapper = mountComponent({icon: 'mdi:arrow-left', ariaLabel: 'Retour', disabled: true})
expect(wrapper.get('button').classes()).toContain('cursor-not-allowed')
expect(wrapper.get('button').classes()).toContain('bg-m-btn-disabled')
expect(wrapper.get('button').classes()).toContain('bg-m-disabled')
})
it('applies cursor-pointer when not disabled', () => {
@@ -124,7 +124,7 @@ describe('MalioButtonIcon', () => {
it('applies default background color', () => {
const wrapper = mountComponent()
expect(wrapper.get('button').classes()).toContain('bg-m-btn-default')
expect(wrapper.get('button').classes()).toContain('bg-m-btn-primary')
})
it('applies buttonClass', () => {
@@ -136,16 +136,16 @@ describe('MalioButtonIcon', () => {
it('applies ghost variant with no background and colored icon', () => {
const wrapper = mountComponent({icon: 'mdi:arrow-left', ariaLabel: 'Retour', variant: 'ghost'})
expect(wrapper.get('button').classes()).toContain('text-m-btn-default')
expect(wrapper.get('button').classes()).not.toContain('bg-m-btn-default')
expect(wrapper.get('button').classes()).toContain('text-m-btn-primary')
expect(wrapper.get('button').classes()).not.toContain('bg-m-btn-primary')
expect(wrapper.get('button').classes()).not.toContain('text-white')
})
it('applies ghost disabled styles with no background', () => {
const wrapper = mountComponent({icon: 'mdi:arrow-left', ariaLabel: 'Retour', variant: 'ghost', disabled: true})
expect(wrapper.get('button').classes()).toContain('text-m-btn-disabled')
expect(wrapper.get('button').classes()).toContain('text-m-disabled')
expect(wrapper.get('button').classes()).toContain('cursor-not-allowed')
expect(wrapper.get('button').classes()).not.toContain('bg-m-btn-disabled')
expect(wrapper.get('button').classes()).not.toContain('bg-m-disabled')
})
})

8
app/components/malio/button/ButtonIcon.vue
View File

@@ -55,11 +55,11 @@ const mergedButtonClass = computed(() =>
'inline-flex items-center justify-center rounded-md p-1 transition-colors duration-150 focus:outline-none focus-visible:ring-2 focus-visible:ring-m-primary/50',
isFilled.value
? props.disabled
? 'bg-m-btn-disabled text-white cursor-not-allowed'
: 'bg-m-btn-default hover:bg-m-btn-hover active:bg-m-btn-active text-white cursor-pointer'
? 'bg-m-disabled text-white cursor-not-allowed'
: 'bg-m-btn-primary hover:bg-m-btn-primary-hover active:bg-m-btn-primary-active text-white cursor-pointer'
: props.disabled
? 'text-m-btn-disabled cursor-not-allowed'
: 'text-m-btn-default hover:text-m-btn-hover active:text-m-btn-active cursor-pointer',
? 'text-m-disabled cursor-not-allowed'
: 'text-m-btn-primary hover:text-m-btn-primary-hover active:text-m-btn-primary-active cursor-pointer',
props.buttonClass,
),
)

4
app/components/malio/checkbox/Checkbox.test.ts
View File

@@ -114,7 +114,7 @@ describe('MalioCheckbox', () => {
})
expect(wrapper.get('input').attributes('aria-invalid')).toBe('true')
expect(wrapper.get('label').classes()).toContain('text-m-error')
expect(wrapper.get('label').classes()).toContain('text-m-danger')
expect(wrapper.get('p').text()).toBe('You must accept')
})
@@ -125,7 +125,7 @@ describe('MalioCheckbox', () => {
})
expect(wrapper.get('p').text()).toBe('Invalid')
expect(wrapper.get('p').classes()).toContain('text-m-error')
expect(wrapper.get('p').classes()).toContain('text-m-danger')
})
it('shows success styles and message when there is no error', () => {

36
app/components/malio/input/Input.test.ts
View File

@@ -161,19 +161,19 @@ describe('MalioInputText', () => {
it('shows error message without label and icon', () => {
const wrapper = mountInput({error: 'Error message test'})
expect(wrapper.get('p.text-m-error').text()).toBe('Error message test')
expect(wrapper.get('input').classes()).toContain('border-m-error')
expect(wrapper.get('p.text-m-danger').text()).toBe('Error message test')
expect(wrapper.get('input').classes()).toContain('border-m-danger')
expect(wrapper.get('input').attributes('aria-invalid')).toBe('true')
expect(wrapper.get('p').classes()).toContain('text-m-error')
expect(wrapper.get('p').classes()).toContain('text-m-danger')
})
it('shows error message with label and without icon', () => {
const wrapper = mountInput({error: 'Error message test', label: 'Error message'})
expect(wrapper.get('p.text-m-error').text()).toBe('Error message test')
expect(wrapper.get('input').classes()).toContain('border-m-error')
expect(wrapper.get('label').classes()).toContain('text-m-error')
expect(wrapper.get('p').classes()).toContain('text-m-error')
expect(wrapper.get('p.text-m-danger').text()).toBe('Error message test')
expect(wrapper.get('input').classes()).toContain('border-m-danger')
expect(wrapper.get('label').classes()).toContain('text-m-danger')
expect(wrapper.get('p').classes()).toContain('text-m-danger')
})
it('shows error message with label and icon', () => {
@@ -183,19 +183,19 @@ describe('MalioInputText', () => {
iconName: 'mdi:key-outline',
})
expect(wrapper.get('p.text-m-error').text()).toBe('Error message test')
expect(wrapper.get('input').classes()).toContain('border-m-error')
expect(wrapper.get('label').classes()).toContain('text-m-error')
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-m-error')
expect(wrapper.get('p').classes()).toContain('text-m-error')
expect(wrapper.get('p.text-m-danger').text()).toBe('Error message test')
expect(wrapper.get('input').classes()).toContain('border-m-danger')
expect(wrapper.get('label').classes()).toContain('text-m-danger')
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-m-danger')
expect(wrapper.get('p').classes()).toContain('text-m-danger')
})
it('shows error message with icon and without label', () => {
const wrapper = mountInput({error: 'Error message test', iconName: 'mdi:key-outline'})
expect(wrapper.get('p.text-m-error').text()).toBe('Error message test')
expect(wrapper.get('input').classes()).toContain('border-m-error')
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-m-error')
expect(wrapper.get('p.text-m-danger').text()).toBe('Error message test')
expect(wrapper.get('input').classes()).toContain('border-m-danger')
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-m-danger')
})
it('shows success message without label and icon', () => {
@@ -240,10 +240,10 @@ describe('MalioInputText', () => {
success: 'Success message test',
})
expect(wrapper.find('p.text-m-error').exists()).toBe(true)
expect(wrapper.get('p.text-m-error').text()).toBe('Error message test')
expect(wrapper.find('p.text-m-danger').exists()).toBe(true)
expect(wrapper.get('p.text-m-danger').text()).toBe('Error message test')
expect(wrapper.find('p.text-m-success').exists()).toBe(false)
expect(wrapper.get('input').classes()).toContain('border-m-error')
expect(wrapper.get('input').classes()).toContain('border-m-danger')
expect(wrapper.get('input').classes()).not.toContain('border-m-success')
})

2
app/components/malio/input/InputAmount.test.ts
View File

@@ -87,7 +87,7 @@ describe('MalioInputAmount', () => {
expect(wrapper.get('input').attributes('aria-invalid')).toBe('true')
expect(wrapper.get('input').attributes('aria-describedby')).toBe(`${inputId}-describedby`)
expect(wrapper.get('p.text-m-error').text()).toBe('Montant invalide')
expect(wrapper.get('p.text-m-danger').text()).toBe('Montant invalide')
})
it('keeps dots as the decimal separator on input', async () => {

6
app/components/malio/input/InputPassword.test.ts
View File

@@ -126,15 +126,15 @@ describe('MalioInputPassword', () => {
it('shows error message and styles', () => {
const wrapper = mountComponent({error: 'Mot de passe requis'})
expect(wrapper.get('p.text-m-error').text()).toBe('Mot de passe requis')
expect(wrapper.get('input').classes()).toContain('border-m-error')
expect(wrapper.get('p.text-m-danger').text()).toBe('Mot de passe requis')
expect(wrapper.get('input').classes()).toContain('border-m-danger')
expect(wrapper.get('input').attributes('aria-invalid')).toBe('true')
})
it('shows error style on icon', () => {
const wrapper = mountComponent({error: 'Error'})
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-m-error')
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-m-danger')
})
it('shows success message and styles', () => {

8
app/components/malio/input/InputText.vue
View File

@@ -40,7 +40,7 @@
data-test="icon"
:class="[
hasError
? 'text-m-error'
? 'text-m-danger'
: hasSuccess
? 'text-m-success' : iconColor,
iconPositionClass,
@@ -53,7 +53,7 @@
:id="`${inputId}-describedby`"
:class="[
hasError
? 'text-m-error'
? 'text-m-danger'
: hasSuccess
? 'text-m-success'
: 'text-m-muted',
@@ -148,7 +148,7 @@ const mergedInputClass = computed(() =>
isFilled.value ? 'border-black' : 'border-m-muted',
disabled.value ? 'cursor-not-allowed text-black/60 [&:not(:placeholder-shown)]:border-m-muted border-m-muted' : 'cursor-text',
hasError.value
? 'border-m-error focus:border-m-error [&:not(:placeholder-shown)]:border-m-error'
? 'border-m-danger focus:border-m-danger [&:not(:placeholder-shown)]:border-m-danger'
: hasSuccess.value
? 'border-m-success focus:border-m-success [&:not(:placeholder-shown)]:border-m-success'
: 'focus:border-m-primary',
@@ -164,7 +164,7 @@ const mergedLabelClass = computed(() =>
shouldFloatLabel.value ? '-translate-y-[1.25rem] peer-focus:-translate-y-[1.55rem] scale-90' : '',
disabled.value ? 'peer-[&:not(:placeholder-shown):not(:focus)]:text-black/60' : '',
hasError.value
? 'text-m-error'
? 'text-m-danger'
: hasSuccess.value
? 'text-m-success'
: 'peer-placeholder-shown:text-m-muted peer-[&:not(:placeholder-shown):not(:focus)]:text-black peer-focus:text-m-primary',

10
app/components/malio/input/InputTextArea.test.ts
View File

@@ -118,9 +118,9 @@ describe('MalioInputTextArea', () => {
},
})
expect(wrapper.get('textarea').classes()).toContain('border-m-error')
expect(wrapper.get('label').classes()).toContain('text-m-error')
expect(wrapper.get('p.text-m-error').text()).toBe('Textarea error')
expect(wrapper.get('textarea').classes()).toContain('border-m-danger')
expect(wrapper.get('label').classes()).toContain('text-m-danger')
expect(wrapper.get('p.text-m-danger').text()).toBe('Textarea error')
expect(wrapper.get('textarea').attributes('aria-invalid')).toBe('true')
})
@@ -145,8 +145,8 @@ describe('MalioInputTextArea', () => {
},
})
expect(wrapper.get('textarea').classes()).toContain('border-m-error')
expect(wrapper.get('textarea').classes()).toContain('border-m-danger')
expect(wrapper.find('p.text-m-success').exists()).toBe(false)
expect(wrapper.get('p.text-m-error').text()).toBe('Textarea error')
expect(wrapper.get('p.text-m-danger').text()).toBe('Textarea error')
})
})

6
app/components/malio/input/InputUpload.test.ts
View File

@@ -115,15 +115,15 @@ describe('MalioInputUpload', () => {
it('shows error message and styles', () => {
const wrapper = mountComponent({error: 'Fichier requis'})
expect(wrapper.get('p.text-m-error').text()).toBe('Fichier requis')
expect(wrapper.get('input[type="text"]').classes()).toContain('border-m-error')
expect(wrapper.get('p.text-m-danger').text()).toBe('Fichier requis')
expect(wrapper.get('input[type="text"]').classes()).toContain('border-m-danger')
expect(wrapper.get('input[type="text"]').attributes('aria-invalid')).toBe('true')
})
it('shows error style on icon', () => {
const wrapper = mountComponent({error: 'Error'})
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-m-error')
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-m-danger')
})
it('shows success message and styles', () => {

6
app/components/malio/radio/RadioButton.test.ts
View File

@@ -112,8 +112,8 @@ describe('MalioRadioButton', () => {
})
expect(wrapper.get('.radio-control').classes()).toContain('is-error')
expect(wrapper.get('.radio-text').classes()).toContain('text-m-error')
expect(wrapper.get('.radio-message').classes()).toContain('text-m-error')
expect(wrapper.get('.radio-text').classes()).toContain('text-m-danger')
expect(wrapper.get('.radio-message').classes()).toContain('text-m-danger')
expect(wrapper.get('input').attributes('aria-invalid')).toBe('true')
})
@@ -137,7 +137,7 @@ describe('MalioRadioButton', () => {
expect(wrapper.get('.radio-control').classes()).toContain('is-error')
expect(wrapper.get('.radio-control').classes()).not.toContain('is-success')
expect(wrapper.get('.radio-message').text()).toBe('Selection required')
expect(wrapper.get('.radio-message').classes()).toContain('text-m-error')
expect(wrapper.get('.radio-message').classes()).toContain('text-m-danger')
})
it('merges custom classes on group, input and label', () => {

10
app/components/malio/select/Select.test.ts
View File

@@ -139,9 +139,9 @@ describe('MalioSelect', () => {
},
})
expect(wrapper.get('button').classes()).toContain('border-m-error')
expect(wrapper.get('label').classes()).toContain('text-m-error')
expect(wrapper.get('p.text-m-error').text()).toBe('Selection error')
expect(wrapper.get('button').classes()).toContain('border-m-danger')
expect(wrapper.get('label').classes()).toContain('text-m-danger')
expect(wrapper.get('p.text-m-danger').text()).toBe('Selection error')
expect(wrapper.get('button').attributes('aria-invalid')).toBe('true')
})
@@ -170,8 +170,8 @@ describe('MalioSelect', () => {
},
})
expect(wrapper.get('button').classes()).toContain('border-m-error')
expect(wrapper.get('button').classes()).toContain('border-m-danger')
expect(wrapper.find('p.text-m-success').exists()).toBe(false)
expect(wrapper.get('p.text-m-error').text()).toBe('Selection error')
expect(wrapper.get('p.text-m-danger').text()).toBe('Selection error')
})
})

4
app/components/malio/sidebar/Sidebar.vue
View File

@@ -54,7 +54,7 @@
<NuxtLink
:to="item.to"
:class="twMerge(
'block truncate rounded-md text-[15px] text-m-text text-black transition-colors hover:bg-m-tertiary leading-[150%]',
'block truncate rounded-md text-[15px] text-m-text text-black transition-colors hover:bg-m-surface leading-[150%]',
collapsed ? 'px-3 text-center' : 'pl-[42px] pr-3',
)"
>
@@ -71,7 +71,7 @@
:class="twMerge(
'absolute top-1/2 -translate-y-1/2 right-0 translate-x-1/2 z-10',
'flex h-8 w-8 items-center justify-center rounded-full border border-m-border bg-white shadow-sm',
'cursor-pointer transition-colors hover:bg-m-tertiary',
'cursor-pointer transition-colors hover:bg-m-surface',
toggleClass,
)"
@click="toggleCollapse"

2
app/components/malio/tab/TabList.vue
View File

@@ -2,7 +2,7 @@
<div v-bind="$attrs">
<div
role="tablist"
class="flex justify-center gap-[60px] border-b border-m-border"
class="flex justify-center gap-[60px] border-b border-m-primary"
>
<button
v-for="tab in tabs"