From 6769b2d68caf53530cb752d7f28ef1233e54c2f7 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 19 May 2020 21:42:23 -0500 Subject: [PATCH 01/38] Implement emojireact actions --- app/gabsocial/actions/emoji_reacts.js | Bin 0 -> 3624 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/gabsocial/actions/emoji_reacts.js diff --git a/app/gabsocial/actions/emoji_reacts.js b/app/gabsocial/actions/emoji_reacts.js new file mode 100644 index 0000000000000000000000000000000000000000..0b61d1eb4f6b36b222d6a2b81fc6f504da925016 GIT binary patch literal 3624 zcmb_fZEu?}5dNNDag!ziQUu!9R^1duMC;UTT1Y;(2%N@S0?e3cQHl*Bx7lskL@opzr?!17!SRk5hQ9jGEvMFdiwU-l`(x!%k zb`nV=M3|!q`YU2&Wl>XzzkdI6|G122^A-F4v5u1!+=1s-kKE0TH`3UR!n*$cNbZ+#c+7B6sog1gE4b--^6Ssjnd0fP+`R9RB_jdaj9Da;6 zhIdE!F%ok4>1DNPij3m2fDIR6yf1&^B}y||`#7Hh;`af(OaKU?4Jp9Sab2bC(J4G5 z%C(6Cxcev`0l*vZ-|2Nf2-&6Y?U5G*%AQG|6vv#l>+h&r3k8g+3F2E!~&)vyRyeRxFy4(-)o zb(1E`P%WvofN3v>Aj~+qJ|d(fCbmJJixlr9UEHK|#96*oCvx6 z6*}dY1M2G|&=qRWJb4CMC*LbL)amWOA$^^JrZ-a0Cvi-xOW8dm+7T6N3}fD+B8N_j@j j%)UI2N&972{l9QEE=^qLv1#MFHlHT0^BJ|VU5V5GYo>cX literal 0 HcmV?d00001 From 1b85b8e3f1b2a0277e330ce6383aa7dd53cb1517 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 19 May 2020 22:54:05 -0500 Subject: [PATCH 02/38] Add StatusInteractionBar --- .../components/status_interaction_bar.js | Bin 0 -> 974 bytes app/gabsocial/features/status/index.js | Bin 16212 -> 16344 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/gabsocial/features/status/components/status_interaction_bar.js diff --git a/app/gabsocial/features/status/components/status_interaction_bar.js b/app/gabsocial/features/status/components/status_interaction_bar.js new file mode 100644 index 0000000000000000000000000000000000000000..9ce614253752b584358104590c2b687c145ece31 GIT binary patch literal 974 zcmb7?&2G~`5XbL+in-aATKk?hm4HSfC{YlJ#G$I9jWc!@>|JYjBQ>&o;f@eDE~o-= z=gRZ&0`w7>-8Hr=E|7yWn$Q3IW_eXhW#ARE%s{SW1);KbcoA?Pnpf4)uw98Sm8>_X z8ud8uoc{@**AzE4KGb3*-|+m@6%=fzWyV>V=E%%Zp-x?b|58{ zNL8dc%Wx;<+ce0e&<36?7OU5@>+Nj0dNGG7+ynsO!~Mti;hD95e*X6B#|Lje+<$u4 zTi<)@Yj1ra>z1bDonw)eOlw#hlBnmxpduVxilBilQ+I2dGdL z`2RhYwhT0{cxkt@8v2$wFKPFG?V0%WXplO{hsW1SxX8-m9`z_WDbPfrU=@aO>~@an zpA1F3QAKe_)E~d;$U;lR%z^8~vey@`(5DPKh+~&-hs;HE6V@ftOK0I3gf4IEo;=-H zhqs=m9ZWA&bO!*qymHO$RU0>PglDvej_qY5q~-g3D%Ldeo>^?b8j lOq&L_+k>gfiN8R8itrH+Xj@2!esSBizU-VN*}bGT_zl;jH$eaZ literal 0 HcmV?d00001 diff --git a/app/gabsocial/features/status/index.js b/app/gabsocial/features/status/index.js index 4b9fc2436647c4a39bfe463e3e18e9fd8c99103f..424dda420390fe267f8106baeb100945ea4057c4 100644 GIT binary patch delta 114 zcmcaoccXs8d^WYr+=Bd~5`}7o;F83W(qhlNlGLKa@A`30MFC From 79dc56372f18914004a491c8c8f2b0a86f537b65 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 19 May 2020 23:08:19 -0500 Subject: [PATCH 03/38] Add count to emoji reacts --- .../components/status_interaction_bar.js | Bin 974 -> 1080 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/features/status/components/status_interaction_bar.js b/app/gabsocial/features/status/components/status_interaction_bar.js index 9ce614253752b584358104590c2b687c145ece31..c250f57d136bbbcd648198184ccd3076b7107753 100644 GIT binary patch delta 147 zcmX@dzJp^!6tkX!2A2XH*c2Be<|!oSBo-I@CFZ8us;B1WXJzUZr6wkqsM`S*PL5`d zhyW=EtF)_5)k{w;(NIs$FU>1a*Q~YC2N?iT2m|OMnwqsxSsQ(bI!$Y!KrI(nEf)a2 CW+dkT delta 17 YcmdnNagKdM6f+~& Date: Tue, 19 May 2020 23:25:49 -0500 Subject: [PATCH 04/38] Display favourite count as likes --- .../components/status_interaction_bar.js | Bin 1080 -> 1523 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/features/status/components/status_interaction_bar.js b/app/gabsocial/features/status/components/status_interaction_bar.js index c250f57d136bbbcd648198184ccd3076b7107753..6859601e4a94f67b70130ca686522b9bfb77e6fc 100644 GIT binary patch delta 340 zcmdnN@tJ$WK1L3Oq)LV4{L;M5dl|zSjTL|(IX|zsL?I_LJJlH|UZP;DP+XE&Qd+E+ zo?4=zo|agaUs{w|l3E-O(pI8AS&&&-0HNAW!9YPxZE_m3mW@quL1G>k$VeDS&PgmT z_Djr7wN+2e&CklzElN#HF45HmbJUTQPM*%JBd-2o{={B&O@-Q8Bq@En$uZ38I=Z?L z>+P!HcGueIgKV^eD~9rGCu=e1TEj&ljv?MD3JO5S*b1TO*9TcLIhI+C1Lls&FPZ%T D?`dF} delta 36 scmey&y@O-JKE}<*8N(PS2Qw>7?qo@x{E}H`axkml Date: Wed, 20 May 2020 11:46:49 -0500 Subject: [PATCH 05/38] Add emojiReact utils with tests --- .../components/status_interaction_bar.js | Bin 1523 -> 948 bytes .../utils/__tests__/emoji_reacts-test.js | Bin 0 -> 4051 bytes app/gabsocial/utils/emoji_reacts.js | Bin 0 -> 1133 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/gabsocial/utils/__tests__/emoji_reacts-test.js create mode 100644 app/gabsocial/utils/emoji_reacts.js diff --git a/app/gabsocial/features/status/components/status_interaction_bar.js b/app/gabsocial/features/status/components/status_interaction_bar.js index 6859601e4a94f67b70130ca686522b9bfb77e6fc..bb276dd84ee8f7d29eeb33a0b566d1dbc51150fd 100644 GIT binary patch delta 200 zcmey&y@h>3uT^GlL4Hw*LbXCsYD#Hxs%vh3R;EI&LRwLNu7Y}cVp4H_a%N(VerZW& zPO*L}NH)GGH8HuQSbZ`lWA)^fOm$poiDmhvMVTe3#gny}ZJARt%O)RW5qB(Bx8qWP zf@&nwHNd6>feq17KxlT(FU>2_)XPmQ(9lTLQOMMsyoN=WLm@l0(zZIYcJoaZE=FOX R*$_iDt$}9Oa&gsi0RS*7LmvPD delta 627 zcmb7>O-lk%6ozpMg4?EDiy{sLju&gDwdFvhi$WQwASfcn@v4*aVRNrg$RN0vlDjB~ zkfMEyTGU_gXS8UW&>v_%WYk^l-g`LjbI*Iu+uYCmO}C9?8ET9*XhxQa<(wN0QZ_Wn zajSAg(@Dv3>N3(Dn=;rg6x5@9?krza_jVx*CkQ|s_Iq7%El{5i&)@IYkskK%IbW2sj zQlhO{M8r6Zk1^&-qBCn6b;1XU?2;0egUz&p+D@$E zFGe@Q;CZnRKvsBF5c%;8Qe%dRmib7?Skzs-ZgDiRYIJpP$dqzpcKRf zE}W3~9)5s+0=wIEJ>%GB4Q-?(cCydAJMX=jS)Lt=Lc!?(Kd>;f56~DdX#L;ouBrg~%XSTf4{1bDkG0ij@pD2Yfk;9k8W&&?2RmDX8ssF1rR_gn3Cao#*j*IwHE^`K>zUmw5x z{`ua`gQaOWkf09Ob@*X=q7#Qn2{;=W=P!ln*!>4t`bL2eH1^z7Ejx9E4@-f})dj*a zCm>%15sBl0Q@|;P$Rj}o@3KoeZvO!bSu_HpLo?!#-nYq^|EfzL(I0M(T z?jJ9rLBEIrG-z-|H=@+7#%)W-e_#KlgD6R;29&S~F^dj?nObY?;OOj5k9VbudMK&} zt(Mzs(x`J>;jR{>BobweoeF1BDrq}NWY{2$S~q~&X5yt<+KC`eOR4+qSsA~)oo1j) zv8$Wt=mkk>$Kh)02E9X!L|WC1hP8RN9e8bRJ$gO)VhkY?t*zQm!`g5aM3^4(#3O{e|IIb0Hx`3x!q^Lh&ydJ`I92 zg;Q&5GfPvH>P*y_3!W&wNeiCgiBjijfEOKVrYd9M`QhRE-QwW=Vzqv~ggG1q0O8H$ z*Uw?>qTk=I|NQ#W$2XVXJ`K^&A-Wo(9~2!EiOB#%8!Q|Z0`DljL7rIy^Jl5GqSOu3@R<7cu#%fd`Gl?|gPi1tTG)EitpXcmxAZ`TLw8LV6r7$HT;bx-Gi$glVZ z)o5XnHUN*RiJ=&Ny>t{K$9_vI_ClB99G6v&7gHUQLR5K|_rR!=`h0Qv)hjMBB;5IY zcO#MjKor16bW-d|)XnuLcZ~KXlbXwl9SyB9?6f`ZU;#ARMpx4l-P;p`1M25Ix}}BV z*#edZchv5{t{Zd8e2cR!X-7)V_TgfX=#m5%gA--8(*xS53;O=!%UY;daAdyk9ULmA!?^EP3l<-Kt9sB83X LbQ`}X=qUaLR= Date: Wed, 20 May 2020 11:55:30 -0500 Subject: [PATCH 06/38] Don't add like reacts when there are no favourites --- .../utils/__tests__/emoji_reacts-test.js | Bin 4051 -> 4320 bytes app/gabsocial/utils/emoji_reacts.js | Bin 1133 -> 1177 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/utils/__tests__/emoji_reacts-test.js b/app/gabsocial/utils/__tests__/emoji_reacts-test.js index f0577c582df4406296897bfc7cb9f71be676f5e7..6acb5ec099dbaca3fa2fe444ad2dabac4d741407 100644 GIT binary patch delta 87 zcmcaC|3Gm=GPi+(LS~7EdP;t3u|i&ci9%vZio%Ea6MGekQWKL)iWSN;Qu7o_GE$3D q6%v6sFMqN;pYmj14kbo|$#op+llO8ZPTs>WJ~@_|dvh6gEDHc>IUWK4 delta 12 TcmaE$cv*f!GWX^Jo&pvCBnkwz diff --git a/app/gabsocial/utils/emoji_reacts.js b/app/gabsocial/utils/emoji_reacts.js index b2426b9a2256397fa3c44b86916961da50aece1d..bb45da7d42b6f16a6c7fd790e080207b7d5e3c4c 100644 GIT binary patch delta 54 zcmaFMF_Uw{F-FbIGzAUCw8XOf(xS|g)MDrS(!3H)g`(7w(xNjy delta 12 UcmbQq`IckDF~-fG7?(2v03@#kUH||9 From c8f89ce8c1542d0dd9c503e7429a78c0b436a79e Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 20 May 2020 13:11:44 -0500 Subject: [PATCH 07/38] Style the StatusInteractionBar --- .../components/status_interaction_bar.js | Bin 948 -> 1358 bytes app/styles/application.scss | 1 + .../gabsocial/components/emoji-reacts.scss | 49 ++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 app/styles/gabsocial/components/emoji-reacts.scss diff --git a/app/gabsocial/features/status/components/status_interaction_bar.js b/app/gabsocial/features/status/components/status_interaction_bar.js index bb276dd84ee8f7d29eeb33a0b566d1dbc51150fd..9b1cb4c3b37d3f54fa692d4ff8c04a3386c1d878 100644 GIT binary patch delta 408 zcmZvWy-LJD6otubAx2OTbQOQNSeThLn{_R9cMD4e3u_^SWOPUJBa_J%D`H`9;ce_~ zEG-1zLhv1Y03X5mK@f3@%W%#;-?^_d@BYi7w|2qRNhOOU7gL^{@+4I?41qEjj_}BP zo&)_PSB)$IBhv9DpKw`o$_{Yf+rX(ef2+o#j{f239pA*$s;rfsO{p}R7uBV3MUmuL zlX6OvGz}qbq-h0eLjYQY9itjH4QxJO)?^{tIQ&kUo(qw>guNE=4WN9b4})937?$G!auo;MTSXNck&b#O??~v h;)29HJ1zw%(A2DjvTgKJGRq(mn$|$ES}v|yE&yGSB!d6| diff --git a/app/styles/application.scss b/app/styles/application.scss index a57193533e..3b267a4bd0 100644 --- a/app/styles/application.scss +++ b/app/styles/application.scss @@ -32,6 +32,7 @@ @import 'gabsocial/components/group-sidebar-panel'; @import 'gabsocial/components/sidebar-menu'; @import 'gabsocial/components/hotkeys-modal'; +@import 'gabsocial/components/emoji-reacts'; @import 'gabsocial/polls'; @import 'gabsocial/introduction'; diff --git a/app/styles/gabsocial/components/emoji-reacts.scss b/app/styles/gabsocial/components/emoji-reacts.scss new file mode 100644 index 0000000000..71a5c18e11 --- /dev/null +++ b/app/styles/gabsocial/components/emoji-reacts.scss @@ -0,0 +1,49 @@ +.emoji-react { + display: inline-block; + transition: 0.1s; + + &__emoji { + img { + width: 20px; + height: 20px; + filter: drop-shadow(2px 0 0 #fff); // FIXME: Use theme color + } + } + + &__count { + display: none; + } + + + .emoji-react { + margin-right: -8px; + } +} + +.emoji-reacts { + display: inline-flex; + flex-direction: row-reverse; +} + +.emoji-reacts-container { + display: inline-flex; + + &:hover { + .emoji-react { + margin: 0; + + &__count { + display: inline; + } + } + + .emoji-reacts__count { + display: none; + } + } +} + +.emoji-reacts__count, +.emoji-react__count { + font-size: 12px; + font-weight: bold; +} From 92917ac3e5e55a152cecee050ab4cc649a7db4e8 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 20 May 2020 14:44:23 -0500 Subject: [PATCH 08/38] Style improvements, star icon -> thumbs up --- app/gabsocial/components/status_action_bar.js | Bin 12675 -> 12680 bytes .../features/status/components/action_bar.js | Bin 9787 -> 9899 bytes .../status/components/detailed_status.js | Bin 7109 -> 6967 bytes .../components/status_interaction_bar.js | Bin 1358 -> 1482 bytes app/gabsocial/features/status/index.js | Bin 16344 -> 16212 bytes app/styles/gabsocial/components.scss | 1 + .../gabsocial/components/emoji-reacts.scss | 6 ++++++ 7 files changed, 7 insertions(+) diff --git a/app/gabsocial/components/status_action_bar.js b/app/gabsocial/components/status_action_bar.js index 7c5620876496ed1778a94fdeadad084439d08aa1..3bd191c22298d2464bab612fb241502d15a36df1 100644 GIT binary patch delta 22 dcmZop?nvI?smEE8QJR}ntXo>J*;mhu831IV2o3-M delta 17 YcmeB3Zcg6dsmD@Wl327kNY9KJ06m-rBLDyZ diff --git a/app/gabsocial/features/status/components/action_bar.js b/app/gabsocial/features/status/components/action_bar.js index 5432dd0e59329e1f80b94c98be776ffa2e6e882d..e7e2a1c98a75e02557703eeac787fef6c929f68d 100644 GIT binary patch delta 163 zcmdn(v)Xrqff6^D0vt@9D6c;`UTK0Pl2}k`K~5!{Kl#0q1&R)JLjtZ=LBS_8I~C5|{6)o`5dh(}C0zgj delta 67 zcmZ4OyW3}jfzsrO^7@mrlqRs*=%-|s*-dU#)tcNXFETkv`3}0!GL=%6;*!Lo$ttQE Jn^RQX8392K7k2;v diff --git a/app/gabsocial/features/status/components/detailed_status.js b/app/gabsocial/features/status/components/detailed_status.js index 9372c9e47e558f7b5db04d61cb5cf32f3c0657bf..b18ad11e0082f2235c129555e725461643668667 100644 GIT binary patch delta 212 zcmX?VzTIqtHnVMJZb5!gi9)qPa7kiGX|ZQsNorAIa!F=>o>O9xLajntQGTw1x}JV9 zSUNrvAs?TVxLKWf4g2QzT=%&)pBF1&&ctd4M5k>vgsxT4x8qVk0yZg`WvC(w3e`oa zNjdrHKACyhwF=dV1qC^o$%!C0K|~I1pKL2tIC+iKQdR{88~wz|{*v;Or$`$D02w_> A1^@s6 delta 262 zcmdmPcGP@>HuL5j<`wLc3P6yPTB4AaSe9Q}lv$GMlbM&TV5^|MS&;h?mk_$J2G`^V z!Wv3BKt<|yTp-OLVB?vbpQn(SVyj+Ul31j!pl`=D`JS*A4@fu2%wnM0$#tT7)^OvB z+FD^*TgYl7hn%0}&ik2}mCQg1JB0KqwWZ-0bsl^sH`iXYc oi3J5YnaPPInfZAjx7R8h+OAMtl$w;2pN`FtE3c{B$kvG>t^Paq!s~nWaj7TCM6cB+i@vCL3MI|XSq}YN6_F^iwj+AeuF;fnv2>T(w*P{&z0; delta 55 zcmX@beU59xTPCT@GzE?1{L;J<1serJO@*S=lG36)g}l<7oXHNXYLnM6b8j|g=4WD8 LP^jhNs^tOz5~dKm diff --git a/app/gabsocial/features/status/index.js b/app/gabsocial/features/status/index.js index 424dda420390fe267f8106baeb100945ea4057c4..4b9fc2436647c4a39bfe463e3e18e9fd8c99103f 100644 GIT binary patch delta 17 Zcmcanf2D52e74Q6*|wW*zGd@|2>@A`30MFC delta 114 zcmcaoccXs8d^WYr+=Bd~5`}7o;F83W(qhlNlGLKa Date: Wed, 20 May 2020 15:52:28 -0500 Subject: [PATCH 09/38] Use unicode heart instead of red heart --- app/gabsocial/utils/emoji_reacts.js | Bin 1177 -> 1174 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/utils/emoji_reacts.js b/app/gabsocial/utils/emoji_reacts.js index bb45da7d42b6f16a6c7fd790e080207b7d5e3c4c..ae426dedc450be8eef49a5fa35f660d1ddcc21fe 100644 GIT binary patch delta 10 RcmbQqIgN8d>&6a27628$1El}} delta 14 VcmbQnIg@ijEA#su{To{aSpY1^1=|1s From 1901d39871bd3bc07f85ff10dab39305e6ac0c9f Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 20 May 2020 15:52:46 -0500 Subject: [PATCH 10/38] Add emojiReact popup and call action code --- .../features/status/components/action_bar.js | Bin 9899 -> 10677 bytes app/gabsocial/features/status/index.js | Bin 16212 -> 16775 bytes app/styles/gabsocial/components.scss | 1 + .../gabsocial/components/emoji-reacts.scss | 32 ++++++++++++++++++ 4 files changed, 33 insertions(+) diff --git a/app/gabsocial/features/status/components/action_bar.js b/app/gabsocial/features/status/components/action_bar.js index e7e2a1c98a75e02557703eeac787fef6c929f68d..8ca178a5cf16ed5912ac37f95671ce0bf939ac24 100644 GIT binary patch delta 601 zcmZWm*-FDe6osOo6(er6_;lS!E5`chmWoTkN^5b$$1tWhZ8XW0nW<1h@fVc&2VZwOrQJ7>A~%xm@I@@+bmb^R7)0zx>bRBAV+W2;oHotB~d{GK^PpWe9^ zLt+cA@22}u)pa`HFzSQeAh(>_F7XNu647SJ3kr~&JuNjdK30l#E|AFmiPhfB#QDg2 zbg{*e=i2vRg2IDYgfIMF7BZtr?(Yd!~c6vXwgZg3He$t~-)Ed&h=!yyl}&0K+cF=EKC#q6V!GSuD% zM-Od5nR<=KODg;m*M?78xt}$1%6WhU*h{R2x&XFEI6oskn))Bd$G)XyskZ))SSLXP z8Etc~bBUrH1jtUVsueQ~!Lpjd_jZy@olY`T9=b^yzcT^QK;>_SqUrLDCJE{uCf~9d d|4W}a%qzqp{Z>9717vL_Be$2d-pk5p>KmwJvu6MR delta 31 ncmdlQyxMnzAk*enCPvQ9o4Es7Hh&h-5}mwHS#t9Rbyg+-x`+zl diff --git a/app/gabsocial/features/status/index.js b/app/gabsocial/features/status/index.js index 4b9fc2436647c4a39bfe463e3e18e9fd8c99103f..ae648d4ce960e486c0e8ee79063db3adfc4b82ce 100644 GIT binary patch delta 428 zcmcao*WS#yp_EBdAvHHYD>EoHF}XxXp)}7G&YSp8oEt0`Uj&leoXK=o*cBn|oRgWH ztzfI5QCyN(Qd+D7F-KFu)=r_CO92Qn(-bto`W0+#Z57l%%%9k+t_hZ#Y^@%8rI3RQH5?` Date: Wed, 20 May 2020 16:08:29 -0500 Subject: [PATCH 11/38] Replace red heart with unicode heart in tests --- .../utils/__tests__/emoji_reacts-test.js | Bin 4320 -> 4293 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/utils/__tests__/emoji_reacts-test.js b/app/gabsocial/utils/__tests__/emoji_reacts-test.js index 6acb5ec099dbaca3fa2fe444ad2dabac4d741407..8df3cb67476d60aaafc67283088338dfca89bca6 100644 GIT binary patch delta 121 zcmaE$cvNx2KbFaitd}M$@Muha&n`AuhMRx#dKQhzu>#_g6HJ^8!uf MnrzP}4>Y+M0MOwm6aWAK delta 190 zcmX@A_&{;PKNjZqJNhU8W4Q#T83mLkKVX;H%*VEg5iC&1CpI~NS77pf7M{ufnYkwa z Date: Wed, 20 May 2020 16:52:32 -0500 Subject: [PATCH 12/38] Emoji chooser hover state --- app/styles/gabsocial/components/emoji-reacts.scss | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app/styles/gabsocial/components/emoji-reacts.scss b/app/styles/gabsocial/components/emoji-reacts.scss index 486741d045..3b989b52bc 100644 --- a/app/styles/gabsocial/components/emoji-reacts.scss +++ b/app/styles/gabsocial/components/emoji-reacts.scss @@ -59,7 +59,7 @@ bottom: 100%; display: flex; background-color: #fff; - padding: 8px; + padding: 5px 8px; border-radius: 9999px; box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.1); opacity: 0; @@ -68,13 +68,24 @@ &__emoji { display: block; - padding: 0 2px; + padding: 0; + margin: 0; border: 0; background: transparent; img { width: 30px; height: 30px; + padding: 3px; + transition: 0.1s; + } + + &:hover { + img { + width: 36px; + height: 36px; + padding: 0; + } } } } From fcd76431cb659c7efa8759c65a991e43b1b180b8 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 20 May 2020 18:01:37 -0500 Subject: [PATCH 13/38] Support `pleroma:emoji_reaction` notification type --- .../notifications/components/notification.js | Bin 9466 -> 11045 bytes app/gabsocial/reducers/notifications.js | Bin 6104 -> 6133 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/features/notifications/components/notification.js b/app/gabsocial/features/notifications/components/notification.js index 5094ade36a621487e8a5b637f2b410b0a921601f..bd13367dc644dfaae6fdca94df68a9cabd01aab4 100644 GIT binary patch delta 363 zcmez6xioBpFq3g+Zb5!gi9%{_epY5$r9xU!ey)OgdSX&>esX4Fj(%EdVo7OHYOy|8 z0fgKvz{DfK97*L5;NOl8VI9XOj8Z}&` JCf`?)1_0r)fmZ+k delta 68 zcmZ1)_RDjFFw Date: Thu, 21 May 2020 19:01:41 -0500 Subject: [PATCH 14/38] "reacted to" --> "liked" for favourite notifications --- .../notifications/components/notification.js | Bin 11045 -> 11035 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/features/notifications/components/notification.js b/app/gabsocial/features/notifications/components/notification.js index bd13367dc644dfaae6fdca94df68a9cabd01aab4..5fda69cfe6cc21894ab6dae7f0b38ab74466104d 100644 GIT binary patch delta 41 tcmZ1)Hal#Cz9ef-W_D`I Date: Thu, 21 May 2020 20:33:55 -0500 Subject: [PATCH 15/38] Improve detailed status action buttons --- app/gabsocial/components/icon_button.js | Bin 2947 -> 3153 bytes .../features/status/components/action_bar.js | Bin 10677 -> 10919 bytes app/styles/application.scss | 1 + app/styles/gabsocial/components.scss | 79 +-------------- .../gabsocial/components/detailed-status.scss | 92 ++++++++++++++++++ 5 files changed, 94 insertions(+), 78 deletions(-) create mode 100644 app/styles/gabsocial/components/detailed-status.scss diff --git a/app/gabsocial/components/icon_button.js b/app/gabsocial/components/icon_button.js index f8816bbf75c1d787b93f152afbecb70fe184aef3..afbddc1175c35b14aaf8e51abbc591ba3a675016 100644 GIT binary patch delta 258 zcmZn`zbLUmm5oh7p(M4UWV1XQH`C>R1&MhI$vKI|#eRvoskZ8w$@zKlNu?zvKq?-jO5F~u rxYkA=q|~l<^A3)aj6hp`#j)B5wo_{Icdp0)EcPlWP+;?9S8h81l7v)F delta 71 zcmca8(Ja0}m2I;j8!Hn}aYp3A{M MIg2}TvK)^w0AKGILjV8( diff --git a/app/gabsocial/features/status/components/action_bar.js b/app/gabsocial/features/status/components/action_bar.js index 8ca178a5cf16ed5912ac37f95671ce0bf939ac24..1e9450f99ca70db9ffa30761916ffb47594412ec 100644 GIT binary patch delta 395 zcmdlQygYQnHDw+y1q7Jk!!N4y3*u26;5GfDTR{MiW1xE z$@UU5BA7b$?Izz-wV%9CSpwCbk1Eor0z9gUr~RPA*@749?kW5if0J}rI yB%?GpsaUtPKpo@^1rxW#vi#Db%#u{+oXq5GY!33t%uYph4=`vXHrHxcFaiK|?_4)9#d?UtF@eQSBn* sAUh}D(%=?^=vObvD9ueO)-5eipUkJJB7|zYPiA&1&~k~*`I;7t02e+s6aWAK diff --git a/app/styles/application.scss b/app/styles/application.scss index 3b267a4bd0..69ab8cccd2 100644 --- a/app/styles/application.scss +++ b/app/styles/application.scss @@ -33,6 +33,7 @@ @import 'gabsocial/components/sidebar-menu'; @import 'gabsocial/components/hotkeys-modal'; @import 'gabsocial/components/emoji-reacts'; +@import 'gabsocial/components/detailed-status'; @import 'gabsocial/polls'; @import 'gabsocial/introduction'; diff --git a/app/styles/gabsocial/components.scss b/app/styles/gabsocial/components.scss index c009a4c0d0..dda4f4e4ad 100644 --- a/app/styles/gabsocial/components.scss +++ b/app/styles/gabsocial/components.scss @@ -119,7 +119,7 @@ display: inline-block; padding: 0; color: $gab-secondary-text; - border: none; + border: 0; background: transparent; cursor: pointer; transition: color 100ms ease-in; @@ -718,83 +718,6 @@ width: 23.15px; } -.detailed-status__action-bar-dropdown { - flex: 1 1 auto; - display: flex; - align-items: center; - justify-content: center; - position: relative; -} - -.detailed-status { - background: lighten($ui-base-color, 4%); - padding: 14px 10px; - - &--flex { - display: flex; - flex-wrap: wrap; - justify-content: space-between; - align-items: flex-start; - - .status__content, - .detailed-status__meta { - flex: 100%; - } - } - - .status__content { - font-size: 19px; - line-height: 24px; - - .emojione { - width: 24px; - height: 24px; - margin: -1px 0 0; - } - - .status__content__spoiler-link { - line-height: 24px; - margin: -1px 0 0; - } - } - - .video-player { - margin-top: 8px; - } -} - -.detailed-status__meta { - margin-top: 15px; - color: $dark-text-color; - font-size: 14px; - line-height: 18px; - display: flex; -} - -.detailed-status__action-bar { - background: lighten($ui-base-color, 4%); - border-top: 1px solid lighten($ui-base-color, 8%); - border-bottom: 1px solid lighten($ui-base-color, 8%); - display: flex; - flex-direction: row; - padding: 10px 0; -} - -.detailed-status__link { - color: $action-button-color; - cursor: pointer; - text-decoration: none; - font-size: 13px; -} - -.detailed-status__favorites, -.detailed-status__reblogs { - display: inline-block; - font-weight: 500; - font-size: 12px; - margin-left: 6px; -} - .reply-indicator__content { color: $gab-default-text-light; font-size: 14px; diff --git a/app/styles/gabsocial/components/detailed-status.scss b/app/styles/gabsocial/components/detailed-status.scss new file mode 100644 index 0000000000..6fe10a26ef --- /dev/null +++ b/app/styles/gabsocial/components/detailed-status.scss @@ -0,0 +1,92 @@ +.detailed-status__action-bar-dropdown { + flex: 1 1 auto; + display: flex; + align-items: center; + justify-content: center; + position: relative; +} + +.detailed-status { + background: lighten($ui-base-color, 4%); + padding: 14px 10px; + + &--flex { + display: flex; + flex-wrap: wrap; + justify-content: space-between; + align-items: flex-start; + + .status__content, + .detailed-status__meta { + flex: 100%; + } + } + + .status__content { + font-size: 19px; + line-height: 24px; + + .emojione { + width: 24px; + height: 24px; + margin: -1px 0 0; + } + + .status__content__spoiler-link { + line-height: 24px; + margin: -1px 0 0; + } + } + + .video-player { + margin-top: 8px; + } +} + +.detailed-status__meta { + margin-top: 15px; + color: $dark-text-color; + font-size: 14px; + line-height: 18px; + display: flex; +} + +.detailed-status__action-bar { + background: lighten($ui-base-color, 4%); + border-top: 1px solid lighten($ui-base-color, 8%); + border-bottom: 1px solid lighten($ui-base-color, 8%); + display: flex; + flex-direction: row; + padding: 10px 0; +} + +.detailed-status__link { + color: $action-button-color; + cursor: pointer; + text-decoration: none; + font-size: 13px; +} + +.detailed-status__favorites, +.detailed-status__reblogs { + display: inline-block; + font-weight: 500; + font-size: 12px; + margin-left: 6px; +} + +.detailed-status__button { + text-align: left; + padding-left: 10px; + + .icon-button { + display: inline-flex; + align-items: center; + + .icon_button__text { + font-size: 14px; + padding-left: 3px; + transform: translateY(-1px); + } + } +} From aec10e18a1c11bd521ea6e36c2a0e6e1ccffd32c Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 21 May 2020 20:40:06 -0500 Subject: [PATCH 16/38] Fix linter errors --- app/gabsocial/components/icon_button.js | Bin 3153 -> 3181 bytes app/gabsocial/components/sidebar_menu.js | Bin 8449 -> 8451 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/components/icon_button.js b/app/gabsocial/components/icon_button.js index afbddc1175c35b14aaf8e51abbc591ba3a675016..ceb2a643ca104f099321ab4d1cb7ef015e99d4e7 100644 GIT binary patch delta 23 ecmca8@m6AkCNrCYLP=^x$>cajvCW#y8k_)M-v;gg delta 12 TcmaDWaZzG}Ci7-jW(`gNAlL)< diff --git a/app/gabsocial/components/sidebar_menu.js b/app/gabsocial/components/sidebar_menu.js index 1e2c1bcb5bc2c7e0df0da82e06524846cbc81916..00c7ec0c62a02773bcc925549f813fdeab2a8ddd 100644 GIT binary patch delta 12 TcmZp4YIfQnDZW`;{1qnv9TWsT delta 12 TcmZp6YINElDZW`+`~@cf9V7%l From 3ce90dcf6687b76bb709cf4b5d6a974347cb2b6c Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 21 May 2020 21:14:15 -0500 Subject: [PATCH 17/38] Refactor EmojiSelector into its own component --- app/gabsocial/components/emoji_selector.js | Bin 0 -> 673 bytes .../features/status/components/action_bar.js | Bin 10919 -> 10585 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/gabsocial/components/emoji_selector.js diff --git a/app/gabsocial/components/emoji_selector.js b/app/gabsocial/components/emoji_selector.js new file mode 100644 index 0000000000000000000000000000000000000000..fabc276dd288226ad8561240ef994c7bd96bd637 GIT binary patch literal 673 zcmZ`#U2lRg6n*Dc+&3hd@UCLAIFq^PT-0Qbq{2nJm6o+-(GdRo+ER698Bg@y^Ks9i zRV}234U$|#DMbaLwEy8ap#ADiih6ghQTcUk-a~B%H%tqU%jNog{*=vE>z4&|9(y2r zC2~qw(rC(5f|dB7nKSsscGL3whf^ZajYLoD$;LClle@XVk~B<1&WKVlx6)f=m}?;c zPa1il`dsl$m?#{%hBgQQY=S;fY6f6F!Ce6(xQ30(hUYO=8~kdh#Nxr=I!l&D7v&)G z%v^9~WG@OPc?$YSRcuX^Io8TcG&wj7+yh`z(C_~0S5jdby8J`e%24?P;nafx+PiM! ziqr$gfOLA5v@Vlz;0L!X(yRag literal 0 HcmV?d00001 diff --git a/app/gabsocial/features/status/components/action_bar.js b/app/gabsocial/features/status/components/action_bar.js index 1e9450f99ca70db9ffa30761916ffb47594412ec..f6dd17aa8a4f6d86b7cc55e51aad09c9c43f7bef 100644 GIT binary patch delta 125 zcmZ1;dNXK)1e3XIZhlr~aB5C!a!G!XLRwLNu7Y}cVp4H_a%N(VesX?pL4ICpUP-Zj zDo9~`F;wN|CZ>E9eN@f)c|oa($tAYcB^jB;dKrm%DLJWN5$BxDegJDxdr(} zB?@5Cv`U4vqWoM1_4LG~;{4>y#2o#!)Wnj~qSRu2umT9V*`Fz2WwNCPe?3@G7i^Yp zacWL#a!G!Xx*eAS5~xOTf?jT7fd*KYf~}o`28v1r1)HSOl9K#9G*JbGaz&)iE@tB<7{37Uh=~=Tru#mU!mnr51UF`1;sZS1ZKFXO!gTSiw9F vag?S)Z7tZ4$-XK|qQDSx&dE&9hRQ)@)~kqum1t^$1Sb2diEsX{mc#@Agj{l% From 21b250c6eaef291ff460209a58736c7cd5c2c0f0 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 21 May 2020 23:17:11 -0500 Subject: [PATCH 18/38] Add tests for emoji utils --- .../utils/__tests__/emoji_reacts-test.js | Bin 4293 -> 5758 bytes app/gabsocial/utils/emoji_reacts.js | Bin 1174 -> 1314 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/utils/__tests__/emoji_reacts-test.js b/app/gabsocial/utils/__tests__/emoji_reacts-test.js index 8df3cb67476d60aaafc67283088338dfca89bca6..aad46335c02764e92775939109c2558c7d67f61a 100644 GIT binary patch delta 935 zcmbVK&1w`u5JtkVIB_>25;20LRLsnn)sO@{Y>1)~55dFYod;(O-T2)%Vr@m0$JUySHVGD?Rxl zY@)j7`_ja^ZUZO`jGtemfm~?dH7;4wa zxf0M47|qm71btK>^7n=Z3uou%pe2>YfYvHk>5Fa8{(L*!VX6X?G~np~!k_`pyaStc zD2fFx+Vu6z1^Q%Po;f9auX3H9RmZ0O25-||Wtwi(ChwnwSWKT}2|OJ@+gr*`eBDQ1 zyJa`%ku^i#&W+NRHU7_Y6*8`!LIyQQF8ZaIPRK$V6(=Ad3FGw$LB5JHC^B)w*pE!W z7tj$erBR_q4?0qT?jj^v@WX@2C;1;NLr2NpYRgT7PQRljj;SM}1apr7`VlfxG_sY* zv6$}MTDA+JjMI3Tgx*=_*(jU#YZJ6xsnQ2)noYYzAFV1is~*>51T}AqjX&frg4p~s zh>{a-F52^MX}PjtMC3Z(-@JFSuC$k5&v*6EAKf**=gCde&kPX9!?CBs9~0e@3C9Q? RUn_&~ADXhQKN6J^{03SiEI Date: Thu, 21 May 2020 23:19:39 -0500 Subject: [PATCH 19/38] Add EmojiSelector popup to inline statuses (not working yet) --- app/gabsocial/components/status_action_bar.js | Bin 12680 -> 12844 bytes .../gabsocial/components/detailed-status.scss | 3 --- .../gabsocial/components/emoji-reacts.scss | 9 +++++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/gabsocial/components/status_action_bar.js b/app/gabsocial/components/status_action_bar.js index 3bd191c22298d2464bab612fb241502d15a36df1..cbb2f413ef6ad779f37f4291b147bcb36441b5d2 100644 GIT binary patch delta 155 zcmeB3UX!vRiODWAw;;c$M8P#TKPxjhH77N>B)>=@ttdZNK|MV&sW?A5GciX$IUlGh zFEy{ESU(k{FuoY7a&tVByf&l4WJ_&n2VLE?#IpR-qRf(1bvrHvIIuxAJ3lWdH8Huw cwz?!Evsf=9F)t-26)ZBjP)}rYx9(qN02sVCEC2ui delta 21 dcmZ3J(viF&iD~mI?Q?+e3$LpPC1^{802u}b2 diff --git a/app/styles/gabsocial/components/detailed-status.scss b/app/styles/gabsocial/components/detailed-status.scss index 6fe10a26ef..c6d3ac692e 100644 --- a/app/styles/gabsocial/components/detailed-status.scss +++ b/app/styles/gabsocial/components/detailed-status.scss @@ -76,9 +76,6 @@ } .detailed-status__button { - text-align: left; - padding-left: 10px; - .icon-button { display: inline-flex; align-items: center; diff --git a/app/styles/gabsocial/components/emoji-reacts.scss b/app/styles/gabsocial/components/emoji-reacts.scss index 3b989b52bc..e757de9f97 100644 --- a/app/styles/gabsocial/components/emoji-reacts.scss +++ b/app/styles/gabsocial/components/emoji-reacts.scss @@ -96,3 +96,12 @@ pointer-events: all; } } + +.status__action-bar__counter--favourite { + position: relative; + + &:hover .emoji-react-selector { + opacity: 1; + pointer-events: all; + } +} From 792ca08d036aacbd3fd9f3ea2b1795672ce31a02 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 21 May 2020 23:52:10 -0500 Subject: [PATCH 20/38] Implement getReactForStatus(), start oneEmojiPerAccount() --- .../utils/__tests__/emoji_reacts-test.js | Bin 5758 -> 5755 bytes app/gabsocial/utils/emoji_reacts.js | Bin 1314 -> 1899 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/utils/__tests__/emoji_reacts-test.js b/app/gabsocial/utils/__tests__/emoji_reacts-test.js index aad46335c02764e92775939109c2558c7d67f61a..4e3cdd6f307dc8c2591856d8f8c89f58c3727fe7 100644 GIT binary patch delta 66 zcmeyT^IK;_kKp7+K8eZZ!VZi^K$gs8W+Cgz8w9u}*Rilo_7k!NvSlZ)5GsSIg7Q^2 J?-V}D1OWc_7Nh_G delta 80 zcmeyZ^G|0(kKp9F?EI7a`M4&V2s=)0;FF!qC}cg^fKy0|^+&I`G4soK7o-WuF4t6;ZB-)O(H>Cab>pH#faEwBy?OGX=JO6>+qa(YK> zZ&gS}0w8tWgK`LkHIn;acK`>P`ZdABrbo0}n$ Date: Fri, 22 May 2020 00:08:55 -0500 Subject: [PATCH 21/38] Fix emoji component errors --- app/gabsocial/components/emoji_selector.js | Bin 673 -> 759 bytes .../components/status_interaction_bar.js | Bin 1482 -> 1489 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/components/emoji_selector.js b/app/gabsocial/components/emoji_selector.js index fabc276dd288226ad8561240ef994c7bd96bd637..e86775d4bece2d732e007eeddeed1724b259779e 100644 GIT binary patch delta 93 zcmZ3;`ki&c7q;S(#FEV9iJ$FsAuNTI)U?FXoRWZ|{DNWyTZL*a1t7@J3rbB)F0oS3 r&{VLsQ>d<;tijmFrIDJOpOvYjkf}L&H=_!Bc50<H From b4f5321c0fd4b9bec40667764aa2cd9d33c2f6e3 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 22 May 2020 14:08:38 -0500 Subject: [PATCH 22/38] Make oneEmojiPerAccount() work --- .../utils/__tests__/emoji_reacts-test.js | Bin 5755 -> 5757 bytes app/gabsocial/utils/emoji_reacts.js | Bin 1899 -> 2331 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/utils/__tests__/emoji_reacts-test.js b/app/gabsocial/utils/__tests__/emoji_reacts-test.js index 4e3cdd6f307dc8c2591856d8f8c89f58c3727fe7..54cae7e63930ab610a0af0d000069845f486d39b 100644 GIT binary patch delta 62 zcmeyZ^H*nsz0l+hj69S3`M4&B37G-eY?DLzL?^Eh@?+IeP&ZVcynsV$vVd?pl8o}^ IZNf*H0Gjp`M*si- delta 48 zcmeyX^IK7tq_M5qEl-}l&&Qk3{nzQ+vp37iLMpgR8DTb?Uc5kmn;H7T_uz6vPBaqMRGs3FtHC=dz>%n%u# z&wP6B`_?NjmJ4gfxOCDX@D+|vKubH&x%t-y@<)=ieezBY#<2yX?bbVOVehbg*_}38 z<-y228q?O2lf%}sy82Z~2p2-sD!s|sC6|g&YW@TmnLGZo0)kVqcdC=?zAL8crYdx{ zNMh+|Bs6k@Rcl79pFaBhr-ZQ6Gxhec%kHiPn*%QvUA06(v*=E~$RRvghE-^C42Mv?URq{ONotV> zmjW21D%jd7r0S)omT0KwrmAZysHwrYd5K^FMO#~iIthJu}f zfu=%HYDsBPo Date: Fri, 22 May 2020 15:42:57 -0500 Subject: [PATCH 23/38] Fix reduceEmoji() test --- .../utils/__tests__/emoji_reacts-test.js | Bin 5757 -> 7444 bytes app/gabsocial/utils/emoji_reacts.js | Bin 2331 -> 2387 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/utils/__tests__/emoji_reacts-test.js b/app/gabsocial/utils/__tests__/emoji_reacts-test.js index 54cae7e63930ab610a0af0d000069845f486d39b..e7bc0622b2a6e44c6a33be1d173c02d69e40f83f 100644 GIT binary patch literal 7444 zcmeHM!EW3(5WV{==B8a>Yg;RA(mF_iqDT%o74d-Nrx;HQ;3FC8?SB-f)JaBwO)9z~vr5i635M{QG2r zgNzlYOpRVfKk=$a1S{p=mq{vEp{Mb@p7aeXzKUaB*rJN-FXZr)iEmjHi%p}Vy5zSMEbM_XjjEiK>MxJ4h zH-XU@o`0#FX=a=!;tV3lk_+HVh|-jwvjs%?0v1WR87d>l1^_Y7O9AQ|Wqt|I*G7$A zqgV3h5pj zrg9*egqopiOyEw&Yrn44|MFk?Ye-thA<<)7&^c7OoQYaa6Vxec+Xl#XB7Qmnmx^!y z(##OIgPtWH>`O3IoKG>KGNNmG=nSu$Yx`6Bd~wCs%<+_ee*0ZN#MGrEpagNoYV2YD z22Tw<1POC8?ANN))b60kp%4&u{2?B-&ZR!!Oc9U=^(`{dCX0q@hb$VZo`(a?mg5L> zb?_{80{mKXi&?;*V!#5lLXurz947fG+~3_?V-8da&CE&Lrj((K8*ws_Z(~ItaShw1 z=wqJElbn^NpP;gAgA{?$2ml-8W-Lsg*+Zc{@W2kHj>wf<=+JEmeIQsweZ$}au&A%2 z7+zs{@v%iS(5e5VfM~Ix>64ru2gugj&AT4)~ufu^6^|<)8 zkg!xi#vOt<+d6b3h|{XXE6K8ofA}~>P?KP~bYcxWfvCRelt=LT5|YIccvC!LPFzJk zsdY?6VR>xZ%y(|~fIMBBP4J$g%=Dkiqfn1NC!;US(e#jvq)B?+)a`AP&@Iq?uzDMk z=g!D;XKpAOlIr`Gi7Q^XTu|6aYA0HAGYnwYW(^_%!6zi685unxBf`g&@G&L01O%6W z@DWHpv@HR#B_Os0#Fl{A5)fMgVoN}535hMCo1;dq7B#%J!Wt4^LgGtEd=TfELby*r@`)8b0m&zJ_|gyu5c*2ir3!ls zHY8^5W1tDn?rzw3u z-y4`0r*gK@==uMw*!`@aRaCeEwk;Z2u-P<2gimx&WdEs#AMySZJu8WgPkIgstd4CI zJx;|zta{{{gFLJ6U>jB%K3w>ATk42x)7X|*hWaGK#uLYmD63lyuwuogG9?QJbsY{4 z;8-;iyKQQHx#<>KgK8u5Tqj^UH+IE4NrJuE$8|uvRO+-539t8RpGkNhv{x|JJhpEC zb*ZI^s5c84H+Cm-s@q|WL-bIWhy$S8)m>LlyYmW&NVL|psEWMAH#H@84^jsFJjdR) zYNNp@$?=-EAZ>*)EP0{Y4yAgjM0VVWzW%CtaUba`Ms9#Ve_(}+Gee1dMYm*h-qwbQxXkn{{0?TW>c` zHjiH0Ag}4t__drnq>gI1jY`Usv8+Xbiz(IOtjgx)XVpq^88x&FBeR*0G)fd;2Mblq JXcOfI{{q$bPRjrQ delta 200 zcmbPY^;c(u5%1&+Y+RG)uy9XK;FX`8z$7}^fKy;{0WZ&F84m8rvsid1`|-(7j%QH? zizPEkOrFCoFjRPZX>5v<&xnZv W?FY&6!p-dmy6YC3(&kCxO{@T~F+0ux diff --git a/app/gabsocial/utils/emoji_reacts.js b/app/gabsocial/utils/emoji_reacts.js index 7f6fcef2de15ebbb308cf1540a71abdfe3422be2..75b0b51870b21609183b3cb443124addffc6203f 100644 GIT binary patch delta 191 zcmbO&bXjNv4;xEvs)GGwZZ=5{1uKQL#GK;P%_?kCjP*JSxv828wsr~{TnY-s`9&qJ zx%pX{8o8-O>8W6*TVh#$X;EfLYOzLs9z-Z0wa76!IlnZoL?bOTrzEuqq6eF9kf{m^ xsUS0hQWKL)ih+DhO--<^IzV^u!VGr?8Mk>cyBZ^BXn?MG$swYEgRX k<{9 From bf1f744b99344b7cd3463b0eb6a2d53822152fae Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 22 May 2020 17:02:56 -0500 Subject: [PATCH 24/38] =?UTF-8?q?Actually,=20pleroma.emoji=5Freactions=20d?= =?UTF-8?q?oesn't=20return=20accounts=20so=20I=20can't=20reduce=20them=20t?= =?UTF-8?q?o=20one=20per=20account=20=F0=9F=98=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utils/__tests__/emoji_reacts-test.js | Bin 7444 -> 5762 bytes app/gabsocial/utils/emoji_reacts.js | Bin 2387 -> 2352 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/utils/__tests__/emoji_reacts-test.js b/app/gabsocial/utils/__tests__/emoji_reacts-test.js index e7bc0622b2a6e44c6a33be1d173c02d69e40f83f..e53c241cd683f7226e75cd746d9ea80f46f4766a 100644 GIT binary patch delta 192 zcmbPY)ug+@hYg;RA(mF_iqDT%o74d-Nrx;HQ;3FC8?SB-f)JaBwO)9z~vr5i635M{QG2r zgNzlYOpRVfKk=$a1S{p=mq{vEp{Mb@p7aeXzKUaB*rJN-FXZr)iEmjHi%p}Vy5zSMEbM_XjjEiK>MxJ4h zH-XU@o`0#FX=a=!;tV3lk_+HVh|-jwvjs%?0v1WR87d>l1^_Y7O9AQ|Wqt|I*G7$A zqgV3h5pj zrg9*egqopiOyEw&Yrn44|MFk?Ye-thA<<)7&^c7OoQYaa6Vxec+Xl#XB7Qmnmx^!y z(##OIgPtWH>`O3IoKG>KGNNmG=nSu$Yx`6Bd~wCs%<+_ee*0ZN#MGrEpagNoYV2YD z22Tw<1POC8?ANN))b60kp%4&u{2?B-&ZR!!Oc9U=^(`{dCX0q@hb$VZo`(a?mg5L> zb?_{80{mKXi&?;*V!#5lLXurz947fG+~3_?V-8da&CE&Lrj((K8*ws_Z(~ItaShw1 z=wqJElbn^NpP;gAgA{?$2ml-8W-Lsg*+Zc{@W2kHj>wf<=+JEmeIQsweZ$}au&A%2 z7+zs{@v%iS(5e5VfM~Ix>64ru2gugj&AT4)~ufu^6^|<)8 zkg!xi#vOt<+d6b3h|{XXE6K8ofA}~>P?KP~bYcxWfvCRelt=LT5|YIccvC!LPFzJk zsdY?6VR>xZ%y(|~fIMBBP4J$g%=Dkiqfn1NC!;US(e#jvq)B?+)a`AP&@Iq?uzDMk z=g!D;XKpAOlIr`Gi7Q^XTu|6aYA0HAGYnwYW(^_%!6zi685unxBf`g&@G&L01O%6W z@DWHpv@HR#B_Os0#Fl{A5)fMgVoN}535hMCo1;dq7B#%J!Wt4^LgGtEd=TfELby*r@`)8b0m&zJ_|gyu5c*2ir3!ls zHY8^5W1tDn?rzw3u z-y4`0r*gK@==uMw*!`@aRaCeEwk;Z2u-P<2gimx&WdEs#AMySZJu8WgPkIgstd4CI zJx;|zta{{{gFLJ6U>jB%K3w>ATk42x)7X|*hWaGK#uLYmD63lyuwuogG9?QJbsY{4 z;8-;iyKQQHx#<>KgK8u5Tqj^UH+IE4NrJuE$8|uvRO+-539t8RpGkNhv{x|JJhpEC zb*ZI^s5c84H+Cm-s@q|WL-bIWhy$S8)m>LlyYmW&NVL|psEWMAH#H@84^jsFJjdR) zYNNp@$?=-EAZ>*)EP0{Y4yAgjM0VVWzW%CtaUba`Ms9#Ve_(}+Gee1dMYm*h-qwbQxXkn{{0?TW>c` zHjiH0Ag}4t__drnq>gI1jY`Usv8+Xbiz(IOtjgx)XVpq^88x&FBeR*0G)fd;2Mblq JXcOfI{{q$bPRjrQ diff --git a/app/gabsocial/utils/emoji_reacts.js b/app/gabsocial/utils/emoji_reacts.js index 75b0b51870b21609183b3cb443124addffc6203f..141fa79928123edfb419caa540689c2773ea4217 100644 GIT binary patch delta 36 ocmcaCv_WV?1pDMJcE!m_?4qn(3P3PfpIrvT($w61oxO$;0KCQtFaQ7m delta 112 zcmdlWbXjOa1iMjjeo={QZhls#Ms8|RdMcRdmROcwT9jFmTC9 Date: Fri, 22 May 2020 17:45:18 -0500 Subject: [PATCH 25/38] Fix getReactForStatus(), upgrade immutable.js --- .../utils/__tests__/emoji_reacts-test.js | Bin 5762 -> 5852 bytes app/gabsocial/utils/emoji_reacts.js | Bin 2352 -> 2414 bytes package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/gabsocial/utils/__tests__/emoji_reacts-test.js b/app/gabsocial/utils/__tests__/emoji_reacts-test.js index e53c241cd683f7226e75cd746d9ea80f46f4766a..639e0795c250e51b8145396a13e056ce16e14330 100644 GIT binary patch delta 273 zcmZqDy`#Iql3h|kAvr&u`Iu|D6=FrMZs2~q^LA?vN?PH_4%<`(6fJcosQa)PMrWO**J$;KSHJUU4FCpYq|Pd?5eFnPWp|KwflT$A5( zh(k3BOturyn5@snGx-*q@Z@aH0xSkj#xx9JGt2-{k#H`nL>Y9>!(QsB-_RgVSf z%PCHsyq8Imol5}>CSPN+)P}P4ic?EG^E9G!GP6@X^HNePbQIKK+ThmlF^6-&IGZz= zpE7eHES~Joo`CAO_3T#SMX4pFMR^KEsVSw&sjj*CS(zFj3n%|!x2x9yTU}g|SW;T7 zm!4Xpp$<2#I6gVQG_OQm6OWn{bxoiFntExOIVGt@8mS7lb_%HwbAS%l1W76=0A-7c hOEf%lb4yDSlX6mh6ALt;Qi2e*d5Iv^)?BsLTmVjib0z=) delta 305 zcmaDSv_WXYHO9%07_(Tp6o6oIJ-gWCWTwo?63jxA4Vf(`Ph$>a&M8ja{Dt``GgEHr z30ic1tybMvz@gHjWdONte2CokZz6SD>ygDwY@n#(F%uc=^br%(;H zCNoVzBQZHyQ=ureq_ikc0muevR8Rm(B$pQHrKgr?sOP4t1NGS2DwGtJroz?2rSlR& z3LyGW&8gK Date: Fri, 22 May 2020 18:44:24 -0500 Subject: [PATCH 26/38] Set Like button icon to chosen emoji --- app/gabsocial/actions/emoji_reacts.js | Bin 3624 -> 3745 bytes app/gabsocial/components/icon_button.js | Bin 3181 -> 3629 bytes .../features/status/components/action_bar.js | Bin 10585 -> 10740 bytes .../components/status_interaction_bar.js | Bin 1489 -> 1593 bytes app/gabsocial/features/status/index.js | Bin 16775 -> 16873 bytes .../utils/__tests__/emoji_reacts-test.js | Bin 5852 -> 6419 bytes app/gabsocial/utils/emoji_reacts.js | Bin 2414 -> 2403 bytes 7 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/actions/emoji_reacts.js b/app/gabsocial/actions/emoji_reacts.js index 0b61d1eb4f6b36b222d6a2b81fc6f504da925016..3443165d22a9a1285a114a272298f5ddcdbecfc9 100644 GIT binary patch delta 185 zcmZ1>vru-!JSM&5{Ji24g}i+K0tH(I4NV1GJ1Ci#TCNaKl%JbfoT`xq5>C_5)SNt< zsZvBCC9}97u_QS|1EdWoYR$zp`6P?%WKB+?$!^U3Y(=RhrA2w0uQ0D;#ICrIO?>hk aRyml$ovf#DC@kQRoIIZ$u5b@~4jTXmI6A`s delta 50 zcmV-20L}lQ9jF|zo&u8u3Lum30#*Y%3JR0H1Raxh1EI4X1g!y++yywZ8wSY%ll2EW Ivo;882C^3r*8l(j diff --git a/app/gabsocial/components/icon_button.js b/app/gabsocial/components/icon_button.js index ceb2a643ca104f099321ab4d1cb7ef015e99d4e7..c0561bf9e7b1f6dbc90a8f74e168f396b7235e39 100644 GIT binary patch delta 380 zcmaDWu~ufnFXPPIg8ZTqh1A^qtjx4Zg|wplTm|*?#H8Z<9JJ<5p$`1%lP&Qto(`T40Dwe#s#{`4e|F0M0^zeEq7;MnyT=BE~id-OlFaR_yvn}>rb)~IcP9y} diff --git a/app/gabsocial/features/status/index.js b/app/gabsocial/features/status/index.js index ae648d4ce960e486c0e8ee79063db3adfc4b82ce..ee631e812c71d6a9ee5e97ebbbbd084f26d038ab 100644 GIT binary patch delta 245 zcmZo~W_;PqxM7DFPe4(AZf0?+USdv;#$AKXnZY@ wB+Ztx#GK3&0(MP)%_%auhu3&=H?Pd(WJc-9eZ1_G_#-F35Y-aHv>)UK0FA&>`Tzg` delta 12 TcmbPibVql?4KbElO=~UyA~FPA diff --git a/app/gabsocial/utils/emoji_reacts.js b/app/gabsocial/utils/emoji_reacts.js index e9712e6ca5cae79c945407db8338fb074bdec576..bbdaaf4747aa5f824238854b66a6aed19594089e 100644 GIT binary patch delta 47 zcmaDS^jK(v4X3(-t*xy>Nl|I4CYJ&b=%uHYc;;zD8|Wyg=OyN*s>f Date: Fri, 22 May 2020 20:16:26 -0500 Subject: [PATCH 27/38] Refactor handleEmojiReactClick() --- app/gabsocial/features/status/index.js | Bin 16873 -> 17219 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/features/status/index.js b/app/gabsocial/features/status/index.js index ee631e812c71d6a9ee5e97ebbbbd084f26d038ab..9861cee3b55c83dacdcdfe3a2a03db86dbbe973a 100644 GIT binary patch delta 440 zcmZ{gy-LJD6opBrsRY+#6o0NwGJ{K4D~lzIzJUtDY9WMV)*abQB$?Sp77M{nQ11g+ z+6p%I`Z9J}*qcm3*v2XEz2}_o%-5~;ac8~0J2>22!lSj7PMpa?0Z+3_am=Gw6%Yb` zI^F%gZA1CQ2&maY7>3|~KR@34;CWD}Na-TD;EMXAXqxFVBQa4tryRlo@Y*WnJ~K%w*SyMU<}zwG#(@QKrlq0`2GHxbq*X{ukO(|; zw|5z9sx)ASd6tTT2hn6gjS%Lc$_f5B2iS8v7U0m`JLxt@|23{C6H#16DjriU+s~l2 vfH9+Iff{p3OW?BXwT&;Xx7ezlRtc_eEF+Meg_${@F+3*@P6>H?AgAmPAi;-N delta 158 zcmX@y#`vg6UDXr$)mXJrPZCMK6C z*xGR^C`|q!B{P{tLSphU2@wuWpa2L=R+JQ(Y%HlXd8Zuj Date: Fri, 22 May 2020 21:15:07 -0500 Subject: [PATCH 28/38] Refactor simpleEmojiReact, allow inline reactions --- app/gabsocial/actions/emoji_reacts.js | Bin 3745 -> 4688 bytes app/gabsocial/components/status_action_bar.js | Bin 12844 -> 13606 bytes .../features/status/components/action_bar.js | Bin 10740 -> 10765 bytes .../components/status_interaction_bar.js | Bin 1593 -> 1554 bytes app/gabsocial/features/status/index.js | Bin 17219 -> 16443 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/actions/emoji_reacts.js b/app/gabsocial/actions/emoji_reacts.js index 3443165d22a9a1285a114a272298f5ddcdbecfc9..9f36e8a21cf0c023006fbad8418ae9cbf50cb8ef 100644 GIT binary patch delta 791 zcmZuvy-wUf5LQm%5GE206$ohx#O@|10}T!Gbrf`n7NNxQ&4rEZ-DAC`L2!MfNT7WH z#3KNYLBkvH2&AS-X4l5&M7Z+K&VKX#%B>lp1E^GcfD0HK zT>y(WrLt(!%u21wyKiT`FB$zadK*GAHF6Ne7^(%2|PoWYKtQD)hsfx=P!d zfFR;bSITk$L)hAlV6EZrr@Zlkkt`>v%}%(xoL_aH`b*OTGC`IYr+LnUX6O=XDgZ6B zj`>8fJ-x$K%pMo%r1r6iZP*g|;F+vUL%qhRbqOH`&HGty|C;T+X!X2jc6cvhdxDCS zEoA9=1Nnchb3Rz%PCqWscC(Y2Uj?A`#Joh`~2Vc>c?jRqu W&M~I4rdW-k4REIm+Yc|j`^CR@J^oq% delta 26 icmcbhvQTzH@?-%D++v4ILH_=-dUAsPe?QWVf;Z!g|pd#&|u8s~KU z07ck_jz~xphyv-vN6>&o%TMqL?5-Wo23&b(^xnLA^FEC~9DaVkG-Fx8g@g(YsC+^( zk@vZHDzQ{$0D_Jcp*tBrWH5z^;2EF;ykBy{a2hGe(lVm9`$AY`i8lLx=t}dK)>udT z9|8kmt32;=%ukm_7q%Q^J7wf0#Nb9iJc6nZ<`YyZkpo>+0EnTnOJp>F(y4zlxby&k zO~A{j-ykhoCaeq#!HY5+v$DXFB;Mazy_zDZC;R&3>OiBl^<{vmQ!t%>Up>93)r~Jb zrPqgnzB263oXT1^SGhF0TlRSl2aUGSc>OTjgcK7_C!A%6MZh`Bu%z9Z3BwVMt1Zq` zigRvrCT~>N*?eE)3HxL-JyipR;*!K7-OS|t zJavV{yv*Fhl2nDnDc3fa* hfr)C6sX!Z2C(9XGaKJd56O7(7P7dG^pIl_J1puJhOmhGL diff --git a/app/gabsocial/features/status/components/action_bar.js b/app/gabsocial/features/status/components/action_bar.js index d1f9fa3331c74d0c55c0a0fb67d65b224ebaff24..a1690fed14b024efb6691e7b045ced5e0f29792e 100644 GIT binary patch delta 55 zcmewo+#9mtsJf_Aetu4BVxC5Bs%vh3R%TFYVseS*s%vh3R%TFYVsgpkTk6X;Ptd4k1OUW&45$ml1E~Tai*wi MLZmh?XPU$e01-_Q-v9sr delta 142 zcmbQlvy*4TO-2zNh1^tyS_NB$l8nq^y@I0rf@15*^Oz(jb1>=1T5~A?L2`axafw1& zVp)D^QD#YMv2%WDUWtP3Trq_ikcp(r(_G&$8ZH$N*=BNapj Ur6wkq6ziZH0e%hzT} zvcty3x)*^1k#I#E**8?2GJJ_<0p;P;MIAt9Zpbx>AF>Etk#4aF>hs5dO%oi)0rdOw zyhPA$gREQi9Zp5e8OVXP|6ry^3M-TdFI3w$cH3h=5R_vIP7kOSfYFp9Vn_v#sisWp z%*{H6f!L!kW&#uF!ErYerI!#$6?lFjnz>>$!7-EH)n=k5ZJw!1`VqC=AixF=o6^z> zK&COX(}>Ofwx}j+@YJ0pKA9kf8tVC(rhdkPlMFf=5)$I%+Jul!O1cgUqp>>=W9|#; zDbKX~1FLmp=7=pOlwswL+IW{jw}nRJd#fy$R!y?Tp8RYTa#a3QTYVk!!r&IlY2zW~ ne3MOw8V1x>x0s&ZB@uWIH}Bc From 68d40dc8adcbf117fba0c6f509259a916d412bd6 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 22 May 2020 21:34:07 -0500 Subject: [PATCH 29/38] Improve position of inline status emoji picker --- app/styles/gabsocial/components/emoji-reacts.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/styles/gabsocial/components/emoji-reacts.scss b/app/styles/gabsocial/components/emoji-reacts.scss index e757de9f97..5e1cac50c9 100644 --- a/app/styles/gabsocial/components/emoji-reacts.scss +++ b/app/styles/gabsocial/components/emoji-reacts.scss @@ -65,6 +65,7 @@ opacity: 0; pointer-events: none; transition: 0.1s; + z-index: 999; &__emoji { display: block; @@ -105,3 +106,7 @@ pointer-events: all; } } + +.status .emoji-react-selector { + left: -20px; +} From 4c9326b673a9784ade55cd40b0218eb430e108e5 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 22 May 2020 23:29:30 -0500 Subject: [PATCH 30/38] Try customizing the emoji list --- app/gabsocial/utils/emoji_reacts.js | Bin 2403 -> 2427 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/utils/emoji_reacts.js b/app/gabsocial/utils/emoji_reacts.js index bbdaaf4747aa5f824238854b66a6aed19594089e..16d2a0d2d16b4ccf45ae1b724033c35ca4421f6f 100644 GIT binary patch delta 61 zcmaDX^jl~`fh3o{zJjNES*k*EX>mz@Ze~?#ib6?7YOdbILTAx+>N;Es3hE!`&sYR! Kt=xEW76$;F4HlOG delta 37 mcmew@^jK&@0i*uJPG`~e>N;Es3hE!`&sYR!E!_BU76$+cL=K?< From 7db74c7080a0325945d489df1d14185958e43921 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sat, 23 May 2020 00:04:25 -0500 Subject: [PATCH 31/38] =?UTF-8?q?=F0=9F=98=82=20-->=20=F0=9F=98=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/gabsocial/utils/emoji_reacts.js | Bin 2427 -> 2427 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/utils/emoji_reacts.js b/app/gabsocial/utils/emoji_reacts.js index 16d2a0d2d16b4ccf45ae1b724033c35ca4421f6f..9ac9bb6e35f5868d5f8d493087d6e1d25d1021bb 100644 GIT binary patch delta 12 Ucmew@^jm1cA;z|ihj(xQ04e Date: Sat, 23 May 2020 11:54:26 -0500 Subject: [PATCH 32/38] Make ALLOWED_EMOJI slightly configurable to let tests pass --- .../utils/__tests__/emoji_reacts-test.js | Bin 6419 -> 6536 bytes app/gabsocial/utils/emoji_reacts.js | Bin 2427 -> 2498 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/utils/__tests__/emoji_reacts-test.js b/app/gabsocial/utils/__tests__/emoji_reacts-test.js index e1a09ea943de94cbac55ef6216284fb809d1dc04..b1b2c7bfc47fdf901a18fc59b3567d82fda92fc4 100644 GIT binary patch delta 141 zcmbPi)L}efTS#(#UU7+nqmPe&xT{ONtFOP8r-H3QG?#*c`iJ=wd)0M7tVeT~Ko}q9 r&uD_P*27tg;H-r}R_w;jHcb3FsD^HS&vcy!U2yVyCiTs4`PDc9E=w;G delta 37 tcmeA$o@_K>+h$%yOQy*$S=A?RV3wY&ASk(c19J_}WCKq1%}D}koB;U73*G<# diff --git a/app/gabsocial/utils/emoji_reacts.js b/app/gabsocial/utils/emoji_reacts.js index 9ac9bb6e35f5868d5f8d493087d6e1d25d1021bb..4e378ecedf8e722ec9bb3daa6dd5fe661724036b 100644 GIT binary patch delta 123 zcmew@bVzuE8@r}PYHog3W>9Kka!Ij{LSjx%etBw&D@e@N(Z|O>+|?!C)z{z4Q*&}4 dyFL%H{N!HtJQ;jiCjVwH;zL!iIhTWv5dd?;Dt7k{99;)8~bENM)}Fj?9#lBK0f~8t}gMezW!dGlUK3lO*Y{u+PsB>j}ZVN{tYDn From c29d779bf59ac28d7de3a6a0f997c42fd6bb38c2 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sat, 23 May 2020 12:18:13 -0500 Subject: [PATCH 33/38] Fix EmojiSelector position on mobile --- app/styles/gabsocial/components.scss | 1 - .../gabsocial/components/detailed-status.scss | 7 ++++++- .../gabsocial/components/emoji-reacts.scss | 17 ++++++++++++++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/app/styles/gabsocial/components.scss b/app/styles/gabsocial/components.scss index dda4f4e4ad..ddf707a9a1 100644 --- a/app/styles/gabsocial/components.scss +++ b/app/styles/gabsocial/components.scss @@ -2713,7 +2713,6 @@ a.status-card.compact:hover { .detailed-status__button { flex: 1 1 auto; text-align: center; - position: relative; } .column-settings__outer { diff --git a/app/styles/gabsocial/components/detailed-status.scss b/app/styles/gabsocial/components/detailed-status.scss index c6d3ac692e..9009a82026 100644 --- a/app/styles/gabsocial/components/detailed-status.scss +++ b/app/styles/gabsocial/components/detailed-status.scss @@ -57,7 +57,6 @@ border-bottom: 1px solid lighten($ui-base-color, 8%); display: flex; flex-direction: row; - padding: 10px 0; } .detailed-status__link { @@ -76,6 +75,8 @@ } .detailed-status__button { + padding: 10px 0; + .icon-button { display: inline-flex; align-items: center; @@ -87,3 +88,7 @@ } } } + +.detailed-status__wrapper { + position: relative; +} diff --git a/app/styles/gabsocial/components/emoji-reacts.scss b/app/styles/gabsocial/components/emoji-reacts.scss index 5e1cac50c9..8738a07821 100644 --- a/app/styles/gabsocial/components/emoji-reacts.scss +++ b/app/styles/gabsocial/components/emoji-reacts.scss @@ -56,7 +56,6 @@ .emoji-react-selector { position: absolute; - bottom: 100%; display: flex; background-color: #fff; padding: 5px 8px; @@ -105,8 +104,24 @@ opacity: 1; pointer-events: all; } + + @media(max-width: 455px) { + position: static; + } +} + +.detailed-status__wrapper .emoji-react-selector { + bottom: 40px; + right: 10px; } .status .emoji-react-selector { + bottom: 100%; left: -20px; + + @media(max-width: 455px) { + bottom: 31px; + right: 10px; + left: auto; + } } From 8b505c0488b51ae83351918d02cf4c9ca7bce90c Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sat, 23 May 2020 17:02:14 -0500 Subject: [PATCH 34/38] Set EmojiSelector visibility from props --- app/gabsocial/components/emoji_selector.js | Bin 759 -> 914 bytes app/gabsocial/components/icon_button.js | Bin 3629 -> 3652 bytes app/gabsocial/components/status_action_bar.js | Bin 13606 -> 14038 bytes .../features/status/components/action_bar.js | Bin 10765 -> 11718 bytes .../gabsocial/components/emoji-reacts.scss | 17 +++++------------ 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/app/gabsocial/components/emoji_selector.js b/app/gabsocial/components/emoji_selector.js index e86775d4bece2d732e007eeddeed1724b259779e..fcaccdbed01f72911358e1231a5df00fd6b40560 100644 GIT binary patch delta 164 zcmey)I*EP4W~I#Bg8ZTqh2)&X;$pwV+|*))w4(f61$D4M9!Ox~hGt0xg|f`z%%q%D zD}{if{DP3mg4ANYr2PDx$@+{|0!XrHi8;lolT#VhIdx!KCigI!@Khr#(3pIHQH(`L cp;`gR5Ea+eg&M7H1=FEWt697G8lxg307m*bg#Z8m delta 32 ocmbQl{+)Hg=7~2NCYLgrP2SI_Joz=F$>dv1qKxXB3z-xd0q0i?9smFU diff --git a/app/gabsocial/components/icon_button.js b/app/gabsocial/components/icon_button.js index c0561bf9e7b1f6dbc90a8f74e168f396b7235e39..1b681c378ec95cac1584fb9009dc6b2a87113aa8 100644 GIT binary patch delta 32 ncmZ20b3|r?CX29wLVliePG)kpm4b$*f~}oGb?s(V77i`|q5%l$ delta 12 TcmX>ivsPw)V0OLn{~1-GY%e%8rskQkwNqX~~&2`7yY(L^L3c0$#|Y zjgeNAZNlRxj}DIn6LSE%&Z;NOd{>S=eSl9ZB5PjSA(o!OvuvFz()+;gQRexRGYMP> zpv-@8NIOA3A2$l$1S%_piRgH$NfTcWp}!rshAGSo<3jJ&)~m!LQv}q&*fEy)|Q<_2K-^b;pf2agViHEA94dkAG?X21I8* A=Kufz delta 56 zcmV-80LTBvTa8q(&JD5-KLWGi5!(inq!~f878 Date: Sat, 23 May 2020 19:35:14 -0500 Subject: [PATCH 35/38] Click to open EmojiSelector on mobile (DetailedStatus) --- .../features/status/components/action_bar.js | Bin 11718 -> 11963 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/features/status/components/action_bar.js b/app/gabsocial/features/status/components/action_bar.js index 7b44b5e22415eccb627d68ecab59b89dba04d123..e2e25ad1517cf1823de8f66ac0bae2fca6533b72 100644 GIT binary patch delta 171 zcmX>Wy*qZpG{MP>rPO6hGBS(x3X1XziuH<15=%;pH5F=V6x2V=pV+HzJ$a&_lz26l z0vKebDQJLIgVd$!P5vk;!lS7GlT}cdtgNHNq^U7^wv5!|R7o|JlA_X7g<4H(sP Date: Sat, 23 May 2020 19:50:03 -0500 Subject: [PATCH 36/38] Handle mobile emoji clicks (regular Status), use setRef --- app/gabsocial/components/status_action_bar.js | Bin 14038 -> 14781 bytes .../features/status/components/action_bar.js | Bin 11963 -> 11994 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/components/status_action_bar.js b/app/gabsocial/components/status_action_bar.js index 4957bcdb01f5e8ea05b2d2d22cf53eb610f136a6..04c78eba34159ec9663389fab12fd19a4842a624 100644 GIT binary patch delta 577 zcmZ{gPfHs?7{(FpB@}U!#_BDVp5Vt z@LGB(b1n1>^dJU$DT<%M&(WTG@Y31cC`ITThJojO=l49%b$p@DzB)Txb>sn$5Sri- zXtrR;1(QQR4mIs{knzxSrHDR)q6wmaP%!Y~aP)l0neJ`F=2pEwA}%QwP&LeN=aKpD zRI0oS-V@#9%D-iJgqTa`{eKnLw91dojZ<2D6>)lGEm>PF7@I3nGv}4^K1?Ry{`&Ui zv)d?vJsILY0mixXkEnF0(Z^UG@;!`@YMH#{iXTKs?uG$O8a!Pg9w~kXNC6{-vjOwd zsXxewsS!)7<}_HFBj%>EI(=7eR!JHf+Za7pxsJ{p22(OcE?VYx5&~InY{)y!Uj5$nqxGZI1ISMab!&7vs6< Ij{xTX0x&wX%>V!Z delta 67 zcmdm6d@Xmw9Kp#S1(he8YN<^Q5HbeRMw3qqac}k#u@~K3qLs_FS;w@Haq>eGvB}aR X;@k=~H45q<=1=TZ*W5hOOotf&S$7x0 diff --git a/app/gabsocial/features/status/components/action_bar.js b/app/gabsocial/features/status/components/action_bar.js index e2e25ad1517cf1823de8f66ac0bae2fca6533b72..cb7c8371129c0ab85214d4fb35e657ff118f802b 100644 GIT binary patch delta 99 zcmdlTdn`MSBDw$o delta 54 zcmcZ=yE}Hn56Q_&Qhrj3Df!8zxv6<2dWEH_MU}y+IjPAd`9&J)dXufRl^HcRw@Z}? KZkE(J$OHgUD-*>4 From 29bcc4a0d1128a5b1db455fef22f21e092f79fa5 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sat, 23 May 2020 20:01:16 -0500 Subject: [PATCH 37/38] Rearrange Like button events to prevent clashing --- app/gabsocial/components/icon_button.js | Bin 3652 -> 3976 bytes app/gabsocial/components/status_action_bar.js | Bin 14781 -> 14837 bytes .../features/status/components/action_bar.js | Bin 11994 -> 11996 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/components/icon_button.js b/app/gabsocial/components/icon_button.js index 1b681c378ec95cac1584fb9009dc6b2a87113aa8..2c12626ce72a002db109a277a43db18729110fed 100644 GIT binary patch delta 305 zcmX>i(;>e>f=Mqw&o{rcIMp?;B(=y&A)qL~Af&P&wOB8$G%s0)O92R=DtuBC%ThNp zG1)O`!Ns7uG&B`#?G&nOv8Xp=iNk(R|UIEaeVie13!Ipt6gc}dG5}O8y gTlR89GRKf?Hj$=-oHKbphsNZm9CDk3cs?-#01^Rdq5uE@ delta 39 vcmeB>KO(b1f@yOMlLph~JuICplcRX$CRg#wOrF8Zv-vG2JM-o!UOgrN0kI4m diff --git a/app/gabsocial/components/status_action_bar.js b/app/gabsocial/components/status_action_bar.js index 04c78eba34159ec9663389fab12fd19a4842a624..a271d6634f483eb09e241a06c44c136821be8cf7 100644 GIT binary patch delta 34 qcmdm6{Iz(4iRk1b!WxtJ3-N3=65S}jS;(}Taq>eG!_9Ne6qo@5YYk=q delta 26 icmexbytjCRiRk7m(e?6^mzn8rmNe~V+JBj@FdgyhPW65dfaV3XA{% From e04ab557ac840a6f2c87c993a1f95ab5e2970568 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sat, 23 May 2020 20:29:25 -0500 Subject: [PATCH 38/38] Make emoji reacts more responsive --- app/gabsocial/reducers/statuses.js | Bin 2271 -> 2626 bytes .../utils/__tests__/emoji_reacts-test.js | Bin 6536 -> 7412 bytes app/gabsocial/utils/emoji_reacts.js | Bin 2498 -> 2928 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/reducers/statuses.js b/app/gabsocial/reducers/statuses.js index 885cc221cd4d29ddb5dabffa4c207f276efa5e90..d41fc383499d5f7fb2c265cc95f7de98f58384f1 100644 GIT binary patch delta 294 zcmcaFct~WzCowJs1y^5xFVFZOS4Za%AQ>3y8XPjwUz9sFH$N*gz9=;@xn$zA-42<# z1^GoK3e^h5nYpDoi6yD7Ao(DWv_h>yT2X$kf_i#lQgMEAW@3(hX-Q^Iu|AR!#hd3b zerHm{VwV-r2?`3y`FX`93I&NJ849)vljB&VJqmJCfrcik>nNxrnUe`rrygsKqz5bs zc1JN#YjFwCX?p3YC7yX2Ak#FhC)=?~7=xHPSe&kbq+3S;=og^*dSEfl&D|^^EC3cM BXF>n~ delta 20 ccmX>ka$j)5r^zOa>o==0ePP=CgVl=#0Adyhj{pDw diff --git a/app/gabsocial/utils/__tests__/emoji_reacts-test.js b/app/gabsocial/utils/__tests__/emoji_reacts-test.js index b1b2c7bfc47fdf901a18fc59b3567d82fda92fc4..fcce0a11be0ae055b26d58c36295fa37a15359fe 100644 GIT binary patch delta 360 zcmeA${$e?yTtq>kI5W32C$S{eH8(#iGblANxnyIhu;k=-%se(2GU_@C8k!2Wb_&&8 z3JRGe8tREDDa8sU8L0}XAl(Wj`Cv{?W^u{niQ=M@eONRm-xcPZtj?hYrl)htOl}kA zSH-kb18e};`eGdg^+$7;s82TFl$xB$!VNQl$yjId1U~V}cX)X0V>LCcfljCel2Df< z7o`F{f$W&fG@ug|QZiHWV$@3%5_5nGQYsZvD+oAFjiBQ`%%8Cy!*x*q$xWUEbnya4 O{>gU*#3z@E@B;v3I(gLq delta 10 Rcmexj*DD_t&CY2-wL5hdyIRwwp6L|!a*!ozQ z-TcfqGb!7T&b@4{0y>{kWssy&8)z=FV{B+C(gWX6oER{K^j3NRFCwrxE&(cxZwuDw zUfq#Kdop29#)5j*#aIQ*teNi+^6eRO49Ahj>wr&#?fVGr!z>ax98hF3C4UUswpoMQ zwXQdh1gSlRZl8Nenn^SLqFxjI*>3D(JgA(4rZ6g_m(HW&)|@PUQ~r1X_v5Oh#{KF% H$Y;S5anf!i delta 7 Ocmew$c1U=`Ax;1e&I4Bf