From 101a50a96e6b43975a53d54fd10715dd38b4d56f Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Mon, 7 Sep 2015 16:36:33 +0200
Subject: [PATCH] Improves layout styles

---
 app/assets/stylesheets/debates.scss           | 16 +++++
 app/assets/stylesheets/participacion.scss     | 15 ++--
 app/views/account/show.html.erb               |  2 +-
 app/views/debates/_form.html.erb              | 10 +--
 app/views/layouts/application.html.erb        | 16 +++--
 app/views/users/registrations/edit.html.erb   | 69 +++++++++----------
 app/views/verification/residence/new.html.erb | 10 +--
 7 files changed, 78 insertions(+), 60 deletions(-)

diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss
index 5b8bc029f..043cfe4f6 100644
--- a/app/assets/stylesheets/debates.scss
+++ b/app/assets/stylesheets/debates.scss
@@ -240,6 +240,14 @@
       a {
         color: $text;
       }
+
+      ul, ol {
+
+        li {
+          font-size: rem-calc(13);
+          margin-bottom: rem-calc(12);
+        }
+      }
     }
 
     .truncate {
@@ -433,6 +441,14 @@
     }
   }
 
+  ul, ol {
+
+    li {
+      font-size: rem-calc(13);
+      margin-bottom: rem-calc(12);
+    }
+  }
+
   .author-photo {
     line-height: $line-height*2;
     margin-right: rem-calc(6);
diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss
index 8325df00f..43d040ecb 100644
--- a/app/assets/stylesheets/participacion.scss
+++ b/app/assets/stylesheets/participacion.scss
@@ -280,7 +280,7 @@ header {
     min-height: rem-calc(48);
 
     @media (min-width: $small-breakpoint) {
-      min-height: rem-calc(189);
+      min-height: 189px;
     }
   }
 
@@ -901,12 +901,6 @@ form {
   }
 }
 
