diff --git a/app/components/dossiers/batch_operation_inline_buttons_component/batch_operation_inline_buttons_component.html.haml b/app/components/dossiers/batch_operation_inline_buttons_component/batch_operation_inline_buttons_component.html.haml index 1f4be9f4a..be2e84e15 100644 --- a/app/components/dossiers/batch_operation_inline_buttons_component/batch_operation_inline_buttons_component.html.haml +++ b/app/components/dossiers/batch_operation_inline_buttons_component/batch_operation_inline_buttons_component.html.haml @@ -15,7 +15,7 @@ %h4= opt[:label] .motivation.accept - = form.text_area :motivation, class: 'motivation-text-area' + = form.text_area :motivation, class: 'fr-input' #justificatif_motivation_suggest_accept.optional-justificatif %button.button{ type: 'button', onclick: "DS.showImportJustificatif('accept');" } Ajouter un justificatif (optionnel) #justificatif_motivation_import_accept.hidden diff --git a/app/views/instructeurs/dossiers/_instruction_button_motivation.html.haml b/app/views/instructeurs/dossiers/_instruction_button_motivation.html.haml index 397c92710..d241281a5 100644 --- a/app/views/instructeurs/dossiers/_instruction_button_motivation.html.haml +++ b/app/views/instructeurs/dossiers/_instruction_button_motivation.html.haml @@ -1,7 +1,7 @@ .motivation.hidden{ class: popup_class } - = form_tag(terminer_instructeur_dossier_path(dossier.procedure, dossier), data: { turbo: true, turbo_confirm: confirm }, method: :post, multipart: true, class: 'form') do + = form_tag(terminer_instructeur_dossier_path(dossier.procedure, dossier), data: { turbo: true, turbo_confirm: confirm }, method: :post, multipart: true) do - if title == 'Accepter' - = text_area :dossier, :motivation, class: 'motivation-text-area', placeholder: placeholder, required: false + = text_area :dossier, :motivation, class: 'fr-input', placeholder: placeholder, required: false - if dossier.attestation_template&.activated? %p.help L’acceptation du dossier envoie automatiquement @@ -26,11 +26,11 @@ - unspecified_annotations_privees.each do |unspecified_annotations_privee| %li= unspecified_annotations_privee.libelle - else - = text_area :dossier, :motivation, class: 'motivation-text-area', placeholder: placeholder, required: true + = text_area :dossier, :motivation, class: 'fr-input', placeholder: placeholder, required: true .optional-justificatif{ id: "justificatif_motivation_suggest_#{popup_class}", onclick: "DS.showImportJustificatif('#{popup_class}');" } - .button Ajouter un justificatif (optionnel) + .fr-btn.fr-btn--tertiary-no-outline.fr-btn--icon-left.fr-icon-attachment-line.fr-ml-0 Ajouter un justificatif (optionnel) .hidden{ id: "justificatif_motivation_import_#{popup_class}" } = file_field :dossier, :justificatif_motivation, direct_upload: true - .text-right - %span.button{ onclick: 'DS.motivationCancel();' } Annuler - = button_tag 'Valider la décision', name: :process_action, value: process_action, class: 'button primary', title: title + .text-right.fr-mt-2w + %span.fr-btn.fr-btn--secondary{ onclick: 'DS.motivationCancel();' } Annuler + = button_tag 'Valider la décision', name: :process_action, value: process_action, class: 'fr-btn fr-mr-0', title: title