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/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..ecbb0b694 100644 --- a/app/views/comments/_comment.html.erb +++ b/app/views/comments/_comment.html.erb @@ -6,10 +6,18 @@ <% else %> <%= avatar_image(comment.user, size: 32, class: 'left') %> + + +
<%= 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..db8cbdc14 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -14,9 +14,28 @@