consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1385 from consul/polls-design

Browse Source 
polls design
This commit is contained in:
Juanjo Bazán
2017-02-01 18:33:19 +01:00
committed by GitHub
parent 6eaf331dd0 43907de807
commit aa6eee6df0
6 changed files with 62 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/assets/stylesheets/participation.scss
View File

@@ -1322,8 +1322,19 @@ ul.ballot-list {
color: $brand;
}
.callout.warning a {
color: $color-warning;
.callout {
&.warning a {
color: $color-warning;
}
&.primary a {
color: $color-info;
}
&.alert a {
color: $color-alert;
}
}
.info {
@@ -1361,9 +1372,13 @@ ul.ballot-list {
.dates {
color: $text-medium;
font-size: $small-font-size;
@include breakpoint(medium) {
float: right;
}
}
h3 a {
h4 a {
color: $text;
}
}
@@ -1372,6 +1387,12 @@ h2.questions-callout {
font-size: $base-font-size;
}
h3.section-title-divider {
border-bottom: 2px solid $brand;
color: $brand;
margin-bottom: $line-height;
}
.poll-question {
padding: 0 $line-height;

23
app/views/polls/_poll_group.html.erb Normal file
View File

@@ -0,0 +1,23 @@
<% poll_group.each do |poll| %>
<div class="poll">
<div class="row">
<div class="small-12 column">
<div class="dates"><%= poll_dates(poll) %></div>
<h4 class="inline-block"><%= link_to poll.name, poll %></h4>
<ul>
<% poll.questions.each do |question| %>
<li><%= link_to question.title, question_path(question) %></li>
<% end %>
</ul>
<ul class="no-bullet margin-top tags">
<% poll.geozones.each do |g| %>
<li class="inline-block"><span><%= g.name %></span></li>
<% end %>
</ul>
</div>
<div class="small-12 column">
<%= link_to t("polls.index.participate_button"), poll, class: "button" %>
</div>
</div>
</div>
<% end %>

31
app/views/polls/index.html.erb
View File

@@ -15,27 +15,16 @@
</div>
<div class="small-12 medium-9 column margin-top">
<% @polls.each do |poll| %>
<div class="poll">
<div class="row">
<div class="small-12 column">
<h3><%= link_to poll.name, poll %></h3>
<p class="dates"><%= poll_dates(poll) %></p>
<ul class="no-bullet margin-top tags">
<% poll.geozones.each do |g| %>
<li class="inline-block"><span><%= g.name %></span></li>
<% end %>
</ul>
</div>
<div class="small-12 column">
<% if can? :answer, poll %>
<%= link_to t("polls.index.participate_button"), poll, class: "button" %>
<% else %>
<%= link_to t("polls.index.view_button"), poll %>
<% end %>
</div>
</div>
</div>
<% polls_by_geozone_restriction = @polls.group_by(&:geozone_restricted) %>
<% if polls_by_geozone_restriction[false].present? %>
<h3 class="section-title-divider"><%= t("polls.index.no_geozone_restricted") %></h3>
<%= render partial: 'poll_group', locals: {poll_group: polls_by_geozone_restriction[false]} %>
<% end %>
<% if polls_by_geozone_restriction[true].present? %>
<h3 class="section-title-divider"><%= t("polls.index.geozone_restricted") %></h3>
<%= render partial: 'poll_group', locals: {poll_group: polls_by_geozone_restriction[true]} %>
<% end %>
<%= paginate @polls %>