From 2e107babfb0e2b74d163ec2b0ca26917d29e50f9 Mon Sep 17 00:00:00 2001 From: clemkeirua Date: Thu, 18 Jul 2019 16:51:34 +0200 Subject: [PATCH 1/2] meilleures marges monavis --- app/assets/stylesheets/new_design/merci.scss | 6 ++++++ app/views/users/dossiers/merci.html.haml | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/new_design/merci.scss b/app/assets/stylesheets/new_design/merci.scss index b9986c443..d6f7f5d15 100644 --- a/app/assets/stylesheets/new_design/merci.scss +++ b/app/assets/stylesheets/new_design/merci.scss @@ -30,4 +30,10 @@ a { margin-top: 40px; } + + .monavis { + img { + margin-top: 2*$default-padding; + } + } } diff --git a/app/views/users/dossiers/merci.html.haml b/app/views/users/dossiers/merci.html.haml index 941ffe36f..784df656d 100644 --- a/app/views/users/dossiers/merci.html.haml +++ b/app/views/users/dossiers/merci.html.haml @@ -23,4 +23,5 @@ .flex.column.align-center = link_to 'Accéder à votre dossier', dossier_path(@dossier), class: 'button large primary' = link_to 'Déposer un autre dossier', procedure_lien(@dossier.procedure) - != @dossier.procedure.monavis_embed + %div.monavis + != @dossier.procedure.monavis_embed From 50ddf723b0a99510d3df8bc5bde4176d3d95db75 Mon Sep 17 00:00:00 2001 From: clemkeirua Date: Thu, 18 Jul 2019 17:16:36 +0200 Subject: [PATCH 2/2] =?UTF-8?q?garde=20le=20bandeau=20bleu=20de=20navigati?= =?UTF-8?q?on=20apr=C3=A8s=20MAJ?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/new_design/merci.scss | 2 +- app/views/admin/procedures/monavis.html.haml | 2 +- ...ft_panel_admin_procedurescontroller_update_monavis.html.haml | 1 + .../_navbar_admin_procedurescontroller_monavis.html.haml | 1 + .../_navbar_admin_procedurescontroller_update_monavis.html.haml | 1 + app/views/users/dossiers/merci.html.haml | 2 +- 6 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_update_monavis.html.haml create mode 100644 app/views/layouts/navbars/_navbar_admin_procedurescontroller_monavis.html.haml create mode 100644 app/views/layouts/navbars/_navbar_admin_procedurescontroller_update_monavis.html.haml diff --git a/app/assets/stylesheets/new_design/merci.scss b/app/assets/stylesheets/new_design/merci.scss index d6f7f5d15..e52b91bb2 100644 --- a/app/assets/stylesheets/new_design/merci.scss +++ b/app/assets/stylesheets/new_design/merci.scss @@ -33,7 +33,7 @@ .monavis { img { - margin-top: 2*$default-padding; + margin-top: 2 * $default-padding; } } } diff --git a/app/views/admin/procedures/monavis.html.haml b/app/views/admin/procedures/monavis.html.haml index 226c2f24b..0b55058a2 100644 --- a/app/views/admin/procedures/monavis.html.haml +++ b/app/views/admin/procedures/monavis.html.haml @@ -1,6 +1,6 @@ .row.white-back #procedure_new.section.section-label - = form_for @procedure, url: url_for({ controller: 'admin/procedures', action: :update_monavis, id: @procedure.id }), multipart: true do |f| + = form_for @procedure, url: url_for({ controller: 'admin/procedures', action: :update_monavis }), multipart: true do |f| = render partial: 'monavis', locals: { f: f } .text-right = f.button 'Enregistrer', class: 'btn btn-success' diff --git a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_update_monavis.html.haml b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_update_monavis.html.haml new file mode 100644 index 000000000..fad3db3bb --- /dev/null +++ b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_update_monavis.html.haml @@ -0,0 +1 @@ += render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_navbar', locals: { active: 'MonAvis' } diff --git a/app/views/layouts/navbars/_navbar_admin_procedurescontroller_monavis.html.haml b/app/views/layouts/navbars/_navbar_admin_procedurescontroller_monavis.html.haml new file mode 100644 index 000000000..1ff68e01a --- /dev/null +++ b/app/views/layouts/navbars/_navbar_admin_procedurescontroller_monavis.html.haml @@ -0,0 +1 @@ += render partial: 'layouts/navbars/navbar_admin_procedurescontroller_index' diff --git a/app/views/layouts/navbars/_navbar_admin_procedurescontroller_update_monavis.html.haml b/app/views/layouts/navbars/_navbar_admin_procedurescontroller_update_monavis.html.haml new file mode 100644 index 000000000..1ff68e01a --- /dev/null +++ b/app/views/layouts/navbars/_navbar_admin_procedurescontroller_update_monavis.html.haml @@ -0,0 +1 @@ += render partial: 'layouts/navbars/navbar_admin_procedurescontroller_index' diff --git a/app/views/users/dossiers/merci.html.haml b/app/views/users/dossiers/merci.html.haml index 784df656d..4cd67b54b 100644 --- a/app/views/users/dossiers/merci.html.haml +++ b/app/views/users/dossiers/merci.html.haml @@ -23,5 +23,5 @@ .flex.column.align-center = link_to 'Accéder à votre dossier', dossier_path(@dossier), class: 'button large primary' = link_to 'Déposer un autre dossier', procedure_lien(@dossier.procedure) - %div.monavis + .monavis != @dossier.procedure.monavis_embed