From a357a5f27c10f7b534569581661fe4899a9910c2 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 4 May 2019 22:44:19 -0600 Subject: [PATCH 1/2] Update Timeline.vue --- .../assets/js/components/PostComponent.vue | 4 +- resources/assets/js/components/Timeline.vue | 69 ++++++++++++++++--- 2 files changed, 60 insertions(+), 13 deletions(-) diff --git a/resources/assets/js/components/PostComponent.vue b/resources/assets/js/components/PostComponent.vue index d90fa82bf..0520ce3df 100644 --- a/resources/assets/js/components/PostComponent.vue +++ b/resources/assets/js/components/PostComponent.vue @@ -893,11 +893,11 @@ export default { let em = event.target.innerText; if(this.replyText.length == 0) { this.reply_to_profile_id = this.status.account.id; - this.replyText = '@' + this.status.account.username + ' ' + em; + this.replyText = em + ' '; $('textarea[name="comment"]').focus(); } else { this.reply_to_profile_id = this.status.account.id; - this.replyText += em; + this.replyText += em + ' '; $('textarea[name="comment"]').focus(); } }, diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue index 7f9c8882e..1b6920bf1 100644 --- a/resources/assets/js/components/Timeline.vue +++ b/resources/assets/js/components/Timeline.vue @@ -152,10 +152,27 @@ -
-
- - +
+
    +
  • πŸ˜‚
    • +
  • πŸ’―
    • +
  • ❀️
    • +
  • πŸ™Œ
    • +
  • πŸ‘
    • +
  • 😍
    • +
  • 😯
    • +
  • 😒
    • +
  • πŸ˜…
    • +
  • 😁
    • +
  • πŸ™‚
    • +
  • 😎
    • +