-.alert-layout {
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-
 span.error, small.error {
   background: $alert-bg;
   color: $alert-color;
@@ -923,6 +917,11 @@ label.error, label.error a {
   color: $alert-color;
 }
 
+.alert-messages {
+  background-color: white;
+  padding-top: rem-calc(24);
+}
+
 // 10. User account
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -1351,7 +1350,7 @@ table {
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
 .verification {
-  min-height: 60%;
+  min-height: rem-calc(600);
 
   @media (min-width: $small-breakpoint) {
     .left + .left {
diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb
index 1d7ecaf7e..5fe455a6f 100644
--- a/app/views/account/show.html.erb
+++ b/app/views/account/show.html.erb
@@ -2,7 +2,7 @@
   <div class="small-12 column">
     <%= link_to t("account.show.change_credentials_link"), edit_user_registration_path, class: "button radius small secondary right" %>
 
-    <div class="verification">
+    <div>
       <span class="right verify-account">
         <% if current_user.level_three_verified? %>
           <p class="verified">
diff --git a/app/views/debates/_form.html.erb b/app/views/debates/_form.html.erb
index 313ec29a3..e9d750c8a 100644
--- a/app/views/debates/_form.html.erb
+++ b/app/views/debates/_form.html.erb
@@ -20,16 +20,18 @@
           <a class="js-add-tag-link"><%= tag.name %></a>
         <% end %>
       </span>
-      <%= f.text_field :tag_list, value: @debate.tag_list.to_s, label: false %>
+      <%= f.text_field :tag_list, value: @debate.tag_list.to_s, label: false, placeholder: t("debates.form.tags_placeholder") %>
     </div>
 
     <div class="small-12 column">
       <% if @debate.new_record? %>
         <%= f.label :terms_of_service do %>
           <%= f.check_box :terms_of_service, label: false %>
-          <%= t("form.accept_terms",
-              policy: link_to(t("form.policy"), "/privacy", target: "blank"), conditions: link_to(t("form.conditions"), "/conditions", target: "blank")).html_safe
-          %>
+          <span class="checkbox">
+            <%= t("form.accept_terms",
+                policy: link_to(t("form.policy"), "/privacy", target: "blank"),
+                conditions: link_to(t("form.conditions"), "/conditions", target: "blank")).html_safe %>
+          </span>
         <% end %>
       <% end %>
     </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index b9e33e7b3..c9fa49ee0 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -16,21 +16,25 @@
       <%= render 'layouts/header' %>
 
       <% if notice %>
-        <div data-alert class="alert-box success alert-layout">
-          <a href="#" class="close">&times;</a>
-          <div class="row">
+      <div class="alert-messages">
+        <div class="row">
+          <div data-alert class="alert-box success radius">
+            <a href="#" class="close">&times;</a>
             <%= notice %>
           </div>
         </div>
+      </div>
       <% end %>
 
       <% if alert %>
-        <div data-alert class="alert-box alert alert-layout">
-          <a href="#" class="close">&times;</a>
-          <div class="row">
+      <div class="alert-messages">
+        <div class="row">
+          <div data-alert class="alert-box alert radius">
+            <a href="#" class="close">&times;</a>
             <%= alert %>
           </div>
         </div>
+      </div>
       <% end %>
 
       <%= yield %>
diff --git a/app/views/users/registrations/edit.html.erb b/app/views/users/registrations/edit.html.erb
index 1c6c7f5f2..2e330b752 100644
--- a/app/views/users/registrations/edit.html.erb
+++ b/app/views/users/registrations/edit.html.erb
@@ -1,45 +1,40 @@
-<div class="row">
-  <div class="account small-12 medium-9 column small-centered">
+<i class="icon-angle-left left"></i>&nbsp;<%= link_to t("devise_views.users.registrations.edit.back_link"), :back, class: "left back" %>
 
-    <i class="icon-angle-left left"></i>&nbsp;<%= link_to t("devise_views.users.registrations.edit.back_link"), :back, class: "left back" %>
+<h1><%= t("devise_views.users.registrations.edit.edit") %></h1>
 
-    <h1><%= t("devise_views.users.registrations.edit.edit") %></h1>
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
+  <%= devise_error_messages! %>
+  <div class="row">
+    <div class="small-12 column">
+      <%= f.label :email, t("devise_views.users.registrations.edit.email_label") %>
+      <%= f.email_field :email, label: false, autofocus: true, placeholder: t("devise_views.users.registrations.edit.email_label") %>
+    </div>
 
-    <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
-      <%= devise_error_messages! %>
-      <div class="row">
-        <div class="small-12 column">
-          <%= f.label :email, t("devise_views.users.registrations.edit.email_label") %>
-          <%= f.email_field :email, label: false, autofocus: true, placeholder: t("devise_views.users.registrations.edit.email_label") %>
-        </div>
+    <div class="small-12 column">
+      <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
+        <div><%= t("devise_views.users.registrations.edit.waiting_for") %> <%= resource.unconfirmed_email %></div>
+      <% end %>
+    </div>
 
-        <div class="small-12 column">
-          <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
-            <div><%= t("devise_views.users.registrations.edit.waiting_for") %> <%= resource.unconfirmed_email %></div>
-          <% end %>
-        </div>
+    <div class="small-12 column">
+      <%= f.label :password, t("devise_views.users.registrations.edit.password_label") %>
+      <span class="note"><%= t("devise_views.users.registrations.edit.leave_blank") %></span>
+      <%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.users.registrations.edit.password_label") %>
+    </div>
 
-        <div class="small-12 column">
-          <%= f.label :password, t("devise_views.users.registrations.edit.password_label") %>
-          <span class="note"><%= t("devise_views.users.registrations.edit.leave_blank") %></span>
-          <%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.users.registrations.edit.password_label") %>
-        </div>
+    <div class="small-12 column">
+      <%= f.label :password_confirmation, t("devise_views.users.registrations.edit.password_confirmation_label") %>
+      <%= f.password_field :password_confirmation, label: false, autocomplete: "off", placeholder: t("devise_views.users.registrations.edit.password_confirmation_label") %>
+    </div>
 
-        <div class="small-12 column">
-          <%= f.label :password_confirmation, t("devise_views.users.registrations.edit.password_confirmation_label") %>
-          <%= f.password_field :password_confirmation, label: false, autocomplete: "off", placeholder: t("devise_views.users.registrations.edit.password_confirmation_label") %>
-        </div>
+    <div class="small-12 column">
+      <%= f.label :current_password, t("devise_views.users.registrations.edit.current_password_label") %>
+      <span class="note"><%= t("devise_views.users.registrations.edit.need_current") %></span>
+      <%= f.password_field :current_password, label: false, autocomplete: "off", placeholder:  t("devise_views.users.registrations.edit.current_password_label") %>
+    </div>
 
-        <div class="small-12 column">
-          <%= f.label :current_password, t("devise_views.users.registrations.edit.current_password_label") %>
-          <span class="note"><%= t("devise_views.users.registrations.edit.need_current") %></span>
-          <%= f.password_field :current_password, label: false, autocomplete: "off", placeholder:  t("devise_views.users.registrations.edit.current_password_label") %>
-        </div>
-
-        <div class="small-12 column">
-          <%= f.submit t("devise_views.users.registrations.edit.update_submit"), class: "button radius" %>
-        </div>
-      </div>
-    <% end %>
+    <div class="small-12 column">
+      <%= f.submit t("devise_views.users.registrations.edit.update_submit"), class: "button radius" %>
+    </div>
   </div>
-</div>
+<% end %>
diff --git a/app/views/verification/residence/new.html.erb b/app/views/verification/residence/new.html.erb
index b66e5b179..30d86f4b5 100644
--- a/app/views/verification/residence/new.html.erb
+++ b/app/views/verification/residence/new.html.erb
@@ -54,10 +54,12 @@
       <div class="small-12">
         <%= f.label :terms_of_service do %>
           <%= f.check_box :terms_of_service, label: false %>
-          <%= t("verification.residence.new.accept_terms_text",
-              terms_url: link_to(t("verification.residence.new.terms"), "/census_terms",
-              target: "_blank")).html_safe
-          %>
+          <span class="checkbox">
+            <%= t("verification.residence.new.accept_terms_text",
+                terms_url: link_to(t("verification.residence.new.terms"), "/census_terms",
+                target: "_blank")).html_safe
+            %>
+          </span>
         <% end %>
       </div>