From 7be151bd2d3e1637a0d727a081a984f97e05ff9d Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mlorber@biosistemika.com>
Date: Tue, 30 Apr 2019 14:57:50 +0200
Subject: [PATCH] Visual fixes for edit/add step on protocol

---
 app/assets/stylesheets/my_modules/protocols/index.scss | 2 +-
 app/assets/stylesheets/steps.scss                      | 3 ---
 app/views/my_modules/protocols.html.erb                | 4 +++-
 app/views/steps/_edit.html.erb                         | 2 --
 app/views/steps/_new.html.erb                          | 2 --
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/my_modules/protocols/index.scss b/app/assets/stylesheets/my_modules/protocols/index.scss
index 0890e1184..647c23fd8 100644
--- a/app/assets/stylesheets/my_modules/protocols/index.scss
+++ b/app/assets/stylesheets/my_modules/protocols/index.scss
@@ -14,7 +14,7 @@
   }
 }
 
-.my-modules-protocols-index {
+.module-header {
   padding-top: 15px !important;
 
   .first-row {
diff --git a/app/assets/stylesheets/steps.scss b/app/assets/stylesheets/steps.scss
index af29e24f8..37cc59bc0 100644
--- a/app/assets/stylesheets/steps.scss
+++ b/app/assets/stylesheets/steps.scss
@@ -15,8 +15,6 @@
     list-style: none;
 
     li {
-      margin-bottom: 10px;
-
       & > div > span.pull-left {
         margin-top: 10px;
       }
@@ -388,4 +386,3 @@
   margin-top: 20px;
   width: 100%;
 }
-
diff --git a/app/views/my_modules/protocols.html.erb b/app/views/my_modules/protocols.html.erb
index d7e9a7d71..7dd561485 100644
--- a/app/views/my_modules/protocols.html.erb
+++ b/app/views/my_modules/protocols.html.erb
@@ -14,7 +14,9 @@
 } %>
 
 <div class="content-pane my-modules-protocols-index">
-  <%= render partial: "module_header" %>
+  <span class="module-header">
+    <%= render partial: "module_header" %>
+  </span>
 
   <h2>
     <%= t('Protocol') %>
diff --git a/app/views/steps/_edit.html.erb b/app/views/steps/_edit.html.erb
index c7b1c06cf..045839823 100644
--- a/app/views/steps/_edit.html.erb
+++ b/app/views/steps/_edit.html.erb
@@ -1,9 +1,7 @@
 <div class="well">
   <%= bootstrap_form_for(@step, url: step_path(id: @step.id, format: :json), remote: true, authenticity_token: true, multipart: true, data: { role: "edit-step-form", type: :json }) do |f| %>
     <h4><%= t("protocols.steps.edit.edit_step_title") %></h4>
-    <hr>
     <%= render partial: "empty_step.html.erb", locals: {step: @step, f: f} %>
-    <hr>
     <div class="align-right">
       <a type="button" data-action="cancel-edit" class="btn btn-default" href="<%= step_path(id: @step, format: :json) %>"  data-remote="true">
         <%= t("general.cancel")%>
diff --git a/app/views/steps/_new.html.erb b/app/views/steps/_new.html.erb
index 97ee98359..8aa2b461c 100644
--- a/app/views/steps/_new.html.erb
+++ b/app/views/steps/_new.html.erb
@@ -1,9 +1,7 @@
 <div class="well">
   <%= bootstrap_form_for(@step, url: protocol_steps_path(@protocol, format: :json), authenticity_token: true, multipart: true, data: { role: "new-step-form", type: :json }) do |f| %>
     <h4><%= t("protocols.steps.new.add_step_title") %></h4>
-    <hr>
     <%= render partial: "empty_step.html.erb", locals: {step: @step, f: f} %>
-    <hr>
     <div class="align-right">
       <button type="button" data-action="cancel-new" class="btn btn-default">
         <%= t("general.cancel")%>