DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8755 from demarches-simplifiees/adjust-badge-for-usager

Browse source 
[design] Corriger l'alignement des badges du dossier côté usager
This commit is contained in:
Lisa Durand 2023-03-14 13:11:57 +00:00 committed by GitHub
commit ff10a03ffe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/assets/stylesheets/dossier_views.scss
View file

@ -3,22 +3,6 @@
.dossier-container { .dossier-container {
.sub-header { .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 { h1 {
color: $black; color: $black;
font-size: 22px; font-size: 22px;

29
app/views/shared/dossiers/_header.html.haml
View file

@ -1,18 +1,17 @@
= status_badge(dossier.state) %h1
.title-container = procedure_libelle(dossier.procedure)
%span.icon.folder = status_badge(dossier.state, 'super')
%h1= procedure_libelle(dossier.procedure) %h2
%h2 = t('views.users.dossiers.show.header.dossier_number', dossier_id: dossier.id)
= 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))
= 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? - if dossier.show_procedure_state_warning?
= render(partial: 'users/dossiers/procedure_removed_banner', locals: { dossier: dossier }) = render(partial: 'users/dossiers/procedure_removed_banner', locals: { dossier: dossier })
- elsif current_user.owns?(dossier) - elsif current_user.owns?(dossier)
.header-actions .header-actions
= render partial: 'invites/dropdown', locals: { dossier: dossier, morphing: false } = render partial: 'invites/dropdown', locals: { dossier: dossier, morphing: false }
- unless dossier.read_only? - unless dossier.read_only?
= render partial: 'users/dossiers/identity_dropdown', locals: { dossier: dossier } = render partial: 'users/dossiers/identity_dropdown', locals: { dossier: dossier }

18
app/views/users/dossiers/show/_header.html.haml
View file

@ -1,16 +1,14 @@
.sub-header .sub-header
.container .container
= status_badge(dossier.state) %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))
.title-container = render(partial: 'users/dossiers/expiration_banner', locals: {dossier: dossier})
%span.icon.folder
%h1= dossier.procedure.libelle
%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})
- if dossier.show_procedure_state_warning? - if dossier.show_procedure_state_warning?
= render(partial: 'users/dossiers/procedure_removed_banner', locals: { dossier: dossier }) = render(partial: 'users/dossiers/procedure_removed_banner', locals: { dossier: dossier })