diff --git a/app/assets/images/ballot.gif b/app/assets/images/ballot.gif
new file mode 100644
index 000000000..18cf0717f
Binary files /dev/null and b/app/assets/images/ballot.gif differ
diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss
index adb3d5247..673d27511 100644
--- a/app/assets/stylesheets/participation.scss
+++ b/app/assets/stylesheets/participation.scss
@@ -930,7 +930,7 @@
// 05. Featured
// ------------
-.featured-debates, .featured-proposals, .featured-proposals-ballot,
+.featured-debates, .featured-proposals,
.proposals-ballot, .proposals-ballot-list {
padding: $line-height/2 0;
@@ -1035,36 +1035,44 @@
// 06. Proposals successfull
// -------------------------
-.successfull-heading {
+.dark-heading {
background: #2D3E50;
color: white;
- min-height: $line-height*8;
+
+ @include breakpoint(medium) {
+ padding-bottom: $line-height;
+ }
p {
margin-bottom: 0;
+
+ &.title {
+ color: #FFD200;
+ }
}
.info {
- background: #34495E;
- padding: $line-height;
+ background: #314253;
+ padding-top: $line-height;
@include breakpoint(medium) {
- border-radius: rem-calc(6);
+ border-top: rem-calc(6) solid #FFD200;
}
}
}
.featured-proposals-ballot-banner {
- background: #2D3E50;
+ background: #2D3E50 image-url("ballot.gif");
+ background-position: 90% 0;
+ background-repeat: no-repeat;
position: relative;
- text-align: center;
- h2, p {
- color: white;
+ h2, a:hover h2 {
+ color: #FFD200 !important;
}
- .button {
- background: #E74B3C;
+ p {
+ color: white;
}
@include breakpoint(medium) {
@@ -1073,35 +1081,11 @@
}
}
-.featured-proposals-ballot {
- background: #FFFBCC;
- position: relative;
-
- .button {
- color: white;
- font-size: $base-font-size;
- margin-bottom: 0;
- }
-
- a {
- display: block;
- padding: $line-height/2 0;
-
- &:hover {
- text-decoration: none;
- }
-
- &:focus {
- outline: none;
- }
- }
-}
-
-.featured-proposals-ballot, .featured-proposals-ballot-banner,
+.featured-proposals-ballot-banner,
.successfull .panel {
.icon-successfull {
- border-right: 60px solid #34495E;
+ border-right: 60px solid #FFD200;
border-top: 0;
border-bottom: 60px solid transparent;
height: 0;
@@ -1111,7 +1095,7 @@
width: 0;
&:after {
- color: white;
+ color: #1B254C;
content: "\59";
font-family: "icons" !important;
left: 34px;
diff --git a/app/views/proposal_ballots/_featured_successfull_proposal.html.erb b/app/views/proposal_ballots/_featured_successfull_proposal.html.erb
deleted file mode 100644
index 3cc18a992..000000000
--- a/app/views/proposal_ballots/_featured_successfull_proposal.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
<%= link_to proposal.title, proposal_ballots_path %>
-
diff --git a/app/views/proposal_ballots/index.html.erb b/app/views/proposal_ballots/index.html.erb
index 6206a856c..76155d181 100644
--- a/app/views/proposal_ballots/index.html.erb
+++ b/app/views/proposal_ballots/index.html.erb
@@ -1,6 +1,6 @@
-
+
-
+
<%= t("proposal_ballots.title") %>
@@ -11,7 +11,7 @@
-
<%= t("proposal_ballots.date_title") %>
+
<%= t("proposal_ballots.date_title") %>
<%= t("proposal_ballots.date") %>
diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb
index 5dee606d0..e314b7ad4 100644
--- a/app/views/proposals/index.html.erb
+++ b/app/views/proposals/index.html.erb
@@ -32,29 +32,14 @@
<% end %>
<% if @proposal_ballots.present? %>
-
-
-
-
- <%= t("proposal_ballots.featured_title") %>
-
-
<%= t("proposal_ballots.info") %>
-
- <%= link_to t("proposal_ballots.info_button"), proposal_ballots_path, class: "button expanded" %>
+
+ <%= link_to proposal_ballots_path do %>
+
+
+
<%= t("proposal_ballots.featured_title") %>
+
<%= t("proposal_ballots.info") %>
-
-
-
-
-
-
-
- <%= t("proposal_ballots.featured_title") %>
-
- <% @proposal_ballots.each do |proposal_ballot| %>
- <%= render "proposal_ballots/featured_successfull_proposal", proposal: proposal_ballot %>
- <% end %>
-
+ <% end %>
<% elsif @featured_proposals.present? %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 56aa19bbe..ca999c2ca 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -374,15 +374,15 @@ en:
submit_button: Save changes
proposal_ballots:
title: "Votings"
- description_html: "These are the proposals that have reached the required supports (%{supports}) and will be voted."
+ description_html: "The proposals that have reached the required supports (%{supports}) will be voted."
date_title: "Dates of participation"
- date: "September 15 to September 30, 2016"
+ date: "November 21 to November 27, 2016"
successfull: "This proposal has reached the required supports and will be voted in the %{voting}."
voting: "next voting"
- featured_title: "Next voting"
+ featured_title: "#VotingProposal"
nothing_to_vote: "There is nothing to vote at the moment."
info: "There are proposals that have reached the required supports and will be voted."
- info_button: "More information about voting"
+ button: "I want to vote"
proposal_notifications:
new:
title: "Send message"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 657c4c0d0..4bd924b21 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -374,15 +374,15 @@ es:
submit_button: Guardar cambios
proposal_ballots:
title: "Votaciones"
- description_html: "Estas son las propuestas que han alcanzado el número de apoyos necesarios (%{supports}) y que pasarán a la siguiente votación."
+ description_html: "Las propuestas que han alcanzado el número de apoyos necesarios (%{supports}) pasarán a votación."
date_title: "Fechas de participación"
- date: "Del 15 de septiembre al 30 de septiembre de 2016"
+ date: "Del 21 de noviembre al 27 de noviembre de 2016"
successfull: "Esta propuesta ha alcanzado los apoyos necesarios y pasará a la %{voting}."
voting: "próxima votación"
- featured_title: "Próxima votación"
+ featured_title: "#VotaUnaPropuesta"
nothing_to_vote: "No hay nada que votar en este momento."
- info: "Hay propuestas que han alcanzado el número de apoyos necesarios y pasarán a la siguiente votación."
- info_button: "Más información sobre la votación"
+ info: "Algunas propuestas ya han conseguido los apoyos para pasar a votación."
+ button: "Quiero participar"
proposal_notifications:
new:
title: "Enviar mensaje"