From 85ef4eb08d64f1c8ac04e59ab92c3944a46b9d7b Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 19 Aug 2015 15:00:00 +0200 Subject: [PATCH 1/3] Updates custom icons font --- app/assets/fonts/icons.eot | Bin 5068 -> 5404 bytes app/assets/fonts/icons.svg | 2 ++ app/assets/fonts/icons.ttf | Bin 4912 -> 5248 bytes app/assets/fonts/icons.woff | Bin 3788 -> 4064 bytes app/assets/stylesheets/icons.scss | 6 ++++++ 5 files changed, 8 insertions(+) diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot index 8168c0ec46814d35eaa4c640d976570d49e1f495..eb4fafebe803b1c67951888ea796bd9477f15690 100644 GIT binary patch delta 724 zcmYjOO-vI}5T4iF?oYQ}Y`Z_S*@gZ<7XhQTWeWw823s&O5o8T=K+FaZ4-_`i10*JR z@Sur_l1(@n!%YurG@iUQCYFOH#+#ZLuf%ZRAR%HR&i2G%=DqKm@6EiK`D8rlW;7Y# zuC&RRG zw~QLlNHydw%k8dnr1JvYi~9BO{h$P0Mq1vJcm{|4;DbDVfN)S z=@hHT605WmMJKteIZX1MW+Bs;FJOp~C6#4#A}NCe8Nb^j#y4`wri$!Y$&PqLv5d~q zv5+>(vm-(;L$`Ofs)6pdUdf<^5tbiq6Vy~oFs4KUqTZ3#f?_PH+QCrTADWbc+++|t z$B~qvMCzmtEVO`%Op1||teIz1UKc7;Fw9&Qdn6Ovj2GB6MT^vtaJGL~ z#eAlb%r%mD!F_xT|0V-&J#rfTugEIyW;WVGO~EzyepELUoH>nUyty}b4e)ukapZxM GTmBCru!{Wv delta 409 zcmbQEbw-`-j4%U(f$&5&GZv4~9d9Q(x-mF0urV+QeF5?n z{Dbw4{C~%6XJBBA0P@3j2FFmoi;QxOHW}x~vKzWYzoXWH%J=4M% z7?>Lv7)XW0Z3~?REV21N?$9{omWTyfEzZY9_ 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 876fc75678bacab5678f2b3b3779b2125145e36f..98f7a4d84873521cbb303f89632ee7ea1bb63197 100644 GIT binary patch delta 714 zcmX|8OH30{6uoa|I^TZM>3nEyp+7qO60|KX6fgu!F;M{-f-E3r0+lW(Ol%jBn9zkA z6B3M*xH5*FZcH$)+%+WDH9Ji-Ze6foAu-WJyse3g``$a}+;@_5?{TWpzYhceJkS6d z7D}b1J2g}N0HACj8=fuBl%NPK;v(Ycyg8hn|GoMifUF>1Uawkq;pJWIC*QFiZdx__ z@)DgunLwT2+}e9^e)9Mg0DS=9J+G9l4VQfQ5w$N^xk{zHZ!yD^3qLDJBrDbWE`Ni3 zLVVnA*xFgQ63>k~8muC|TD5jSe;MU}H)WKckx8OE*U1{GJ1@v=MuMrf){fDsaK{B;3sHMm zVPMc1a4Zbswqf0osc~8b&ACnOQL5&gQU^|h5}h?V!Ekfj?z;y4)>EWGf)#Q>UPBjL z0~4Uv$cvWMb zGnNd=UO{1nk>Hq1`16KmRMGDZCF4ti;L3+c^k$DL2@Ka43ik1|=nh0~iGIR!(&s*9 zuzNsKgQ*D51U=!Bz)ed-EYs85rHcdILyEyj)0|N1mh`yK9n=D%H0FkJw^QhB-pFOrn2{_T+4hm$ESRxYYP6Ng z7EIDa!an+H7P6^UEYphN1Hc*f{~%*dQtrodPOjm8PUJy)8SXh}a)fA(7`P(+-=R_d E3umZ^!~g&Q delta 395 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 delta 3647 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 NB+>r+xnTh0{{!f|si6P> 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"; +} From 2eccd30effeec93fdb6e9605ae9b742906fb06ea Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 19 Aug 2015 15:01:10 +0200 Subject: [PATCH 2/3] Adds styles for deleted users, improves previous --- app/assets/stylesheets/debates.scss | 17 +++++++++++++---- app/assets/stylesheets/participacion.scss | 15 +++++++++++++++ app/assets/stylesheets/variables.scss | 3 ++- app/views/comments/_comment.html.erb | 12 ++++++++++-- app/views/debates/show.html.erb | 19 +++++++++++++++++++ config/locales/en.yml | 2 ++ config/locales/es.yml | 2 ++ 7 files changed, 63 insertions(+), 7 deletions(-) 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.user.name %> + + + <%= t("debates.comment.user_deleted") %> + + <%= comment.user.name %> +  • <%= time_ago_in_words(comment.created_at) %> <% if comment.user.official? %>  •  @@ -32,7 +40,7 @@
<% 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..db8cbdc14 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') %> + + + + <%= t("debates.show.author_deleted") %> + + <%= @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 From d2ac8b7f43a3a464ce8f517fa1c4152ecfeb7d7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baza=CC=81n?= Date: Wed, 19 Aug 2015 16:04:34 +0200 Subject: [PATCH 3/3] applies hidden users styles commented --- app/views/comments/_comment.html.erb | 22 ++++++++++---------- app/views/debates/show.html.erb | 30 ++++++++++++++-------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb index ecbb0b694..a60f147ba 100644 --- a/app/views/comments/_comment.html.erb +++ b/app/views/comments/_comment.html.erb @@ -6,25 +6,24 @@ <% else %> <%= avatar_image(comment.user, size: 32, class: 'left') %> - + + end -->
- + + else --> <%= comment.user.name %> + <% if comment.user.official? %> +  •  + + <%= comment.user.official_position %> + + <% end %> -  • <%= time_ago_in_words(comment.created_at) %> - <% if comment.user.official? %> -  •  - - <%= comment.user.official_position %> - - <% end %> <% if comment.user.verified_organization? %>  •  @@ -37,6 +36,7 @@ <%= t("debates.comment.author") %> <% end %> +  • <%= time_ago_in_words(comment.created_at) %>
<% if comment.user.official? %> diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index db8cbdc14..964e7d43d 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -14,22 +14,22 @@
<%= avatar_image(@debate.author, size: 32, class: 'author-photo') %> - - - - <%= t("debates.show.author_deleted") %> - - - - <%= @debate.author.name %> - - - <% if @debate.author.official? %> -  •  - - <%= @debate.author.official_position %> + + + <%= @debate.author.name %> + + <% if @debate.author.official? %> +  •  + + <%= @debate.author.official_position %> + + <% end %> + <% if @debate.author.verified_organization? %>  •