diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 086dc92d7..3f23b11f4 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -1937,6 +1937,25 @@ table { opacity: 0.4; } +.filter-comments { + float: none; + margin-top: 0; + + @media (min-width: $small-breakpoint) { + float: right; + margin-top: rem-calc(-24); + } + + label { + padding-right: rem-calc(12); + float: none; + + @media (min-width: $small-breakpoint) { + float: right; + } + } +} + // 19. Flags // - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/views/debates/_comments.html.erb b/app/views/debates/_comments.html.erb index 8aa26ed03..6018f1bdf 100644 --- a/app/views/debates/_comments.html.erb +++ b/app/views/debates/_comments.html.erb @@ -7,6 +7,23 @@ (<%= @debate.comments_count %>) + +
+
+
+ +
+
+ +
+
+
+ + <% if user_signed_in? %> <%= render 'comments/form', {commentable: @debate, parent_id: nil, toggeable: false} %> <% else %> diff --git a/app/views/proposals/_comments.html.erb b/app/views/proposals/_comments.html.erb index 2442bd230..8f682c3b4 100644 --- a/app/views/proposals/_comments.html.erb +++ b/app/views/proposals/_comments.html.erb @@ -2,11 +2,29 @@
+

<%= t("proposals.show.comments_title") %> (<%= @proposal.comments_count %>)

+ +
+
+
+ +
+
+ +
+
+
+ + <% if user_signed_in? %> <%= render 'comments/form', {commentable: @proposal, parent_id: nil, toggeable: false} %> <% else %>