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

fixing conflicts

Browse Source
This commit is contained in:
rgarcia
2015-09-13 22:00:59 +02:00
parent ad8880d02c d493f7b250
commit 6641c380bc
23 changed files with 332 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/proposals/_votes.html.erb
View File

@@ -1,8 +1,8 @@
<% voted_classes = css_classes_for_vote(@proposal_votes, proposal) %>
<div class="supports">
<div class="progress small-12 radius">
<span class="meter" style="width: 10%;"></span>
<div class="progress small-12 round">
<span class="meter" style="width: <%= progress_bar_percentage(proposal) %>%;"></span>
</div>
<span class="total-supports">
@@ -10,8 +10,8 @@
</span>
<div class="in-favor">
<%= link_to vote_proposal_path(proposal, value: 'yes'), class: "button button-support tiny radius expand #{voted_classes[:in_favor]}",
title: t('proposals.proposal.support'), method: "post", remote: true do %>
<%= link_to vote_proposal_path(proposal, value: 'yes'), class: "button button-support tiny radius expand #{voted_classes[:in_favor]}",
title: t('proposals.proposal.support_title'), method: "post", remote: true do %>
<%= t("proposals.proposal.support") %>
<% end %>
</div>