diff --git a/app/assets/stylesheets/procedure_show.scss b/app/assets/stylesheets/procedure_show.scss index 9d3466d88..027934ea5 100644 --- a/app/assets/stylesheets/procedure_show.scss +++ b/app/assets/stylesheets/procedure_show.scss @@ -22,7 +22,6 @@ .dossiers-table { margin-top: $default-spacer; margin-bottom: 3 * $default-spacer; - overflow: visible; // remove DSFR hidden overflow because of dropdown } .procedure-actions { diff --git a/app/views/recherche/index.html.haml b/app/views/recherche/index.html.haml index ed16059ff..2057de441 100644 --- a/app/views/recherche/index.html.haml +++ b/app/views/recherche/index.html.haml @@ -1,6 +1,6 @@ - content_for(:title, "Recherche : #{@search_terms}") -.container +.fr-container - if @dossier_not_in_instructor_group.present? .fr-alert.fr-alert--info.fr-alert--sm.fr-mt-3w @@ -12,16 +12,17 @@ - if @projected_dossiers.present? = paginate @paginated_ids - %table.table.dossiers-table.hoverable - %thead - %tr - %th.notification-col - %th.number-col Nº dossier - %th Démarche - %th Demandeur - %th.status-col Statut - %th.action-col.follow-col - %tbody + .fr-table.fr-table--bordered + %table.table.dossiers-table.hoverable + %thead + %tr + %th.notification-col + %th.number-col Nº dossier + %th Démarche + %th Demandeur + %th.status-col Statut + %th.action-col.follow-col + %tbody - @projected_dossiers.each do |p| - procedure_libelle, user_email, procedure_id = p.columns - instructeur_dossier = @instructeur_dossiers_ids.include?(p.dossier_id) @@ -90,7 +91,9 @@ = t('views.instructeurs.dossiers.restore') - else - %td.action-col.follow-col= render partial: "instructeurs/procedures/dossier_actions", + %td.action-col.follow-col + %ul.inline.fr-btns-group.fr-btns-group--sm.fr-btns-group--inline.fr-btns-group--icon-right + = render partial: "instructeurs/procedures/dossier_actions", locals: { procedure_id: procedure_id, dossier_id: p.dossier_id, state: p.state,