diff --git a/app/assets/stylesheets/procedure_admin.scss b/app/assets/stylesheets/procedure_admin.scss index 7f9b4c8c1..326283595 100644 --- a/app/assets/stylesheets/procedure_admin.scss +++ b/app/assets/stylesheets/procedure_admin.scss @@ -13,14 +13,7 @@ } .procedure-admin-listing-container { - display: flex; - justify-content: flex-end; - padding-left: 16px; - padding-right: 16px; - max-width: 1072px; margin-left: auto; - margin-right: auto; - margin-top: 10px; } .container { diff --git a/app/views/administrateurs/procedures/_procedures_list.html.haml b/app/views/administrateurs/procedures/_procedures_list.html.haml index ccd0e4afc..a38cc7ba7 100644 --- a/app/views/administrateurs/procedures/_procedures_list.html.haml +++ b/app/views/administrateurs/procedures/_procedures_list.html.haml @@ -1,4 +1,4 @@ -.fr-h6 +%h2.fr-h6 = page_entries_info procedures - procedures.each do |procedure| @@ -10,7 +10,7 @@ = image_tag procedure.logo, alt: procedure.libelle, class: 'logo' %div - .card-title + %h3.card-title = link_to procedure.libelle, admin_procedure_path(procedure) = link_to commencer_url(procedure.path), commencer_url(procedure.path), class: 'fr-link fr-mb-1w' diff --git a/app/views/administrateurs/procedures/index.html.haml b/app/views/administrateurs/procedures/index.html.haml index adeb6a641..ba2311111 100644 --- a/app/views/administrateurs/procedures/index.html.haml +++ b/app/views/administrateurs/procedures/index.html.haml @@ -1,6 +1,8 @@ .sub-header - .procedure-admin-listing-container - = link_to "Nouvelle Démarche", new_from_existing_admin_procedures_path, id: 'new-procedure', class: 'fr-btn' + .flex.fr-container + %h1.fr-h3 Mes démarches + .procedure-admin-listing-container.fr-mt-1v + = link_to "Nouvelle Démarche", new_from_existing_admin_procedures_path, id: 'new-procedure', class: 'fr-btn' .fr-container %nav.fr-tabs{ role: 'navigation', 'aria-label': t('views.users.dossiers.secondary_menu') } diff --git a/app/views/experts/avis/index.html.haml b/app/views/experts/avis/index.html.haml index ca97bcc37..5dda97742 100644 --- a/app/views/experts/avis/index.html.haml +++ b/app/views/experts/avis/index.html.haml @@ -1,8 +1,10 @@ - content_for(:title, "Avis") -.container - %h1.page-title Avis +.sub-header + .fr-container + %h1.fr-h3 Avis +.fr-container %ul.procedure-list.fr-pl-0 - @avis_by_procedure.each do |p, procedure_avis| %li.flex.align-start.fr-my-3w.fr-p-2w{ id: dom_id(p) } diff --git a/app/views/instructeurs/procedures/_list.html.haml b/app/views/instructeurs/procedures/_list.html.haml index 868359274..ca839cb6d 100644 --- a/app/views/instructeurs/procedures/_list.html.haml +++ b/app/views/instructeurs/procedures/_list.html.haml @@ -1,13 +1,13 @@ %li.flex.align-start.fr-mb-5w .flex - = link_to instructeur_procedure_path(p), class: 'procedure-logo-link' do - .procedure-logo{ style: "background-image: url(#{p.logo_url})" } + .procedure-logo{ style: "background-image: url(#{p.logo_url})" } .procedure-details .flex.clipboard-container - %p.fr-mb-2w + .fr-mb-2w = procedure_badge(p) - = link_to("#{p.libelle} - n°#{p.id}", instructeur_procedure_path(p), class: "fr-link fr-ml-1w") + %h3.font-weight-normal.fr-link.fr-ml-1w + = link_to("#{p.libelle} - n°#{p.id}", instructeur_procedure_path(p)) = render Dsfr::CopyButtonComponent.new(title: t('instructeurs.procedures.index.copy_link_button'), text: commencer_url(p.path)) %ul.procedure-stats.flex diff --git a/app/views/instructeurs/procedures/_synthese.html.haml b/app/views/instructeurs/procedures/_synthese.html.haml index aa2760758..fcd0293d0 100644 --- a/app/views/instructeurs/procedures/_synthese.html.haml +++ b/app/views/instructeurs/procedures/_synthese.html.haml @@ -1,6 +1,6 @@ - if procedures.length > 1 .flex.align-center.fr-mb-2w - %h2.fr-text--sm.fr-mb-1w= t('views.instructeurs.dossiers.dossier_synthesis') + %p.font-weight-bold.fr-text--sm.fr-mb-1w= t('views.instructeurs.dossiers.dossier_synthesis') - all_dossiers_counts.each_with_index do |(label, dossier_count)| - if dossier_count != 0 %span.fr-badge.fr-ml-1w.fr-mb-1w= number_with_html_delimiter(dossier_count) + ' ' + label diff --git a/app/views/instructeurs/procedures/index.html.haml b/app/views/instructeurs/procedures/index.html.haml index a3ff48798..bae861f5b 100644 --- a/app/views/instructeurs/procedures/index.html.haml +++ b/app/views/instructeurs/procedures/index.html.haml @@ -30,7 +30,7 @@ - if collection.present? - .fr-h6 + %h2.fr-h6 = page_entries_info collection %ul.procedure-list.fr-pl-0 = render partial: 'instructeurs/procedures/list', diff --git a/app/views/users/dossiers/_deleted_dossiers_list.html.haml b/app/views/users/dossiers/_deleted_dossiers_list.html.haml index 86c8bf38c..4166ebb99 100644 --- a/app/views/users/dossiers/_deleted_dossiers_list.html.haml +++ b/app/views/users/dossiers/_deleted_dossiers_list.html.haml @@ -1,12 +1,12 @@ - if deleted_dossiers.present? - .fr-h6.fr-mb-2w + %h2.fr-h6.fr-mb-2w = page_entries_info deleted_dossiers - deleted_dossiers.each do |dossier| .card .flex.justify-between %div - %h2.card-title + %h3.card-title = dossier.procedure.libelle %p.fr-icon--sm.fr-icon-delete-line.fr-mb-0 diff --git a/app/views/users/dossiers/_dossiers_list.html.haml b/app/views/users/dossiers/_dossiers_list.html.haml index 86293b73e..877ab6f96 100644 --- a/app/views/users/dossiers/_dossiers_list.html.haml +++ b/app/views/users/dossiers/_dossiers_list.html.haml @@ -1,12 +1,12 @@ - if dossiers.present? - .fr-h6.fr-mb-2w + %h2.fr-h6.fr-mb-2w = page_entries_info dossiers - dossiers.each do |dossier| .card .flex.justify-between %div - %h2.card-title + %h3.card-title - if ["dossiers-transferes", "dossiers-supprimes-recemment"].exclude?(@statut) = link_to(url_for_dossier(dossier), class: 'cell-link') do = dossier.procedure.libelle