From 17c84504500380571a2537a92aa76b219c02b55b Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Fri, 10 Mar 2023 17:54:10 +0100 Subject: [PATCH 1/2] adjust badge alignement for users dossiers --- app/assets/stylesheets/dossier_views.scss | 16 ---------------- app/views/shared/dossiers/_header.html.haml | 6 +++--- app/views/users/dossiers/show/_header.html.haml | 7 +++---- 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/app/assets/stylesheets/dossier_views.scss b/app/assets/stylesheets/dossier_views.scss index 95190b43c..ddfc50980 100644 --- a/app/assets/stylesheets/dossier_views.scss +++ b/app/assets/stylesheets/dossier_views.scss @@ -3,22 +3,6 @@ .dossier-container { .sub-header { - .label { - float: right; - margin-left: $default-spacer; - } - - .title-container { - margin-bottom: $default-spacer; - padding-left: 32px; - - .icon.folder { - float: left; - margin-left: -32px; - margin-top: 3px; - } - } - h1 { color: $black; font-size: 22px; diff --git a/app/views/shared/dossiers/_header.html.haml b/app/views/shared/dossiers/_header.html.haml index 95e985c6c..dcf36bd7f 100644 --- a/app/views/shared/dossiers/_header.html.haml +++ b/app/views/shared/dossiers/_header.html.haml @@ -1,7 +1,7 @@ -= status_badge(dossier.state) .title-container - %span.icon.folder - %h1= procedure_libelle(dossier.procedure) + %h1 + = procedure_libelle(dossier.procedure) + = status_badge(dossier.state, 'super') %h2 = t('views.users.dossiers.show.header.dossier_number', dossier_id: dossier.id) = t('views.users.dossiers.show.header.created_date', date_du_dossier: I18n.l(dossier.created_at)) diff --git a/app/views/users/dossiers/show/_header.html.haml b/app/views/users/dossiers/show/_header.html.haml index 14179155d..55e5877ef 100644 --- a/app/views/users/dossiers/show/_header.html.haml +++ b/app/views/users/dossiers/show/_header.html.haml @@ -1,10 +1,9 @@ .sub-header .container - = status_badge(dossier.state) - .title-container - %span.icon.folder - %h1= dossier.procedure.libelle + %h1 + = dossier.procedure.libelle + = status_badge(dossier.state, 'super') %h2 = t('views.users.dossiers.show.header.dossier_number', dossier_id: dossier.id) - if dossier.depose_at.present? From 2554f72668e5d57decbc52deef2ca964d2c0f1d6 Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Tue, 14 Mar 2023 11:04:19 +0100 Subject: [PATCH 2/2] remove useless class in html --- app/views/shared/dossiers/_header.html.haml | 29 +++++++++---------- .../users/dossiers/show/_header.html.haml | 17 +++++------ 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/app/views/shared/dossiers/_header.html.haml b/app/views/shared/dossiers/_header.html.haml index dcf36bd7f..3dafe0e39 100644 --- a/app/views/shared/dossiers/_header.html.haml +++ b/app/views/shared/dossiers/_header.html.haml @@ -1,18 +1,17 @@ -.title-container - %h1 - = procedure_libelle(dossier.procedure) - = status_badge(dossier.state, 'super') - %h2 - = t('views.users.dossiers.show.header.dossier_number', dossier_id: dossier.id) - = t('views.users.dossiers.show.header.created_date', date_du_dossier: I18n.l(dossier.created_at)) +%h1 + = procedure_libelle(dossier.procedure) + = status_badge(dossier.state, 'super') +%h2 + = t('views.users.dossiers.show.header.dossier_number', dossier_id: dossier.id) + = t('views.users.dossiers.show.header.created_date', date_du_dossier: I18n.l(dossier.created_at)) - = render(partial: 'users/dossiers/expiration_banner', locals: {dossier: dossier}) += render(partial: 'users/dossiers/expiration_banner', locals: {dossier: dossier}) - - if dossier.show_procedure_state_warning? - = render(partial: 'users/dossiers/procedure_removed_banner', locals: { dossier: dossier }) - - elsif current_user.owns?(dossier) - .header-actions - = render partial: 'invites/dropdown', locals: { dossier: dossier, morphing: false } +- if dossier.show_procedure_state_warning? + = render(partial: 'users/dossiers/procedure_removed_banner', locals: { dossier: dossier }) +- elsif current_user.owns?(dossier) + .header-actions + = render partial: 'invites/dropdown', locals: { dossier: dossier, morphing: false } - - unless dossier.read_only? - = render partial: 'users/dossiers/identity_dropdown', locals: { dossier: dossier } + - unless dossier.read_only? + = render partial: 'users/dossiers/identity_dropdown', locals: { dossier: dossier } diff --git a/app/views/users/dossiers/show/_header.html.haml b/app/views/users/dossiers/show/_header.html.haml index 55e5877ef..62836d088 100644 --- a/app/views/users/dossiers/show/_header.html.haml +++ b/app/views/users/dossiers/show/_header.html.haml @@ -1,15 +1,14 @@ .sub-header .container - .title-container - %h1 - = dossier.procedure.libelle - = status_badge(dossier.state, 'super') - %h2 - = t('views.users.dossiers.show.header.dossier_number', dossier_id: dossier.id) - - if dossier.depose_at.present? - = t('views.users.dossiers.show.header.submit_date', date_du_dossier: I18n.l(dossier.depose_at)) + %h1 + = dossier.procedure.libelle + = status_badge(dossier.state, 'super') + %h2 + = t('views.users.dossiers.show.header.dossier_number', dossier_id: dossier.id) + - if dossier.depose_at.present? + = t('views.users.dossiers.show.header.submit_date', date_du_dossier: I18n.l(dossier.depose_at)) - = render(partial: 'users/dossiers/expiration_banner', locals: {dossier: dossier}) + = render(partial: 'users/dossiers/expiration_banner', locals: {dossier: dossier}) - if dossier.show_procedure_state_warning? = render(partial: 'users/dossiers/procedure_removed_banner', locals: { dossier: dossier })