Improves proposal ballot banner, deletes unused partial
This commit is contained in:
BIN
app/assets/images/ballot.gif
Normal file
BIN
app/assets/images/ballot.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.0 KiB |
@@ -930,7 +930,7 @@
|
|||||||
// 05. Featured
|
// 05. Featured
|
||||||
// ------------
|
// ------------
|
||||||
|
|
||||||
.featured-debates, .featured-proposals, .featured-proposals-ballot,
|
.featured-debates, .featured-proposals,
|
||||||
.proposals-ballot, .proposals-ballot-list {
|
.proposals-ballot, .proposals-ballot-list {
|
||||||
padding: $line-height/2 0;
|
padding: $line-height/2 0;
|
||||||
|
|
||||||
@@ -1035,36 +1035,44 @@
|
|||||||
// 06. Proposals successfull
|
// 06. Proposals successfull
|
||||||
// -------------------------
|
// -------------------------
|
||||||
|
|
||||||
.successfull-heading {
|
.dark-heading {
|
||||||
background: #2D3E50;
|
background: #2D3E50;
|
||||||
color: white;
|
color: white;
|
||||||
min-height: $line-height*8;
|
|
||||||
|
@include breakpoint(medium) {
|
||||||
|
padding-bottom: $line-height;
|
||||||
|
}
|
||||||
|
|
||||||
p {
|
p {
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
|
|
||||||
|
&.title {
|
||||||
|
color: #FFD200;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.info {
|
.info {
|
||||||
background: #34495E;
|
background: #314253;
|
||||||
padding: $line-height;
|
padding-top: $line-height;
|
||||||
|
|
||||||
@include breakpoint(medium) {
|
@include breakpoint(medium) {
|
||||||
border-radius: rem-calc(6);
|
border-top: rem-calc(6) solid #FFD200;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.featured-proposals-ballot-banner {
|
.featured-proposals-ballot-banner {
|
||||||
background: #2D3E50;
|
background: #2D3E50 image-url("ballot.gif");
|
||||||
|
background-position: 90% 0;
|
||||||
|
background-repeat: no-repeat;
|
||||||
position: relative;
|
position: relative;
|
||||||
text-align: center;
|
|
||||||
|
|
||||||
h2, p {
|
h2, a:hover h2 {
|
||||||
color: white;
|
color: #FFD200 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.button {
|
p {
|
||||||
background: #E74B3C;
|
color: white;
|
||||||
}
|
}
|
||||||
|
|
||||||
@include breakpoint(medium) {
|
@include breakpoint(medium) {
|
||||||
@@ -1073,35 +1081,11 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.featured-proposals-ballot {
|
.featured-proposals-ballot-banner,
|
||||||
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,
|
|
||||||
.successfull .panel {
|
.successfull .panel {
|
||||||
|
|
||||||
.icon-successfull {
|
.icon-successfull {
|
||||||
border-right: 60px solid #34495E;
|
border-right: 60px solid #FFD200;
|
||||||
border-top: 0;
|
border-top: 0;
|
||||||
border-bottom: 60px solid transparent;
|
border-bottom: 60px solid transparent;
|
||||||
height: 0;
|
height: 0;
|
||||||
@@ -1111,7 +1095,7 @@
|
|||||||
width: 0;
|
width: 0;
|
||||||
|
|
||||||
&:after {
|
&:after {
|
||||||
color: white;
|
color: #1B254C;
|
||||||
content: "\59";
|
content: "\59";
|
||||||
font-family: "icons" !important;
|
font-family: "icons" !important;
|
||||||
left: 34px;
|
left: 34px;
|
||||||
|
|||||||
@@ -1,3 +0,0 @@
|
|||||||
<div id="<%= dom_id(proposal) %>_next_voting" class="proposal-sucessfull">
|
|
||||||
<h3><%= link_to proposal.title, proposal_ballots_path %></h3>
|
|
||||||
</div>
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
<div class="expanded no-margin-top margin-bottom padding successfull-heading">
|
<div class="expanded no-margin-top margin-bottom dark-heading">
|
||||||
<div class="row" data-equalizer>
|
<div class="row" data-equalizer>
|
||||||
<div class="small-12 medium-8 column" data-equalizer-watch>
|
<div class="small-12 medium-6 column padding" data-equalizer-watch>
|
||||||
<h2>
|
<h2>
|
||||||
<%= t("proposal_ballots.title") %>
|
<%= t("proposal_ballots.title") %>
|
||||||
</h2>
|
</h2>
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="small-12 medium-4 column info" data-equalizer-watch>
|
<div class="small-12 medium-4 column info" data-equalizer-watch>
|
||||||
<p><span class="icon-calendar"></span> <%= t("proposal_ballots.date_title") %></p>
|
<p class="title"><strong><%= t("proposal_ballots.date_title") %></strong></p>
|
||||||
<h3><%= t("proposal_ballots.date") %></h3>
|
<h3><%= t("proposal_ballots.date") %></h3>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -32,30 +32,15 @@
|
|||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if @proposal_ballots.present? %>
|
<% if @proposal_ballots.present? %>
|
||||||
<div id="next-voting" class="row featured-proposals-ballot-banner margin-bottom">
|
<div id="next-voting" class="row featured-proposals-ballot-banner">
|
||||||
|
<%= link_to proposal_ballots_path do %>
|
||||||
<div class="small-12 column padding">
|
<div class="small-12 column padding">
|
||||||
<div class="icon-successfull"></div>
|
<div class="icon-successfull"></div>
|
||||||
<h2>
|
<h2><%= t("proposal_ballots.featured_title") %></h2>
|
||||||
<%= t("proposal_ballots.featured_title") %>
|
|
||||||
</h2>
|
|
||||||
<p><%= t("proposal_ballots.info") %></p>
|
<p><%= t("proposal_ballots.info") %></p>
|
||||||
<div class="small-12 medium-4 small-centered">
|
|
||||||
<%= link_to t("proposal_ballots.info_button"), proposal_ballots_path, class: "button expanded" %>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="row featured-proposals-ballot">
|
|
||||||
<div class="small-12 column">
|
|
||||||
<div class="icon-successfull"></div>
|
|
||||||
<h2>
|
|
||||||
<%= t("proposal_ballots.featured_title") %>
|
|
||||||
</h2>
|
|
||||||
<% @proposal_ballots.each do |proposal_ballot| %>
|
|
||||||
<%= render "proposal_ballots/featured_successfull_proposal", proposal: proposal_ballot %>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
<% elsif @featured_proposals.present? %>
|
<% elsif @featured_proposals.present? %>
|
||||||
<div id="featured-proposals" class="row featured-proposals">
|
<div id="featured-proposals" class="row featured-proposals">
|
||||||
<div class="small-12 column">
|
<div class="small-12 column">
|
||||||
|
|||||||
@@ -374,15 +374,15 @@ en:
|
|||||||
submit_button: Save changes
|
submit_button: Save changes
|
||||||
proposal_ballots:
|
proposal_ballots:
|
||||||
title: "Votings"
|
title: "Votings"
|
||||||
description_html: "These are the proposals that have reached the required supports <em>(%{supports})</em> and will be voted."
|
description_html: "The proposals that have reached the <strong>required supports <em>(%{supports})</em></strong> will be voted."
|
||||||
date_title: "Dates of participation"
|
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}."
|
successfull: "This proposal has reached the required supports and will be voted in the %{voting}."
|
||||||
voting: "next voting"
|
voting: "next voting"
|
||||||
featured_title: "Next voting"
|
featured_title: "#VotingProposal"
|
||||||
nothing_to_vote: "There is nothing to vote at the moment."
|
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: "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:
|
proposal_notifications:
|
||||||
new:
|
new:
|
||||||
title: "Send message"
|
title: "Send message"
|
||||||
|
|||||||
@@ -374,15 +374,15 @@ es:
|
|||||||
submit_button: Guardar cambios
|
submit_button: Guardar cambios
|
||||||
proposal_ballots:
|
proposal_ballots:
|
||||||
title: "Votaciones"
|
title: "Votaciones"
|
||||||
description_html: "Estas son las propuestas que han alcanzado el número de apoyos necesarios <em>(%{supports})</em> y que pasarán a la siguiente votación."
|
description_html: "Las propuestas que han alcanzado el <strong>número de apoyos necesarios <em>(%{supports})</em></strong> pasarán a votación."
|
||||||
date_title: "Fechas de participació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}."
|
successfull: "Esta propuesta ha alcanzado los apoyos necesarios y pasará a la %{voting}."
|
||||||
voting: "próxima votación"
|
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."
|
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: "Algunas propuestas ya han conseguido los apoyos para pasar a votación."
|
||||||
info_button: "Más información sobre la votación"
|
button: "Quiero participar"
|
||||||
proposal_notifications:
|
proposal_notifications:
|
||||||
new:
|
new:
|
||||||
title: "Enviar mensaje"
|
title: "Enviar mensaje"
|
||||||
|
|||||||
Reference in New Issue
Block a user