From a77e6f6f1cc4a47f5704d65d6a0cc8c0095f7d92 Mon Sep 17 00:00:00 2001 From: Jeremy Fleischman Date: Fri, 20 Nov 2015 19:01:04 -0800 Subject: [PATCH] For logged in users, we now show a thumbnail instead of their email address. --- .../app/assets/images/missing_avatar_thumb.png | Bin 0 -> 2026 bytes WcaOnRails/app/assets/stylesheets/delegates.scss | 9 +++++---- .../assets/stylesheets/navbar-static-top.scss | 8 ++++++++ .../app/views/layouts/application.html.erb | 5 ++++- .../app/views/shared/_user_avatar.html.erb | 10 ++++++++-- 5 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 WcaOnRails/app/assets/images/missing_avatar_thumb.png diff --git a/WcaOnRails/app/assets/images/missing_avatar_thumb.png b/WcaOnRails/app/assets/images/missing_avatar_thumb.png new file mode 100644 index 0000000000000000000000000000000000000000..e1cfb92b69e9809e144cd0f6aeada3a050663e7e GIT binary patch literal 2026 zcmZ{ldpy&N8^^yEc5Cj!h@muP3?n4A4AXMi(4^FIPq~a`l4Nq3OXSiaDfj!W&^b;N zF(Xl(a>*t4I%OfkBI>vE=kL5;=a0|xem>9heExotoE&TsFeD5B0E8WhNEOoiA3;Qg zb&T&ZC4{IS!JYsB57Xh>=f#8`CEvczzf*}2EBoQzZa+l)YA=z5Lv8IMqVKem zK7F}=HMD{gvKc^q9GbDK&?I24UJ`>`)oSBS${kZX_4J*qjM%)!tD){-+R;@Cv~_Fn zkCoeFBN}a&FavewJAoySVYIJ_HTtS-DR|8i*-A9&gd*w|NxJzteW*LuY3}%LO`Y5n zDNbM zP=~X()WHG4=!+Kt#hYX~+wBnTQlm=e@W+}{r54l5)nw9UGO3CZ`8_2Zu@TqC8Q!v8IH|BSVGF7?ab7nk+2|S2mUwC` zpKdWk>_z-^zlx;YaZavn`UVS`kFyo9RXnpiBJ#Vpr&Lh$I@e9Yc6*m(gFD6| zlENxun|jwPLH5#C{YGlp6<93UBL?_PW33=72h!EAF@* zNKZwbG^f#5-ooI>&Ddsq_XJ|}170>y=`C~S$n1SjaR%)Qe!^Z=ij@WCzMmIi9R8Pm zQiswYZq_$!SBP@@jrv#c_(~EDD5?*!b$q~qC&m`aPGro_8BLo zaQD%jXieP`T-4N%K$|1_90C%f=q$FnBcsLs$maUfl+a(8v-4$hHKj!m+|z*7H?>6A zA!k((kdNAiQ8Bp2bJ^EMH88l$g?$hQXj#SsRcZBUE!{1X{jd1BF8f+j&$pRe7DxYWm4@E-!#M<-M-@ynu!cG z!a`HZa(IrrI;*wd^n}$lHOuE`hwi-*YZfn6OU>|!l(G5@9tY{7Z(MyuDEZn9Ca zIRuB%G99H`Ub4v|E@@+rFD5i8E9{o4R2~Qk8h15?P2=Lt<6LeDidu|5KAk|BP2>#c zN%my0kP>0AQVakXhLBwa;|yNcv; zg5B(o9!8PPh^mc6R*bdiImJYS{n+hJsR(1XNsZjt23n-z*}yfFy@RydZe4z-akG#sX9;PNPz!3 z^JCZ*b1j|j|F;(zB9Bs0ynO~eB}$Y?q=e3}DRGIP2GJ)G9mqR*2377)Uz`8=#WAb; zEwwfyX7iVNXolG8i{Zd(Wu2}dc}X}f*LcW>-@Dx3&U@HClB@K!`)Cw)dO=|6puPJN ze?hS*CQAS31?t(gYWUE3{~JpMmU&JfnXr-14eP8cbu8YF_KN$GnGBg8sZ=aCPB|LB zvy>!pE=S>E(?(fR+InkEPmt{e@CgiQXQ-c;wcW~Zt1GiE#~9jqz=3_kyx`}YfUrf| zhMGOv)q!N2K=Y)^H-SNeEp2#eZPCC@SF;B7AA;17&2zRSs$pN$F(c2F!AM#Tv2lT7 z;EE$(PgAZ$7H1nm1sSp$zsTg{q_NTD)6aL!2FbiPO1^2oCVqM2>*2!7Ns1B--!0~( zJ~zLtb2qo_7u57oNXZ;0Wk~qk_A{;BnBM1^K4xB_K0*KnSbZamzCOkP>!NRBW`s2} pG{Im^%&=I;f`ZNe3j_vxU+}&1-vNux1J=R-U}x<>tUpGN{U0Zdged?3 literal 0 HcmV?d00001 diff --git a/WcaOnRails/app/assets/stylesheets/delegates.scss b/WcaOnRails/app/assets/stylesheets/delegates.scss index 93b24fda29..f28c63413a 100644 --- a/WcaOnRails/app/assets/stylesheets/delegates.scss +++ b/WcaOnRails/app/assets/stylesheets/delegates.scss @@ -26,10 +26,11 @@ tr.candidate-delegate { height: 50px; vertical-align: middle; -} -.avatar-thumbnail-lg { - width: 100px; - height: 100px; + + &.avatar-thumbnail-lg { + width: 100px; + height: 100px; + } } .popover-content img { diff --git a/WcaOnRails/app/assets/stylesheets/navbar-static-top.scss b/WcaOnRails/app/assets/stylesheets/navbar-static-top.scss index 40ec685f91..551aa96a0d 100644 --- a/WcaOnRails/app/assets/stylesheets/navbar-static-top.scss +++ b/WcaOnRails/app/assets/stylesheets/navbar-static-top.scss @@ -34,6 +34,14 @@ body { } } + $nav-avatar-thumbnail-size: 40px; + .avatar-thumbnail { + width: $nav-avatar-thumbnail-size; + height: $nav-avatar-thumbnail-size; + margin-top: -($nav-avatar-thumbnail-size - 20px) / 2; + margin-bottom: -($nav-avatar-thumbnail-size - 20px) / 2; + } + .navbar-collapse { background: #ddd; margin: 0; diff --git a/WcaOnRails/app/views/layouts/application.html.erb b/WcaOnRails/app/views/layouts/application.html.erb index 628dd6f15e..6178505fa2 100644 --- a/WcaOnRails/app/views/layouts/application.html.erb +++ b/WcaOnRails/app/views/layouts/application.html.erb @@ -100,7 +100,7 @@ <% if current_user %> <% notification_count = notifications_for_user(current_user).length %> - <%= current_user.email %> + <%= render "shared/user_avatar", user: current_user, do_not_show_full_image_on_hover: true %> <% if notification_count > 0 %> <%= notification_count %> <% end %> @@ -111,6 +111,9 @@