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

moves button to header, removes answers on questions show

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2017-01-30 21:08:35 +01:00
parent 5022bd7bf3
commit 692ebe8893
2 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1317,6 +1317,15 @@ ul.ballot-list {
color: #92BA48; color: #92BA48;
} }
.button {
background: white;
color: $brand;
}
.callout.warning a {
color: $color-warning;
}
.info { .info {
background: #314253; background: #314253;
padding: $line-height; padding: $line-height;

29
app/views/polls/questions/show.html.erb
View File

@@ -12,6 +12,14 @@
<%= link_to t('poll_questions.show.original_proposal'), @question.proposal %> <%= link_to t('poll_questions.show.original_proposal'), @question.proposal %>
</div> </div>
<% end %> <% end %>
<% if can? :answer, @question %>
<%= link_to t('poll_questions.show.answer_this_question'),
@question.poll,
class: 'large button' %>
<% else %>
<%= render 'polls/reasons_for_not_answering', poll: @question.poll %>
<% end %>
</div> </div>
<div class="small-12 medium-3 column info"> <div class="small-12 medium-3 column info">
@@ -42,27 +50,6 @@
</div> </div>
</div> </div>
<div class="row margin-top">
<div class="small-12 column">
<% if can? :answer, @question %>
<div class="text-center">
<%= link_to t('poll_questions.show.answer_this_question'),
@question.poll,
class: 'large button'
%>
</div>
<% else %>
<%= render 'polls/reasons_for_not_answering', poll: @question.poll %>
<div class="small-12 small-centered text-center column">
<div id="<%= dom_id(@question) %>_answers">
<%= render "answers", question: @question %>
</div>
</div>
<% end %>
</div>
</div>
<div class="row margin-top"> <div class="row margin-top">
<div class="small-12 medium-9 column"> <div class="small-12 medium-9 column">
<h3><%= t('poll_questions.show.more_info') %></h3> <h3><%= t('poll_questions.show.more_info') %></h3>