diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot index 8168c0ec4..eb4fafebe 100644 Binary files a/app/assets/fonts/icons.eot and b/app/assets/fonts/icons.eot differ diff --git a/app/assets/fonts/icons.svg b/app/assets/fonts/icons.svg index 70349fe9c..e3cab14f4 100644 --- a/app/assets/fonts/icons.svg +++ b/app/assets/fonts/icons.svg @@ -25,4 +25,6 @@ + + diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf index 876fc7567..98f7a4d84 100644 Binary files a/app/assets/fonts/icons.ttf and b/app/assets/fonts/icons.ttf differ diff --git a/app/assets/fonts/icons.woff b/app/assets/fonts/icons.woff index 8590e1587..930c0a6dd 100644 Binary files a/app/assets/fonts/icons.woff and b/app/assets/fonts/icons.woff differ diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss index 939373e57..2ee296f70 100644 --- a/app/assets/stylesheets/debates.scss +++ b/app/assets/stylesheets/debates.scss @@ -544,14 +544,24 @@ .comment-user { margin-top: rem-calc(6); - padding: rem-calc(6) rem-calc(12); + padding: rem-calc(6) 0; - &.is-official { - background: $comment-official; + @each $n in ("1", "2", "3","4", "5") { + &.level-#{$n} { + @if $n == "5" { + background: $comment-level-5; + padding: rem-calc(6) rem-calc(12); + } + @else { + background: $comment-official; + padding: rem-calc(6) rem-calc(12); + } + } } &.is-author { background: $comment-author; + padding: rem-calc(6) rem-calc(12); } } } @@ -579,7 +589,6 @@ } } } - } .faded { diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss index 4d131e589..b462adac9 100644 --- a/app/assets/stylesheets/icons.scss +++ b/app/assets/stylesheets/icons.scss @@ -91,3 +91,9 @@ .icon-initiatives:before { content: "h"; } +.icon-organizations:before { + content: "s"; +} +.icon-deleted:before { + content: "t"; +} diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss index 81e6a2481..00028ac56 100644 --- a/app/assets/stylesheets/participacion.scss +++ b/app/assets/stylesheets/participacion.scss @@ -589,6 +589,21 @@ form { img.initialjs-avatar { border-radius: rem-calc(1000); + position: relative; +} + +.author-deleted { + background-color: rgba(255,255,255,.5); + color: rgba(0,0,0,.4); + font-size: rem-calc(40); + left: 11px; + position: absolute; + top: 63px; +} + +.user-deleted { + @extend .author-deleted; + top: -9px; } // 11. Filters diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss index 95fad743c..0c0942d99 100644 --- a/app/assets/stylesheets/variables.scss +++ b/app/assets/stylesheets/variables.scss @@ -76,4 +76,5 @@ $author: #008CCF; $association: #222222; $comment-author: rgba(45,144,248,.15); -$comment-official: rgba(255,241,204,1); +$comment-official: rgba(70,219,145,.3); +$comment-level-5: rgba(255,241,204,1); diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb index c71cac18c..a60f147ba 100644 --- a/app/views/comments/_comment.html.erb +++ b/app/views/comments/_comment.html.erb @@ -6,17 +6,24 @@ <% else %> <%= avatar_image(comment.user, size: 32, class: 'left') %> +
- <%= comment.user.name %> -  • <%= time_ago_in_words(comment.created_at) %> - <% if comment.user.official? %> -  •  - - <%= comment.user.official_position %> - - <% end %> + + + <%= comment.user.name %> + <% if comment.user.official? %> +  •  + + <%= comment.user.official_position %> + + <% end %> + <% if comment.user.verified_organization? %>  •  @@ -29,10 +36,11 @@ <%= t("debates.comment.author") %> <% end %> +  • <%= time_ago_in_words(comment.created_at) %>
<% if comment.user.official? %> -

<%= comment.body %>

+

<%= comment.body %>

<% elsif comment.user == @debate.author %>

<%= comment.body %>

<% else %> diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index ca664cccd..964e7d43d 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -14,9 +14,28 @@
<%= avatar_image(@debate.author, size: 32, class: 'author-photo') %> - - <%= @debate.author.name %> - + + + <%= @debate.author.name %> + + <% if @debate.author.official? %> +  •  + + <%= @debate.author.official_position %> + + <% end %> + + <% if @debate.author.verified_organization? %> +  •  + + <%= t("shared.organization") %> + + <% end %>  •  <%= l @debate.created_at.to_date %>  •  diff --git a/config/locales/en.yml b/config/locales/en.yml index 9d89b5ec7..a739a2c34 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -52,6 +52,7 @@ en: comment: author: Debate's author deleted: This comment has been deleted + user_deleted: Deleted user responses: zero: No Responses one: 1 Response @@ -73,6 +74,7 @@ en: Some suggestions: show: back_link: Back + author_deleted: Deleted user comments_title: Comments comments: zero: No comments diff --git a/config/locales/es.yml b/config/locales/es.yml index 87afd21a6..96284a743 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -52,6 +52,7 @@ es: comment: author: Autor del debate deleted: Este comentario ha sido eliminado + user_deleted: Usuario eliminado responses: zero: Sin respuestas one: 1 Respuesta @@ -73,6 +74,7 @@ es: Algunas recomendaciones: show: back_link: Volver + author_deleted: Usuario eliminado comments_title: Comentarios comments: zero: Sin comentarios