diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss index 2da1dd9eb..939373e57 100644 --- a/app/assets/stylesheets/debates.scss +++ b/app/assets/stylesheets/debates.scss @@ -497,7 +497,7 @@ font-weight: bold; span { - font-size: rem-calc(14); + font-size: rem-calc(18); font-weight: normal; opacity: .8; } @@ -546,11 +546,11 @@ margin-top: rem-calc(6); padding: rem-calc(6) rem-calc(12); - &.official { + &.is-official { background: $comment-official; } - &.author { + &.is-author { background: $comment-author; } } diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss index 32b1d9264..81e6a2481 100644 --- a/app/assets/stylesheets/participacion.scss +++ b/app/assets/stylesheets/participacion.scss @@ -631,8 +631,12 @@ img.initialjs-avatar { color: white; } -.author-debate { - background: $author-debate; +.is-author { + background: $author; +} + +.is-association { + background: $association; } .level-1 { diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss index 5948a51ff..95fad743c 100644 --- a/app/assets/stylesheets/variables.scss +++ b/app/assets/stylesheets/variables.scss @@ -72,7 +72,8 @@ $level-3: #43AC6A; $level-4: #43AC6A; $level-5: #F08A24; -$author-debate: $debates; +$author: #008CCF; +$association: #222222; $comment-author: rgba(45,144,248,.15); $comment-official: rgba(255,241,204,1); diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb index a1b135117..9ea5cc930 100644 --- a/app/views/comments/_comment.html.erb +++ b/app/views/comments/_comment.html.erb @@ -16,18 +16,23 @@ Cargo oficial + +  •  + + Puesto en la asociación +  •  - + <%= t("debates.comment.author") %> -

<%= comment.body %>

+

<%= comment.body %>

-

<%= comment.body %>

+

<%= comment.body %>

<%= comment.body %>

diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb index d7fcb5cdd..5e34a9f84 100644 --- a/app/views/comments/_form.html.erb +++ b/app/views/comments/_form.html.erb @@ -1,6 +1,6 @@
> <%= form_for [@debate, Comment.new], remote: true do |f| %> - <%= f.text_area :body %> + <%= f.text_area :body, label: t("comments.form.leave_comment") %> <%= f.hidden_field :commentable_type, value: parent.class %> <%= f.hidden_field :commentable_id, value: parent.id %> diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index 29ce06b2b..ca664cccd 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -10,7 +10,6 @@ <% end %> <% end %> -

<%= @debate.title %>

@@ -63,13 +62,10 @@

<%= t("debates.show.comments_title") %> - (<%= t("debates.show.comments", count: @debate.comment_threads.count) %>) + (<%= @debate.comment_threads.count %>)

<% if user_signed_in? %> -
- <%= t("debates.show.leave_comment") %> <%= render 'comments/form', {parent: @debate, toggeable: false} %> -
<% end %> <%= render @comments %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 6a15bf29f..49cfddf9e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -93,6 +93,9 @@ en: recommendation_one: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore" recommendation_two: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore" recommendation_three: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore" + comments: + form: + leave_comment: Write a comment comments_helper: comment_link: Comment comment_button: Publish comment diff --git a/config/locales/es.yml b/config/locales/es.yml index 641b98840..c63f432b2 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -93,6 +93,9 @@ es: recommendation_one: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore" recommendation_two: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore" recommendation_three: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore" + comments: + form: + leave_comment: Deja tu comentario comments_helper: comment_link: Comentar comment_button: Publicar comentario