style: replace refuse legacy icon
This commit is contained in:
parent
e9ab3352f1
commit
d70b03c969
10 changed files with 7 additions and 17 deletions
|
@ -1 +0,0 @@
|
||||||
<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m12 1c-6.072 0-11 4.928-11 11s4.928 11 11 11 11-4.928 11-11-4.928-11-11-11zm3.833 7-7.833 7.833zm0 7.833-7.833-7.833z" fill="none" stroke="#ed1c24" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/></svg>
|
|
Before Width: | Height: | Size: 311 B |
|
@ -31,10 +31,6 @@
|
||||||
background-image: image-url("icons/accept.svg");
|
background-image: image-url("icons/accept.svg");
|
||||||
}
|
}
|
||||||
|
|
||||||
&.refuse {
|
|
||||||
background-image: image-url("icons/refuse.svg");
|
|
||||||
}
|
|
||||||
|
|
||||||
&.without-continuation {
|
&.without-continuation {
|
||||||
background-image: image-url("icons/without-continuation.svg");
|
background-image: image-url("icons/without-continuation.svg");
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
- menu.with_item do
|
- menu.with_item do
|
||||||
= link_to('#', onclick: "DS.showMotivation(event, 'refuse');", role: 'menuitem') do
|
= link_to('#', onclick: "DS.showMotivation(event, 'refuse');", role: 'menuitem') do
|
||||||
%span.icon.refuse
|
= dsfr_icon('fr-icon-close-circle-fill fr-text-default--warning')
|
||||||
.dropdown-description
|
.dropdown-description
|
||||||
%h4 Refuser
|
%h4 Refuser
|
||||||
L’usager sera informé que son dossier a été refusé
|
L’usager sera informé que son dossier a été refusé
|
||||||
|
|
|
@ -2,9 +2,7 @@
|
||||||
= link_to annotations_admin_procedure_path(@procedure), class: 'fr-tile fr-enlarge-link', title: error_messages do
|
= link_to annotations_admin_procedure_path(@procedure), class: 'fr-tile fr-enlarge-link', title: error_messages do
|
||||||
.fr-tile__body.flex.column.align-center.justify-between
|
.fr-tile__body.flex.column.align-center.justify-between
|
||||||
- if error_messages.present?
|
- if error_messages.present?
|
||||||
%div
|
%p.fr-badge.fr-badge--error À modifier
|
||||||
%span.icon.refuse
|
|
||||||
%p.fr-tile-status-error À modifier
|
|
||||||
- elsif @count == 0
|
- elsif @count == 0
|
||||||
%p.fr-badge.fr-badge--info À configurer
|
%p.fr-badge.fr-badge--info À configurer
|
||||||
- else
|
- else
|
||||||
|
|
|
@ -2,9 +2,7 @@
|
||||||
= link_to champs_admin_procedure_path(@procedure), class: 'fr-tile fr-enlarge-link', title: error_messages do
|
= link_to champs_admin_procedure_path(@procedure), class: 'fr-tile fr-enlarge-link', title: error_messages do
|
||||||
.fr-tile__body.flex.column.align-center.justify-between
|
.fr-tile__body.flex.column.align-center.justify-between
|
||||||
- if error_messages.present?
|
- if error_messages.present?
|
||||||
%div
|
%p.fr-badge.fr-badge--error À modifier
|
||||||
%span.icon.refuse
|
|
||||||
%p.fr-tile-status-error À modifier
|
|
||||||
- elsif @count == 0
|
- elsif @count == 0
|
||||||
%p.fr-badge.fr-badge--warning À faire
|
%p.fr-badge.fr-badge--warning À faire
|
||||||
- else
|
- else
|
||||||
|
|
|
@ -38,7 +38,7 @@ export function ImportFileInput({
|
||||||
{input.hasValue && (
|
{input.hasValue && (
|
||||||
<span
|
<span
|
||||||
title="Supprimer le fichier"
|
title="Supprimer le fichier"
|
||||||
className="icon refuse"
|
className="fr-icon-delete-line fr-text-default--error"
|
||||||
style={{
|
style={{
|
||||||
cursor: 'pointer'
|
cursor: 'pointer'
|
||||||
}}
|
}}
|
||||||
|
|
|
@ -101,7 +101,7 @@
|
||||||
- if procedure.can_be_deleted_by_administrateur? && !procedure.discarded?
|
- if procedure.can_be_deleted_by_administrateur? && !procedure.discarded?
|
||||||
- menu.with_item do
|
- menu.with_item do
|
||||||
= link_to admin_procedure_path(procedure), role: 'menuitem', method: :delete, data: { confirm: "Voulez-vous vraiment supprimer la démarche ? \nToute suppression est définitive et s'appliquera aux éventuels autres administrateurs de cette démarche !" } do
|
= link_to admin_procedure_path(procedure), role: 'menuitem', method: :delete, data: { confirm: "Voulez-vous vraiment supprimer la démarche ? \nToute suppression est définitive et s'appliquera aux éventuels autres administrateurs de cette démarche !" } do
|
||||||
%span.icon.refuse
|
= dsfr_icon('fr-icon-delete-line')
|
||||||
.dropdown-description
|
.dropdown-description
|
||||||
%h4= t('administrateurs.dropdown_actions.delete')
|
%h4= t('administrateurs.dropdown_actions.delete')
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
%span.icon.unfollow
|
%span.icon.unfollow
|
||||||
%span.icon.unarchive
|
%span.icon.unarchive
|
||||||
%span.icon.accept
|
%span.icon.accept
|
||||||
%span.icon.refuse
|
|
||||||
%span.icon.without-continuation
|
%span.icon.without-continuation
|
||||||
%span.icon.edit
|
%span.icon.edit
|
||||||
%span.icon.bubble
|
%span.icon.bubble
|
||||||
|
|
|
@ -77,7 +77,7 @@
|
||||||
- elsif dossier.refuse?
|
- elsif dossier.refuse?
|
||||||
.refuse
|
.refuse
|
||||||
%p.decision{ role: 'status' }
|
%p.decision{ role: 'status' }
|
||||||
%span.icon.refuse
|
= dsfr_icon('fr-icon-close-circle-fill fr-text-default--error')
|
||||||
= t('views.users.dossiers.show.status_overview.refuse_html')
|
= t('views.users.dossiers.show.status_overview.refuse_html')
|
||||||
|
|
||||||
- if dossier.motivation.present?
|
- if dossier.motivation.present?
|
||||||
|
|
|
@ -62,7 +62,7 @@ describe 'Creating a new procedure', js: true do
|
||||||
expect(page).to have_current_path(admin_procedure_path(procedure))
|
expect(page).to have_current_path(admin_procedure_path(procedure))
|
||||||
|
|
||||||
champs_card = find('.fr-tile', text: 'Champs du formulaire')
|
champs_card = find('.fr-tile', text: 'Champs du formulaire')
|
||||||
expect(champs_card).to have_selector('.icon.refuse')
|
expect(champs_card).to have_selector('.fr-badge--error')
|
||||||
expect(champs_card).to have_content('À modifier')
|
expect(champs_card).to have_content('À modifier')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue