From 28e17b870ce877788f097f0b4f9b5cf5a0bb36ab Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Wed, 24 May 2017 13:03:25 +0200
Subject: [PATCH] unifies styles and html code

---
 app/assets/stylesheets/legislation.scss       |  2 +-
 .../legislation/draft_versions/_form.html.erb | 22 ++++++++---------
 .../legislation/draft_versions/new.html.erb   |  2 +-
 .../legislation/questions/_form.html.erb      | 24 ++++++++-----------
 .../legislation/annotations/_form.html.erb    |  1 -
 app/views/legislation/annotations/new.js.erb  |  1 -
 .../legislation/annotations/show.html.erb     |  1 +
 .../legislation/draft_versions/show.html.erb  |  1 -
 8 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/app/assets/stylesheets/legislation.scss b/app/assets/stylesheets/legislation.scss
index 2ebbfd01c..c3917ad8c 100644
--- a/app/assets/stylesheets/legislation.scss
+++ b/app/assets/stylesheets/legislation.scss
@@ -58,7 +58,7 @@
 // 03. Legislation cards
 // -----------------
 .legislation {
-  margin: 0 0 5rem 0;
+  margin: 0 0 $line-height 0;
   background: white;
   border: 1px solid;
   border-color: #e5e6e9 #dfe0e4 #d0d1d5;
diff --git a/app/views/admin/legislation/draft_versions/_form.html.erb b/app/views/admin/legislation/draft_versions/_form.html.erb
index 612bc79e7..6bf8d2639 100644
--- a/app/views/admin/legislation/draft_versions/_form.html.erb
+++ b/app/views/admin/legislation/draft_versions/_form.html.erb
@@ -1,19 +1,17 @@
 <%= form_for [:admin, @process, @draft_version], url: url, html: {data: {watch_changes: true}} do |f| %>
 
   <% if @draft_version.errors.any? %>
+    <div id="error_explanation" data-alert class="callout alert" data-closable>
+      <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
+        <span aria-hidden="true">&times;</span>
+      </button>
 
-  <div id="error_explanation" data-alert class="callout alert" data-closable>
-    <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
-      <span aria-hidden="true">&times;</span>
-    </button>
-
-    <strong>
-      <%= @draft_version.errors.count %>
-      <%= t("admin.legislation.draft_versions.errors.form.error", count: @draft_version.errors.count) %>
-    </strong>
-  </div>
-
-<% end %>
+      <strong>
+        <%= @draft_version.errors.count %>
+        <%= t("admin.legislation.draft_versions.errors.form.error", count: @draft_version.errors.count) %>
+      </strong>
+    </div>
+  <% end %>
 
   <div class="row">
     <div class="small-12 medium-4 column">
diff --git a/app/views/admin/legislation/draft_versions/new.html.erb b/app/views/admin/legislation/draft_versions/new.html.erb
index b43bfc276..9ef7eef3b 100644
--- a/app/views/admin/legislation/draft_versions/new.html.erb
+++ b/app/views/admin/legislation/draft_versions/new.html.erb
@@ -2,7 +2,7 @@
   Admin - <%= t("admin.menu.legislation") %> - <%= @process.title %> - <%= t("admin.legislation.draft_versions.index.title") %> - <%= t("admin.legislation.draft_versions.new.title") %>
 <% end %>
 
-<div class="legislation-admin  legislation-draft-versions-new legislation-draft-versions-form  row">
+<div class="legislation-admin legislation-draft-versions-new legislation-draft-versions-form row">
   <div class="small-12 column">
     <%= link_to admin_legislation_process_draft_versions_path(@process), class: "back" do %>
       <span class="icon-angle-left"></span>
diff --git a/app/views/admin/legislation/questions/_form.html.erb b/app/views/admin/legislation/questions/_form.html.erb
index 4b0cf8ce5..1843f6c3a 100644
--- a/app/views/admin/legislation/questions/_form.html.erb
+++ b/app/views/admin/legislation/questions/_form.html.erb
@@ -1,20 +1,17 @@
 <%= form_for [:admin, @process, @question], url: url, html: {data: {watch_changes: true}} do |f| %>
 
   <% if @question.errors.any? %>
+    <div id="error_explanation" data-alert class="callout alert" data-closable>
+      <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
+        <span aria-hidden="true">&times;</span>
+      </button>
 
-  <div id="error_explanation" data-alert class="callout alert" data-closable>
-    <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
-      <span aria-hidden="true">&times;</span>
-    </button>
-
-    <strong>
-      <%= @question.errors.count %>
-      <%= t("admin.legislation.questions.errors.form.error", count: @question.errors.count) %>
-    </strong>
-  </div>
-
-<% end %>
-
+      <strong>
+        <%= @question.errors.count %>
+        <%= t("admin.legislation.questions.errors.form.error", count: @question.errors.count) %>
+      </strong>
+    </div>
+  <% end %>
 
   <div class="small-12 medium-4 column">
     <%= f.label :title %>
@@ -35,7 +32,6 @@
     <%= link_to_add_association t('.add_option'), f, :question_options %>
   </div>
 
-
   <div class="row">
     <div class="actions small-12 medium-3 column legislation-process-save">
       <%= f.submit(class: "button expanded", value: t("admin.legislation.questions.#{admin_submit_action(@question)}.submit_button")) %>
diff --git a/app/views/legislation/annotations/_form.html.erb b/app/views/legislation/annotations/_form.html.erb
index 253fcc9fd..91d9b3247 100644
--- a/app/views/legislation/annotations/_form.html.erb
+++ b/app/views/legislation/annotations/_form.html.erb
@@ -34,4 +34,3 @@
     </div>
   </div>
 </div>
-
diff --git a/app/views/legislation/annotations/new.js.erb b/app/views/legislation/annotations/new.js.erb
index 9b719814c..21bdd03b0 100644
--- a/app/views/legislation/annotations/new.js.erb
+++ b/app/views/legislation/annotations/new.js.erb
@@ -1,2 +1 @@
 $("#comments-box").html("<%= j render('form') %>");
-
diff --git a/app/views/legislation/annotations/show.html.erb b/app/views/legislation/annotations/show.html.erb
index a299d160e..65ce8e947 100644
--- a/app/views/legislation/annotations/show.html.erb
+++ b/app/views/legislation/annotations/show.html.erb
@@ -44,3 +44,4 @@
       </div>
     </div>
   </div>
+</div>
diff --git a/app/views/legislation/draft_versions/show.html.erb b/app/views/legislation/draft_versions/show.html.erb
index 45e8d3b5f..9872874cd 100644
--- a/app/views/legislation/draft_versions/show.html.erb
+++ b/app/views/legislation/draft_versions/show.html.erb
@@ -76,5 +76,4 @@
 
     </div>
   </div>
-
 </div>