diff --git a/app/assets/stylesheets/new_design/dossier_show.scss b/app/assets/stylesheets/new_design/dossier_show.scss index 971c7cc70..e26367a75 100644 --- a/app/assets/stylesheets/new_design/dossier_show.scss +++ b/app/assets/stylesheets/new_design/dossier_show.scss @@ -38,10 +38,6 @@ } } - .button.edit-form { - float: right; - } - .messagerie-explanation { margin-bottom: $default-padding * 2; } diff --git a/app/views/invites/_dropdown.html.haml b/app/views/invites/_dropdown.html.haml index 869804b53..368c359ef 100644 --- a/app/views/invites/_dropdown.html.haml +++ b/app/views/invites/_dropdown.html.haml @@ -1,4 +1,4 @@ -%span.dropdown.invite-user-action{ :style => "float:right;right: 10px;" } +%span.dropdown.invite-user-action %button.button.dropdown-button %span.icon.person - if dossier.invites.count > 0 diff --git a/app/views/users/dossiers/show/_header.html.haml b/app/views/users/dossiers/show/_header.html.haml index 910e220a7..96341a4fe 100644 --- a/app/views/users/dossiers/show/_header.html.haml +++ b/app/views/users/dossiers/show/_header.html.haml @@ -11,10 +11,10 @@ = "- Déposé le #{l(dossier.en_construction_at, format: '%d %B %Y')}" - if current_user.owns?(dossier) - - if dossier.can_be_updated_by_user? - = link_to "Modifier mon dossier", modifier_dossier_path(dossier.id), class: 'button accepted edit-form', 'title'=> "Vous pouvez modifier votre dossier tant qu'il n'est passé en instruction" - = render partial: 'invites/dropdown', locals: { dossier: dossier } - .clearfix + .header-actions + = render partial: 'invites/dropdown', locals: { dossier: dossier } + - if dossier.can_be_updated_by_user? + = link_to "Modifier mon dossier", modifier_dossier_path(dossier.id), class: 'button accepted edit-form', 'title'=> "Vous pouvez modifier votre dossier tant qu'il n'est passé en instruction" %ul.tabs = dynamic_tab_item('Résumé', dossier_path(dossier))