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

fixing conflicts [#47] [#47]

Browse Source
This commit is contained in:
rgarcia
2015-07-30 18:18:28 +02:00
parent 59cea45c26
commit cd2d05e0c5
21 changed files with 312 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/debates/show.html.erb
View File

@@ -4,7 +4,7 @@
<div class="small-12 medium-9 column">
<%= link_to "&lt;&nbsp;".html_safe + t("debates.show.back_link"), debates_path, class: 'left back' %>
<%= link_to "&laquo;&nbsp;".html_safe + t("debates.show.back_link"), debates_path, class: 'left back' %>
<h1><%= @debate.title %></h1>
<div class="debate-info">
@@ -25,7 +25,7 @@
<div class="row">
<div id="comments" class="small-12 column">
<h2><%= t("debates.show.comments") %></h2>
<div style="padding-bottom:60px">
<div>
<%= t("debates.show.leave_comment") %>
<%= render 'comments/form', parent: @debate %>
</div>