From 5f9d95301cc8340a67e9bcc0a4e7d5ae00b5b4f9 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Jun 2021 13:59:10 -0500 Subject: [PATCH 1/8] ScheduledStatuses: scaffolding --- app/soapbox/actions/scheduled_statuses.js | Bin 0 -> 2526 bytes .../features/scheduled_statuses/index.js | Bin 0 -> 2513 bytes app/soapbox/features/ui/index.js | Bin 25518 -> 25664 bytes .../features/ui/util/async-components.js | Bin 7166 -> 7305 bytes app/soapbox/reducers/scheduled_statuses.js | Bin 0 -> 1254 bytes app/soapbox/reducers/status_lists.js | Bin 3976 -> 4785 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/soapbox/actions/scheduled_statuses.js create mode 100644 app/soapbox/features/scheduled_statuses/index.js create mode 100644 app/soapbox/reducers/scheduled_statuses.js diff --git a/app/soapbox/actions/scheduled_statuses.js b/app/soapbox/actions/scheduled_statuses.js new file mode 100644 index 0000000000000000000000000000000000000000..4e54846b865d19977cfe5579799859491cb1b3a0 GIT binary patch literal 2526 zcmcgtU2EGg6n)RHxNnvrIP|q48zFIMA&jj`U@%HBw%mxhvM0%-Bh7!GBwMP})nDsa z2q=-S&OP_)+++G!K~y!m88o=jkzGa&)5Zo>6` z8?Fy{x7_VV{W53(&-y@j@s~lvQM=2pQD4=cmMoSuXOI#ZA8~vnNtuxZ%Se`j2;{?Q z0>FtZIRlhXQA8?ksx_r!h!2YoCIo<{fb2H%1NHNkp>LirP=|~PDZD9o!sa+sPl(y2 zVw*<^We?uHU**&nS>>H81_0-YSu6$gHsL$+qa;Ei-&g9^$CS_=D?oij^h> z&{GC3cqhCDucyt-!!4;p=^Pe*XIemF9E$CSlGrKqWY*XdYvSwWOqfncaSuqI*1b zRC%Wkzpu6VVfNXzZLiBiLoc0e$u$e+wF$n6eJ7f}s)C7 zLXV8o2dY&0OjQPq|ARB^xNb7|Rmir~ni6lmn2e#*oN8{mm-JmIc?Lz)IQp!ozUCx* zUFu$aU@Cx&6X4(EsW!@bJT>SthYfI~x~lh8jbJyFxHM)Q`qGu0Tp6ZGTz*_66C9I= z1W&F^yc7e~LG-+$Q*a|lscLK^!PR5Stw#}x3s{#!0#MVEF#f!S0T|gr>UNResF|7Y zvTwA<9i68MAk3D+m?h(CE?#!VL?4A=jlv$x3>1ocu;txEJEFGEkUvvg^YZW187!hI z%^ z$koFLZ@n~^?Kw!R#FgjG}LIoFxINwU4|u=M7_DS&js=+_czW_NS?vZuU}_)AewM1j67gmC8n%I7E*aN zmDx{rg8=wjSaycQG>3mjGKlt&;Urdcc=m%PZ(`#B>=?dp1jk)0LORP{Fto?>M_YW1 z!c$Se-PQBKNRe8nCl`O~_65!QJjJWOL=QypRAaOMQz-cfrVHgKM2()P&f(9RayX%X zNeJMJhhu5@!kWgQ^9A}2Z?L5KE7;uo#wFFgLu-tv~p=zwN6L4rTT4FPiTg*53Q9nAhDB^R7+50iHhebz&`sg+q6Y?9=*+VfuJx zw>tlgo{Hh~1j+Prt$!NAmd4L}wWeVE> diff --git a/app/soapbox/features/ui/util/async-components.js b/app/soapbox/features/ui/util/async-components.js index dc06d16777e94f29ba7a731b78dc7ac968e9627a..c3c5dc9d7e409d4d205308a886f8f310cffeccfd 100644 GIT binary patch delta 59 zcmexo-f6kvpY&vNaUr(kjMS9UoXKZ7?AVK;Y<^BL2`D=?CBC>Mv81#(wOC!#nyZ!z E0HpL4MF0Q* delta 7 OcmeCQ{Aa%5pELju6$8Nl diff --git a/app/soapbox/reducers/scheduled_statuses.js b/app/soapbox/reducers/scheduled_statuses.js new file mode 100644 index 0000000000000000000000000000000000000000..9441406aab2d31905876b2205cb53e2ffeee5e60 GIT binary patch literal 1254 zcmd5*!D{0$5WVLsW>2vpn4Vi)C{(aslD0JNUP1|~J>CdxC0G)>rR3i`Bgu)=6x!qF z5_v{?dh_0s>UP`S!W%5)4y1vi>ztJ@EzkQB_|KUX@@v1u%%Jr>XEId}z_F61pTgleAbQ9NM9{y=ZWct>D&mqv;=`TJ zpvjtTFJ!fe7jbJ$csO$4J7Q8}ix$rYWAZ&V*rToj8+ao=$I{_SD)D{XjeJR;G3uZd zZCqVE&tUaTIsoih4Mw!C*KyErEKxP}_D8X_vP!nh5ea*2UBV#v&wE>ABVB8uak^rq zqB&>+0XnHhKr@hjSL&G?l9=QRrOdwWFw`q)5SHal`LtXYi--Hi^3u;4S)Yg;BM~uT zGI-Jvi1-p_pgZu(0uXud0c!myev6y=2_H`(`w$lj{J|fHQ&TvPp;7gC1AuBE`4L3R z{!pID4#@KyoF<8t#ySn+u;Kjc->AC5hFK^xw;;c$M4_5XK_S@L!__6!XREIW*y$S29IgCv*8Czf?FsfbX-EstOW-Ljio9#g|DPK2q6d^VU0_H$_?nSxb;+T=8TB>-x1Urqo3 delta 16 Xcmdm}+9AKehIz9Six$u1ejz0QFD?Y~ From 1f5580ce6606fffafc5f42bbae0d9546fde1fd2c Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Jun 2021 14:17:37 -0500 Subject: [PATCH 2/8] Separate status creation from composer --- app/soapbox/actions/compose.js | Bin 16551 -> 16518 bytes app/soapbox/actions/statuses.js | Bin 7774 -> 8509 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/actions/compose.js b/app/soapbox/actions/compose.js index 6c30574367e3dfaabfd6fd391e6514608d7dbd74..3939c42fd8937d464fa65c4fff0611137de0d753 100644 GIT binary patch delta 263 zcmZ49$k^7%xPg&bBQv)kzoqj z-l>%ewv!bl71UA0)MGWRxwsU-0HUWLu_!UOSiyGlcL`0VD7a)wW^qAcNpgk;vgOGS0GzI6CIA2c diff --git a/app/soapbox/actions/statuses.js b/app/soapbox/actions/statuses.js index f06aefa39c33484ca80be640811fe0705931609a..a9123cd64571025a4fb94f77fefd04183bd6a39c 100644 GIT binary patch delta 568 zcmca-v)5@uDWj}&kgH>eYkZJvV5n1BeH4HI&5Q#~5|b5}*e7pi<=x!Gn8q^sj--Hca#3nxNosIOVo7PSMnPgx zVs5dHLS{;8Zb5!YYF=`scWUM2`CQudDVfCui6zMy8r2FVl?AC*3P`R)I9o>nyAcYt zn$}!gAU74ImXsFdDI^wTYNV%@fb31x)GNp@F40ie2MX$!8R{2<9g|wDjxen{6s%c6 zAtN<0CAFy7N}*ao-4o$TU7$17tlEKnLsVNs MePg}(9&3XH0N&fTzyJUM delta 17 Ycmdn%bkAl(DdT2crec=O$2rO*07DiAsQ>@~ From 600146f2be6fba7d8453b00b0c670ee5e7a171a1 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Jun 2021 14:46:47 -0500 Subject: [PATCH 3/8] Composer: refactor submitCompose code --- app/soapbox/actions/compose.js | Bin 16518 -> 16606 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/actions/compose.js b/app/soapbox/actions/compose.js index 3939c42fd8937d464fa65c4fff0611137de0d753..8c0f1d3c44bdba61a7687a64be92d2a626014705 100644 GIT binary patch delta 574 zcmZXRJ#Q015QY^5&B2La65r?AV~UF{Stx+zNI{N-M1eqjG(d$;$K5#D=zMqV?uDF? zi%5trLS%jf4MijhN;-Z35-klC4K$P>IC~Q)*z%qCoq1;V#oof_y@kV%)|EKVq=F1F zk=Ieif)|R{5{y8qNFj_i;F$rSZ4*p*1oUg@)18h@?^*xM+||3diK@Fo(6XGB-c{po zU@MZhxs*KHgb}T`28*x(tMj@*Rf-Jih-dtB(W^^MVr`SYTZ`s67jX>$<0zF#yYPrU z4VTWR-wv6o~+aFp-WF3pI$lxLt-Ym;ybA2Z_bh_i=3w@LWR3ZtE;YedWTE? zn5SG-T6^j?%zApwqe4{`NBMWIb*jkIRC|87%chLCFey_^!sw{mnrEGy);~fIyu0+; kQ}pHRGF|o?C#DA7^smvr-=XJrlRo$j`Wmpetj#-r09hl$&Hw-a delta 508 zcmZuu%}N4M7^OlBQ#7p{of-XxN-~O|q98Ygix$xji7g@!e{OYSnmajnLY9haGH zVhb|3mT*lT*+!95W&ks`SShb(?7|u4X?A8Zi%cis!UKT2@(fnx_&7k385RdxB4W;o zQLJr}8eVG}Hf0Il!g&+ zcT}5dcnF}L@;Fhx)E%6URq!E}bPLddUSjL$i%;O5h;RVIlgX4oom21J>dwn Date: Sun, 27 Jun 2021 14:58:40 -0500 Subject: [PATCH 4/8] ScheduledStatuses: import into reducer --- app/soapbox/reducers/index.js | Bin 3398 -> 3475 bytes app/soapbox/reducers/scheduled_statuses.js | Bin 1254 -> 804 bytes app/soapbox/reducers/status_lists.js | Bin 4785 -> 4891 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/reducers/index.js b/app/soapbox/reducers/index.js index 48ddd77b85971d4f22d57cb63c814731d7b1a9e6..751a04afbb2e0e089df7d3355473ad256a7ddba3 100644 GIT binary patch delta 91 zcmX>mHCcLtH-|}PZb5!gi9&I5MrulFPHIYgaYn??LRwLNu7bLrKBm-W503Xt OA_`bEZ8qf=WC8#;Od;z4 delta 17 YcmbO%eN1YDH^=5CjyFu3Te$g|06lgF5C8xG diff --git a/app/soapbox/reducers/scheduled_statuses.js b/app/soapbox/reducers/scheduled_statuses.js index 9441406aab2d31905876b2205cb53e2ffeee5e60..e2ab142e4c44c6f8492e48bc9ce08a5fb1406e0c 100644 GIT binary patch delta 248 zcmaFHxrD7gGq)hWs6?S!AvnY_Bs4hQImp#9#5F!R)Y;iJI9Q=pA+0DsS3$ivKd~Sw zzd}DTxg;|`uUNmhB(bElIJH>anhV_oPu~Flpb#CXfv&;v5COPRdU|kEGIKdWwx<>W zjhT>SQq85HkeQ~Sp$IWuuQ)j)HKjBsH6=c=L{p(CwWPEtPXQ#CY7JBg;ZICdXRMvr eHhJ2vpn4Vi)C{(aslD0JNUP1|~J>CdxC0G)>rR3i`Bgu)=6x!qF z5_v{?dh_0s>UP`S!W%5)4y1vi>ztJ@EzkQB_|KUX@@v1u%%Jr>XEId}z_F61pTgleAbQ9NM9{y=ZWct>D&mqv;=`TJ zpvjtTFJ!fe7jbJ$csO$4J7Q8}ix$rYWAZ&V*rToj8+ao=$I{_SD)D{XjeJR;G3uZd zZCqVE&tUaTIsoih4Mw!C*KyErEKxP}_D8X_vP!nh5ea*2UBV#v&wE>ABVB8uak^rq zqB&>+0XnHhKr@hjSL&G?l9=QRrOdwWFw`q)5SHal`LtXYi--Hi^3u;4S)Yg;BM~uT zGI-Jvi1-p_pgZu(0uXud0c!myev6y=2_H`(`w$lj{J|fHQ&TvPp;7gC1AuBE`4L3R z{!pID4#@KyoF<8t#ySn+u;Kjc^6lLUD3NYD#HNYD#=@Nn%N9@#I35h|O)R+PnbinhdW1 delta 12 TcmbQOwo!FM8|&r|tlGQ)A|eE{ From 97f89acff9446f22f979a73eed5342fa6f385857 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Jun 2021 17:04:23 -0500 Subject: [PATCH 5/8] ScheduledStatuses: ability to view and cancel scheduled statuses --- app/soapbox/actions/scheduled_statuses.js | Bin 2526 -> 3168 bytes .../features/scheduled_statuses/builder.js | Bin 0 -> 1316 bytes .../components/scheduled_status.js | Bin 0 -> 3877 bytes .../components/scheduled_status_action_bar.js | Bin 0 -> 1583 bytes .../features/scheduled_statuses/index.js | Bin 2513 -> 2298 bytes app/soapbox/reducers/scheduled_statuses.js | Bin 804 -> 1183 bytes app/soapbox/reducers/status_lists.js | Bin 4891 -> 5132 bytes app/styles/components/detailed-status.scss | 3 +++ 8 files changed, 3 insertions(+) create mode 100644 app/soapbox/features/scheduled_statuses/builder.js create mode 100644 app/soapbox/features/scheduled_statuses/components/scheduled_status.js create mode 100644 app/soapbox/features/scheduled_statuses/components/scheduled_status_action_bar.js diff --git a/app/soapbox/actions/scheduled_statuses.js b/app/soapbox/actions/scheduled_statuses.js index 4e54846b865d19977cfe5579799859491cb1b3a0..5d5b493f1b23c1f2e9622cc962363cd136136a92 100644 GIT binary patch delta 355 zcmca7{6J!Z7Sm)cMltqyXGcG0SD%S~GBD=kJVp&Tdp;vveBv<;eyHkrH%Ct&1qFr4 zfs7)&$YSb~FR}_xzQ7_j`8TW1=2E7Yj1tL-dC93c!O0n^DWy57DZwR)C8fn0nJJV1 zuxfLqWEK}BmLz9rR8Q_>5jTPv733Ni>KYuPqmY@RP^)Rp1++>bu^>|;J+%a+KUGsN zB{e6tBvm6}vK+INp1w+TW=d^>rd~-#YMzEhwL(f_Ng`0Af~}oGHCVHP0;)~YFq?uy zot<5SgF!awK($SN&#c7=c8?ZJ709~~C8 delta 17 YcmaDLaZh-I7Sm=qW)r5(57-)50Xr=P?f?J) diff --git a/app/soapbox/features/scheduled_statuses/builder.js b/app/soapbox/features/scheduled_statuses/builder.js new file mode 100644 index 0000000000000000000000000000000000000000..fd0772fe39856b7ac13e004b947792d55d5380a8 GIT binary patch literal 1316 zcmbVMyN=s15bXUGTLh2|7^l=aC_t(JX|D_d9VM-Gd*(wRDZ>}T|DL5O>UF8oS+ldV zJ44c>dSgA@;AD;Z`2zRH56DQV!HZgA_PnFS(Z(tv=?}hm;RiR7oe_O)uDNJD8SV1e zfHt2R>{3RFGyXvTy=ly#{U;TN5*u%<!BV=b+d<-3 zIY9XhZaaY3)6IiQSWn&`ctGMQgc2T#Pu#N46lPpb)m~VkTwtt+MQ*Gv`C{}|!aP6i zt8h6tjN~Xwn6ion_rU_dD0GY;eJ`mIA>;z|AZ3JWW6nz0Gqwesgmf6;Mpy=B8t36r z`vT&+adnSZpB=^qiyUZMi4AA+%$3ANW!}jZ@auQ%J&B7MEOGm4hY5Do=Q4EhNf`u=QQ~3Y=Y=X>n&uYT<_d7l0+@m(sau`BhqbDBD#$?1V^|<9co9OE^L1p z)dZ*6t~VsnR^f6KkY(}6yyzAdV{JYQKKue+^C`J1UTk#vm)itx5BmNZr3cGN{BQGx s9MvSrf2?iIc=UCT&(5MBtRDaG9&d7RhbI@_{CLZ8V)Av_!|mQlcPI*`$L0dxtMQ z?KYPJL12>~XTEulSzd}t!52zW1&2!H5LEheaJ69es)1A#1;y)j2nZ{h)vrU?@1n|y zQZ)O6N=csS1kVb^d-#2x*NW^peW)vXD^OKIixGp6c}Q3yCQLo37xJixs^zUHRR2~A zQtriT)WKyW4J<)3G_HT%z`kZYvr;;?n@wbnY1JcBPNe)yaw?q*%t4_Kde9fjiDEDG ziQ%y#dFikx7*!6MD39&MH1LTP-`4P%yyy=dFB6uq61AdLn2CJ&;+d*DkrP&QXs@(Z zjLV3msi+GzAbayd6sgWLB<8-?amQrI$(#1U`A3-rCE79l(;KBodd$)FpP2L^_WTB6 z!rXDVgd?yQ@E|zXK}P%NoU%KYQHd}UWP|IUKc+`aRZd-?Z&JlX@oQ)NCXybIxJ<$P zM@X_KIt3P(H%L1trA`$3BpxbJN{C^p(R2-^{=S0v8kz;@VnK8#QopG++JHA0sQY61 zSJ2%%m6%6P&_)Amd7ph5--5oH63^&? z)Lg+wWT?w|Ik9N9Fi8!M-W!fOeZ{KDB%G<(W?@(s8LgHp$J6?taeUVxkK+5&5feCD zgG(p^ zg-Nz&oT)eMl{GXlm4OYv93W6^Xe>lt{Eop~fHVj;l5$!#)|ZES~4ikp9eo&U;vWq{spg#Vu#) zH|LQfo^kq{xijZ2RD#nuC@U(lQ{o^IMF7$Jbg<$e28p3d0txv6qJ$@pwb71}%T!E) z0ko4V)Z=I-2u00DTQ|78Y+I%&7CA;aAqvw74mCC}dWR=dOHgLy_+8r?wxsp{#@FG+ zMVIUTc2*wF0$+<`f7w@CGe)%+c9Evdag1Ouu!Y+0Mrr8vAU~ErgRIin(`kWl6$b$* zrZ7_e{oFDwV;gCub2i%u>-)N$ntaYI?1%@(PljaLC!8bP+@5PjPQ!%QMIVO^zzn59 zo5PO^8ykAZo7=a}bJ$ZlQLEcDobYkFc#W7VlKqWN{psiSoI|^G>0@L+S)a~R<$pH! zR3W(qC^QSuDSvE-d(?lqWK#V$ugcrC#MnH%NZ;eLG$QM|XO5<|S@jlhd4LjCek_!I&d#FMd^&*k?wsrg}$xTd#;X zqAo6AJ6qoTd>Z@Nxe4xKBGnTm9Y$F)9_#JUHI+PjAOeZp58ieuzoeP{hHuw zV7srC!j+|){kSo>PJo+?{<)*OJITUa;7=$EK0S-<6q@JkcJ{LlhoMul(T+%z+3W&v z3#R+^7YC1ci8EEJpG`8|AuXG+MhxaCn%l`X+Ar_cOrIRsob6AXxN#p^X#9pbX(^LZ P8GRjmG3z(d!4>)+_TAG7 literal 0 HcmV?d00001 diff --git a/app/soapbox/features/scheduled_statuses/components/scheduled_status_action_bar.js b/app/soapbox/features/scheduled_statuses/components/scheduled_status_action_bar.js new file mode 100644 index 0000000000000000000000000000000000000000..509f0152043d7e523dc96f6019124355a8792d21 GIT binary patch literal 1583 zcmbVM%Wm5+5WMRv_9hvy<+~jPX>#(RMG@z2(9$|)OOYx`wJrqxdzTa`*>Z9z5Evmj z`V5PBYFB5E6*R5qof#0=i-u^ad zZqPhFuNr!{?tO}#hd9V;hS@9D9MxqGHN*9~wOp8WI2~Mq!z{s$Xgs&pDj6D!p`{|C z5~Ve3PME{dgQo5}sPM!kenn&0JDMeM`GfS>Nh@ZWaJrfTCrMh3FR{vJvJhr9wlXCl z`I#(H?8`F=F0k5LW?M5Bjx5MCt|UniaR=jpUgv~(84Gn_0L6?_)+G??Y@h>PZ6NiD zs9wmE4{fAN7s^^;gB*l>@eQWXFOz<;O=28jr*^q1hp4{T@xp2Bcu^=-K&$X1B>+rdfcKTKDzc-nx~EkeIY zo+clYQZQp+Ch`}r=`+)S7mKno@QI~eLJc~4ymZ@Q2|lbq5h!TYTGSgD$2V6;H$#Eg z6zwMWHgvFYb5%M*a^jqG^NPP(PTS~m0nMfr_jT@IHEv)(Td8~$nlhc4tOO3$z6f6a zB%?<2Xjr^`ohRMWN>to5%$8@G%L43~o7^!m&Px~{vkyl(8yF4)z^inz@FUPWO*N^G zI$H!8V^v4;u97bm1}F0efQO3z2Jh`RR%4M4r4EN-TUJM=)5ie)92`Cf6Of?O*JKQL zOf9zpi_Z0z)5z5Ja_tlYhLw5_13m literal 0 HcmV?d00001 diff --git a/app/soapbox/features/scheduled_statuses/index.js b/app/soapbox/features/scheduled_statuses/index.js index ace5684bda30488e9dad65f7fa6c381d4b8da7fd..0d293e7e0356858701bc61f90f623373c8e4a4be 100644 GIT binary patch delta 318 zcmca8{7Y~{2BTqeQGQNNVp2}3PiAq6LRwLNu7Y}TequpVeuaK=er`d2UTR)Rv3@aJ z-Q<48Vx!>XjMS9UoYa)ylEjkIVyHenR2@(y@x>rDo4+%zVw!xCC315zt34wJSes`` z@#L#)`kPhQWf;xi7JwYWr2q#Io4r#jZPklmwnB_7PAyiS9LZ@o`8kKeAv1Fg`@O)SvJOi{44Q?NmIcQ(-2>dcf{1(<3GPv1_n7H*b}elUvLCU4|a0053K BZ`uF= delta 493 zcmZWmJxjze7^a7w^)`{)QxUt=7I6`ePU=uNMf9A#UXruLG;e8=K}z@AGdcMO9EAQ7 zS10`&PS%#5m4*!AeV#lY$@k9t?ptKoGL%Y8VG>s1>=k^-k(3QyDw{cMOb z7`zOu2oxiCDG4RL#ThVmimo$AXHO{=?ox5Azc%I*3``|FAYD+%Eanf+2vsXlOvYz5 zsY_V^uyV3_VI22t9MmKUh;UFV?{tOqYUqvAm~%>yk1VStO-AMG&^Cf~)jGj%3WQ`9 z;>V_kpIgo4qJytJ{d|2a^yk*t%I5+{lqg2YeFIT(xSzMC#av&R2l~X^y8%9hkX%AW w{ai+|aHEhDM%&>(yI$?ew>K;Fws~YPVoqjo4p=4CM^))NZ~CX{=?@eA01&dRlK=n! diff --git a/app/soapbox/reducers/scheduled_statuses.js b/app/soapbox/reducers/scheduled_statuses.js index e2ab142e4c44c6f8492e48bc9ce08a5fb1406e0c..2e304a8eb2dfb2af9801bba2f7930e2ba496991f 100644 GIT binary patch delta 351 zcmZ3&HlK5XS2mY|La?)kt4pYlt4n-vh+{}-uxoIf<`fr zm8zqVnWCv+Yo`F_=|R+JWTq@W&&Vj7oLHQS)4`K#m=q^JVUnxIstV1?RzP3jRR?u9 oNS%U0QEEwPQJw;_gJG^sOfJdH&(i}s+8U@dB{eN^G8?lT06@HJ^Z)<= delta 22 ecmbQwxrA+k*Tz@U;W+C=?XGcG0SD(r8%rbDc0JH37T^3f?i414CVdLnikLO2YLi@QY5Kz%Mn~RY*oQGex1MMjT(M&ZrHEW)glw{etD{?92l*_u;wvmO^W=j2zyN&xh#3^xD( diff --git a/app/styles/components/detailed-status.scss b/app/styles/components/detailed-status.scss index 5bf63db280..4cbaad0edc 100644 --- a/app/styles/components/detailed-status.scss +++ b/app/styles/components/detailed-status.scss @@ -73,7 +73,10 @@ .detailed-status__button { padding: 10px 0; +} +.status__button, +.detailed-status__button { .icon-button { display: inline-flex; align-items: center; From 4a5ef6f469b0554bcbdb09899489e78668509fbd Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Jun 2021 17:15:57 -0500 Subject: [PATCH 6/8] ScheduledStatuses: display link in Composer --- .../compose/components/compose_form.js | Bin 12358 -> 13121 bytes .../containers/compose_form_container.js | Bin 2214 -> 2276 bytes app/soapbox/features/ui/index.js | Bin 25664 -> 25816 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/compose/components/compose_form.js b/app/soapbox/features/compose/components/compose_form.js index c08b7aa24d43ce044bf326bfe34491695f1e0fb1..2c48a921fffe23d901f7b83dec5977734f8be800 100644 GIT binary patch delta 793 zcmaKp%}T>S6oqLO7uA&%7b*_rZ)MY_ZJHEkIp>@^-#zp5`0ak}HBMr<@uM*$;BpoM;Ye-S=S)fDeTRivv+>^8 z@4+?WA(axHTNHwhF#Bl!Zk_w#6XO!@DUbYURE*Fx-DXoE!bl4Jd9G!2=lJlT2g3Hy zQ2{!4l1e28OhxkbrG1pW!RK}wZ<4`+3+Qyo$jhFNrqxZib5;qlUmwAm#RP()tKagDe&k7SKGpJ2*h^a+vA~!921ZX z1R_WeLyff39Ho3FG*BqaIEGc|YORQc+nD{LWG2z;O0oMDO vLsnZF;i&G~vGD`>+!vy1tA)=dGStLCs bKk+t{Mps{~p{c2(U}<2WX}x)_&th=^|9m5r delta 29 jcmca{lJUR^#toBLHs598@nBT|g4)UTzIvN8ee=ZuwJ{3V From a17945d5cef16475ec36f7c9d43829c97fba6310 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Jun 2021 18:54:48 -0500 Subject: [PATCH 7/8] Date picker style improvements --- app/styles/application.scss | 1 + app/styles/components/compose-form.scss | 10 -- app/styles/components/datepicker.scss | 123 ++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 10 deletions(-) create mode 100644 app/styles/components/datepicker.scss diff --git a/app/styles/application.scss b/app/styles/application.scss index 457a4faf4e..a8cf79ba9d 100644 --- a/app/styles/application.scss +++ b/app/styles/application.scss @@ -82,6 +82,7 @@ @import 'components/admin'; @import 'components/backups'; @import 'components/crypto-donate'; +@import 'components/datepicker'; // Holiday @import 'holiday/halloween'; diff --git a/app/styles/components/compose-form.scss b/app/styles/components/compose-form.scss index 3a9f97b75a..e6a14d07e6 100644 --- a/app/styles/components/compose-form.scss +++ b/app/styles/components/compose-form.scss @@ -377,16 +377,6 @@ } } // end .compose-form -.react-datepicker-wrapper { - margin-left: 10px; - background: var(--background-color); - border: 2px solid var(--brand-color); -} - -.react-datepicker-popper { - background: var(--background-color) !important; -} - .upload-area { align-items: center; background: rgba($base-overlay-background, 0.8); diff --git a/app/styles/components/datepicker.scss b/app/styles/components/datepicker.scss new file mode 100644 index 0000000000..b06a313a97 --- /dev/null +++ b/app/styles/components/datepicker.scss @@ -0,0 +1,123 @@ +.ui .react-datepicker { + box-shadow: 0 0 6px 0 rgb(0 0 0 / 30%); + font-size: 12px; + border: 0; + border-radius: 10px; + background-color: var(--foreground-color); + color: var(--primary-text-color); + + &-wrapper { + margin-left: 10px; + background: var(--foreground-color); + border: 2px solid var(--brand-color); + } + + &__current-month, + &-time__header, + &-year-header { + font-size: 14px; + color: var(--primary-text-color); + } + + &__day--keyboard-selected, + &__month-text--keyboard-selected, + &__quarter-text--keyboard-selected, + &__year-text--keyboard-selected { + background-color: var(--brand-color); + color: white !important; + } + + &__day, + &__day-name, + &__time-name { + width: 22px; + line-height: 21px; + color: var(--primary-text-color); + } + + &__day, + &__month-text, + &__quarter-text, + &__year-text { + transition: 0.2s; + + &:hover { + background-color: var(--background-color); + color: var(--primary-text-color) !important; + } + + &--disabled { + color: hsla(var(--primary-text-color_hsl), 0.4); + } + + &--selected { + background-color: var(--brand-color); + color: white; + } + } + + &__day-names { + padding-top: 8px; + } + + &__time { + background-color: var(--foreground-color); + } + + &__header { + background-color: var(--background-color); + border: 0; + border-top-left-radius: 10px; + padding: 8px 0 14px; + } + + &__triangle::before, + &__triangle::after { + border-bottom-color: var(--background-color) !important; + } + + &__navigation-icon::before, + &__year-read-view--down-arrow, + &__month-read-view--down-arrow, + &__month-year-read-view--down-arrow { + border-color: hsla(var(--primary-text-color_hsl), 0.4); + transition: 0.2s; + } + + &__navigation-icon:hover::before { + border-color: var(--primary-text-color--faint); + } + + &__time-list-item { + display: flex !important; + align-items: center !important; + transition: 0.2s !important; + + &:hover { + background-color: var(--background-color) !important; + color: var(--primary-text-color) !important; + } + + &--disabled { + color: hsla(var(--primary-text-color_hsl), 0.4) !important; + } + + &--selected { + background-color: var(--brand-color) !important; + color: white; + } + } + + &__header:not(.react-datepicker__header--has-time-select) { + border-top-left-radius: 0; + border-top-right-radius: 10px; + } + + &__month { + margin: 8px 14px 16px; + } + + &__time-container { + border-color: var(--background-color); + } +} From 2e9ac8770eeb6545a45b836c2be733b111115185 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Jun 2021 18:56:04 -0500 Subject: [PATCH 8/8] Fix status_lists tests --- .../reducers/__tests__/status_lists-test.js | Bin 625 -> 751 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/reducers/__tests__/status_lists-test.js b/app/soapbox/reducers/__tests__/status_lists-test.js index 27f6ffde17f681879447340c27167a9858990db1..f24bc4d3950807b908d473aa7457329196c4a444 100644 GIT binary patch delta 46 xcmey!@}6}=5|faELUD3NYD#HNYD#=@Nn%N9@nk{99R6BOO=~U%g<2p9!T^0A4o(07 delta 11 ScmaFQ`jKTr64T@dO#A>JKm>vS