fixing conflicts [#47] [#47]

2015-07-30 18:18:28 +02:00
parent 59cea45c26
commit cd2d05e0c5
21 changed files with 312 additions and 78 deletions
--- a/app/views/comments/_form.html.erb
+++ b/app/views/comments/_form.html.erb
@@ -6,6 +6,6 @@
    <%= f.hidden_field :commentable_type, value: parent.class %>
    <%= f.hidden_field :commentable_id, value: parent.id %>

-    <%= f.submit comment_button_text(parent), class: "button radius" %>
+    <%= f.submit comment_button_text(parent), class: "button radius small" %>
  <% end %>
 </div>