+
+ +
+ + +
@@ -388,6 +405,24 @@ .small .custom-control-label { padding-top: 3px; } + .reply-btn { + position: absolute; + bottom: 12px; + right: 20px; + width: 60px; + text-align: center; + border-radius: 0 3px 3px 0; + } + .emoji-reactions .nav-item { + font-size: 1.2rem; + padding: 9px; + cursor: pointer; + } + .emoji-reactions::-webkit-scrollbar { + width: 0px; + height: 0px; + background: transparent; + } From 648fe3c50aac0969c6ad1900be7e405674280bef Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 4 May 2019 22:44:42 -0600 Subject: [PATCH 2/2] Update compiled assets --- public/js/status.js | Bin 59362 -> 59333 bytes public/js/timeline.js | Bin 60944 -> 63598 bytes public/mix-manifest.json | Bin 845 -> 845 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public/js/status.js b/public/js/status.js index 264cdb9b53b699eb7ab25b06b0cd9377d118889a..78a83256a5d963bcfd8bb5415655c3d33d59fd54 100644 GIT binary patch delta 354 zcmaEKp84o`<_(jXH(z8fVP!S-PIOnA957Fc#Wg!Pbh6;S&dn~IO{$C~ldaUWCJX7i zfauLN`W37!m8GGjn}3)r@a8ZyOfpS1Nlx3mpy59!MB~5NmXn3|i>tw;Vs&Ej^omjw zlS?x5^NOQW5=#kpbCIByRcAvo%XRwFpK4kaKsPKToroTZ23HqY-0FlNbiOmv;R|A^e=J^Q3K hGatF5%&G$l2dEIIFgW})t&8>YG!ixS5^HNUtpU10fW!a* delta 366 zcmX?lp83&v<_(jXS&UsXlqNS$mz(S`fm1NkDb!y{)4EtMPa{!NFR@l<^F-z{*3DZu z8&xNtQElw@UOUzBxR#H&XE}6VmO>J_5z6*%nd``cDmBk2X+Ga1)1>PK{7UmWP zW(G-{KQ;X4+$=XCz?cPO_~dvFDV7}P64%MK9G#Q%4%keB^*6S8mgXxOZiOJI| zN=-~I$;{6yj!sD|Nz^UVg~?7{-z_`2qgx(s2~Z#c!Qt=GMsN=FOHGdHaY6_z>zR$< zc=lQ#IGw$g2+pZqGX#gD&j`VB>RXNAeCaANzT5u5}4ahq2izN5@st7#1YMR9l- diff --git a/public/js/timeline.js b/public/js/timeline.js index b48e232b038d66a35d9a01719c1b3ebce570c244..1903a8c61350bdd71fb1f68adc755d627b7f8f72 100644 GIT binary patch delta 5237 zcmb_gdu$xV8Q0yJG`3?LCpLN5an_r}-i>$HcXn`KkHvXF3D7D8Qc-$7((&z_J@MV{ zWp~a#=W;QxBH99ZOlp!s9s&fSEu>)sN&;1b5UN563FWUAR1i{8sdxmnQd9n+-|Ri? z1W1V*$+w=@_suuoe6QbZe>e2$nb7t&jmUYDlyHp1We3x&V+p*i;atXcs2d$Yj(`k4 zWaNoXcC2ldVK#wMDG8MqDM*=YyE1fAMq5}xJ6L;w>^OFHfE@Z)OCUg4L$C$DT5v9W zZwOvjj|5@~RCYB}BEW=wZZ)#!g7q_yEJsVi5OyMXf}IX&K(g+c#%5%=l6dnPvs086 z+gLlW5ho}}f@Fz!sCH|B9auA){r2EY@6=`WL7;i>J1z4_d%Hx8Sd3~!A&Mx*<8tv_ z?99&P(_m*g3e2ZB28frOKAj6{SKk#t>`e7D@cm^C-}^+33hjT_=-*0??Uz-p>iMC| zK6$;hm1~f2saLOEpA+S%t636}HB?ae0DG^isn?&r{nnvDm=;~?5Nl903_6y{ zRv5kqXLZ9-KbZA6C@o)5kP(ieYv>ShwG_4n=};7PcFK8vEZgA2F~oi|d;U@qv*U2> zav^CuQik#_M0B3ZI5E8j@{#IF_ynv1gXTl4R$BCsKfZ2ywEbyE&xQ18%^aP=Ip2#uI<%jZ%s z)U~jdC(WvQJa*02bi)`go{eRng=z28$_JEMp9VJ+L+Q{(e$X0P_}Xi-@+Gi#-YOR*_{ zfeB(KU%s`pw7z?Kh>wh1$-R_sKBK4FAF+EMDz2$@vu*}krcYU3cLFxBdvhMUs%;u5 z{e^4ifcJYR`|5b;cxNT}gtuW;M_^pRX?r8N6(iqt^okA9q90%bkARjmikv|V>a;BE za65^H!Hc=$RPkpS^U&W??0;-1?EDwCRRZ!Nz^`8f7CfBgYb@RQ^8?Fn%)XO(Td4N58=ejDk>&`xQ{Dvx)Nz{)E znVi}!WX9C6SWsfXHJbvaE;t=YtWF`<)kO=92q;AcEtOE5cGU#v8asl2Co1U5zZ6$g zibS{3u@u(xqCJA0WXc{@bD}P~3CB(WV=c9nT#b-XHjGH(nf<%(5#_k76uUxEr~ePXod++L-}f&d-v@i2{OriKi{*IX z6YqKO((>DJiRIh<(501c_eI~xh4r`l@k=bv&WnLVm<$d)}_41|hYmB|?}nntH;KePw`c zq)fqAunP0+t@m14$LY&!i-L-`z$G)GUtnFEo7nM0Qx$~uxc8JfQ8SZNM1W$ctqlrB zI|5b0R+|?X5%?*-<6yI+`AfjGwk-fItp_~h}rMeO6Bz7`~LhMw(UfBD&Q z$ghw7Jjyxpxi232=j2=;8+p3P+qmt)U=;@%JH6X0o3Rbvk0v{>c;B7u)E{0jUc5W5 ztQfa*bwn*o85i>XRzKy}#VcxEKm)Fw%2FKV!$l|5g-CZM=MVViqYK?&Vt#*=m~==N zddq$87^?4rx=>8W9_U+^)@k=`|3No!?OX@hhwmB}a42dwx z`UQ@MkU>iDgO{TURIgcH?Yn?80Hm>@ATd~d%@r)OD+b%Xu}cmSz=~&gEvzGkl})7z zI7Z_zviKMAagHqAIJkx#BM=0AjEMkaf%zoe&dw-Dg&ZPT04J?$kOrrt6+~$PqAU%? zthhvqv(S`%Iv^+wl>y}x0v|<5p$%}Z&;&dLi|E#bobu+w`Z8X!olK?;EKmaex~mR#-!PRiY~#g_f2jx0Pd$Wea7gmvvB zAlaUM+;CppmxT6${e7JCD=Qm2ff4ZKku8l)g1C58b1_{BsgDeRCrhF~Ap$zxyMLku zO+DO@fBK^fv$qH=s7gknaQ}L6l}I8XCRR2Q~-5Kw{iH_+vul-YXin40uL} zM#K0a3M?LW1t^}l#D BDWL!W delta 3169 zcmbtWeQZ#lXItMf>;Xg*{^2#`n5;lYFT|b zk#(Ni)iJz*69Oo~6G1{*n0B-v`0Ea54P^q``XWu7AZqepc%L$Cpw2|#i8(!W*ali( zDcreM49{f0We#O`GX-aJYO9FH!xK3eG$bk#k>f%kA#DX1EbFX6J%s>~q8ge&M@eJR z2r@DG+*}6Y%R6GD@cq0w9CznSxN|(e8RtLB_y1q2UAMuVAD%OxENpjV^%<=`SSaI4 ztk3O#bbssO=fd3*c$mmWuq_lo2f7K2t!mDtGOx<0HM}|31b0^L#0MKoy*Pfkv=vo2 zUV83HA}3QKmAwJF$rz=&6jju{#%O>xH3>=PZB1s|K^h8rLjg`r#KKCPlVxLKOwmSM z8naGN3!#IB)QA@6Gf1C+QBgJe9{_Sx#PxUxn9dQ@tGetnSR7`{T5HmQFy0?tw2T!9 zmgg~0)<9u-UIF0^Q4w|YCk1!;UVQg!|IRU?~ z5Yb|lmG9({l#mj)jqarAi8`pMDz*_*tQxf0s5x03vzZUozMqAne{i`93D06TZAJ<$ zr4`_HH{f$S-5g$;a9_3+QjA87cw&$MPr+C3bYPr8Uwt2nP1iHAAK-|1zgXLkTkZxa zkMOD>2;#E%d9A^g(;tyBMkD6D$D4;RrMjU+To|A(uE~PT zk5HY2qYCF|?=qj{bg-=S`50!N1I12uKAQ$C&=dNYqDHK{OJXZ`Pj((M*KTxYqqlmy zDlqHKuY94H%cQB zMdd^mEq;y~3L;>fByhpOwwQ-mHP$?=sYYCjx^#mW3BB3Up*f8Q$D@7t^+E{${f0E8 z@TRCfpI=OtgOkc`H-Qh5KK#Dw$vPOE$N^zu6wQBaa*z3^iT7>)UHUZU-L=WDX5rO^ zzBQn|k!=ngO`-A4caII`=WgiO*cMjScfh*0SDQOdyvHcHeX0YY_fNU9mkPiu%v*!- zft`dP_Txs_^W1BQ;QmG+z268=ee5T9AVmFkOI6u8) z2%l0iGIa#$Wfu|{Lq?@`ocS!2c<)R@AuFaDqj^>43FM#Mox>Q8$^>F(E3;`z5aaT+ ztqf+)4%mqdck{|2dnSlahi3!_L9r7vYYK_1CZf@l5;Q`%bA2XM$*PSWLXOdb1j)v# zJCspn%WV1M7Ka#1ZZ)rV&PbEK^jZwqx=x6{=%#W zw#=3`#Fw^~a6|=(Hlql(CJ{`Yzs|OCE34Zg^vco}q_F+mW*0$Cy4aA$OT)(nzn-2E zm_PRx+T-x~1_$XPaN&F%2FLC5M;R|~eM!J^{H4F4z`hHsOIgEUNLC6-s-_MrXs&Nx zIO<@!OJ6Ij8O6WHG%PqR7Po}>7F%O%En+b@ma+`QDqa9;0rHYpYg%e0shp(KFH84^-( zH)c2uCk*6m>wv?W({}lJy!__nY6SY-<=t4k3|SFUN>o=|)ExNUN!tc&gqXuwv#{ja zC3C7WYZC%|90NjS0U;n2jp)tIh+TQ5wlRGVo28F+7;)CHcx73}n*<#ayz*iZa$CC9 z)Vnwiefhb033Zd_8*m(+KY6(|tmBDRIC5$uRNP2rS&4t-)R&gI<~OIFSYC9W z?pSITk8ai#lF!S& zF4DwJaDMc7^{wh$TpY9(n{HLHMZ{W!ZdI38i{I{UwTW2R}d@^c