From 568303c3ff0587617a297b611661710c8f33d2c6 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Mon, 23 Oct 2017 17:26:17 +0200
Subject: [PATCH 1/2] adds data equalizer for results and stats sidebar

---
 app/assets/stylesheets/participation.scss | 8 +++++++-
 app/views/polls/results.html.erb          | 6 +++---
 app/views/polls/stats.html.erb            | 2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss
index ff2af5f2b..81757d78c 100644
--- a/app/assets/stylesheets/participation.scss
+++ b/app/assets/stylesheets/participation.scss
@@ -1807,7 +1807,13 @@
 .polls-results-stats {
 
   .sidebar {
-    border-right: 1px solid $border;
+    border-bottom: 1px solid $border;
+    margin-bottom: $line-height;
+
+    @include breakpoint(medium) {
+      border-bottom: 0;
+      border-right: 1px solid $border;
+    }
 
     .menu {
       padding: 0;
diff --git a/app/views/polls/results.html.erb b/app/views/polls/results.html.erb
index 07ca75bc3..7fc1be105 100644
--- a/app/views/polls/results.html.erb
+++ b/app/views/polls/results.html.erb
@@ -5,9 +5,9 @@
 
   <%= render "poll_subnav" %>
 
-  <div class="row margin">
-    <div class="small-12 medium-3 column sidebar">
       <h4>Preguntas</h4>
+  <div class="row margin" data-equalizer data-equalize-on="medium">
+    <div class="small-12 medium-3 column sidebar" data-equalizer-watch>
       <ul class="menu vertical">
         <%- @poll.questions.each do |question| %>
           <li><%=link_to question.title, "##{question.title.parameterize}" %></li>
@@ -15,7 +15,7 @@
       </ul>
     </div>
 
-    <div class="small-12 medium-9 column">
+    <div class="small-12 medium-9 column" data-equalizer-watch>
       <%- @poll.questions.each do |question| %>
         <table id="question_<%= question.id %>_results_table">
           <h3 id="<%= question.title.parameterize %>"><%= question.title %></h3>
diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb
index 3a4d99dba..a89277ac4 100644
--- a/app/views/polls/stats.html.erb
+++ b/app/views/polls/stats.html.erb
@@ -5,7 +5,7 @@
 
   <%= render "poll_subnav" %>
 
-  <div class="row margin" data-equalizer>
+  <div class="row margin" data-equalizer data-equalize-on="medium">
     <div class="small-12 medium-3 column sidebar" data-equalizer-watch>
       <p><strong><%= t("polls.show.stats.title") %></strong></p>
 

From 358449c87431f4a4d82bcf0b562720ccbcc828d3 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Mon, 23 Oct 2017 17:26:34 +0200
Subject: [PATCH 2/2] adds missing i18n

---
 app/views/polls/results.html.erb | 2 +-
 config/locales/en/general.yml    | 1 +
 config/locales/es/general.yml    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/polls/results.html.erb b/app/views/polls/results.html.erb
index 7fc1be105..4373da22d 100644
--- a/app/views/polls/results.html.erb
+++ b/app/views/polls/results.html.erb
@@ -5,9 +5,9 @@
 
   <%= render "poll_subnav" %>
 
-      <h4>Preguntas</h4>
   <div class="row margin" data-equalizer data-equalize-on="medium">
     <div class="small-12 medium-3 column sidebar" data-equalizer-watch>
+      <p><strong><%= t("polls.show.results.title") %></strong></p>
       <ul class="menu vertical">
         <%- @poll.questions.each do |question| %>
           <li><%=link_to question.title, "##{question.title.parameterize}" %></li>
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml
index 586a90a45..926410b51 100644
--- a/config/locales/en/general.yml
+++ b/config/locales/en/general.yml
@@ -514,6 +514,7 @@ en:
         white: "White votes"
         null_votes: "Invalid"
       results:
+        title: "Questions"
         most_voted_answer: "Most voted answer: "
   poll_questions:
     create_question: "Create question"
diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml
index 08fe25e1e..f82ba9ed7 100644
--- a/config/locales/es/general.yml
+++ b/config/locales/es/general.yml
@@ -514,6 +514,7 @@ es:
         white: "En blanco"
         null_votes: "Nulos"
       results:
+        title: "Preguntas"
         most_voted_answer: "Respuesta más votada: "
   poll_questions:
     create_question: "Crear pregunta para votación"