From dbb547b3ee241cc8f07e9ee1f747713b542c48b6 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Tue, 7 Feb 2023 15:43:44 +0100
Subject: [PATCH 1/2] Reduce print margin for step [SCI-7237]

---
 app/assets/stylesheets/layouts/print_protocol.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/layouts/print_protocol.scss b/app/assets/stylesheets/layouts/print_protocol.scss
index c6b8095d4..2905fbb12 100644
--- a/app/assets/stylesheets/layouts/print_protocol.scss
+++ b/app/assets/stylesheets/layouts/print_protocol.scss
@@ -55,7 +55,7 @@ hr {
 }
 
 .print-step {
-  margin: 5em 0;
+  margin: 2em 0;
 }
 
 .step-check-circle {

From befb2edfcfa733f333d6bfab6c5686a9a403ee99 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Tue, 7 Feb 2023 15:44:53 +0100
Subject: [PATCH 2/2] Strip trailling carriage and newlines in TinyMCE text
 [SCI-7237]

---
 app/views/protocols/print.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/protocols/print.html.erb b/app/views/protocols/print.html.erb
index 5845bb01c..04de9043e 100644
--- a/app/views/protocols/print.html.erb
+++ b/app/views/protocols/print.html.erb
@@ -34,7 +34,7 @@
         <% step_text = step_element.orderable %>
         <div class="print-step-text">
           <div class="ql-editor">
-          <%= custom_auto_link(step_text.tinymce_render(:text),
+          <%= custom_auto_link(step_text.tinymce_render(:text).gsub(/<p>\S<\/p>/, '').strip,
                                 simple_format: false,
                                 tags: %w(img),
                                 team: current_team,