From fdc1a051d3ee1f19f53570d3de474d232d7c58ec Mon Sep 17 00:00:00 2001 From: Curtis ROck Date: Mon, 14 Sep 2020 22:07:33 -0500 Subject: [PATCH 01/43] Rough out import follows page and actions --- app/soapbox/actions/import_follows.js | Bin 0 -> 615 bytes app/soapbox/components/sidebar_menu.js | Bin 9422 -> 9786 bytes .../features/compose/components/action_bar.js | Bin 4277 -> 4464 bytes app/soapbox/features/import_follows/index.js | Bin 0 -> 15197 bytes app/soapbox/features/ui/index.js | Bin 22270 -> 22405 bytes .../features/ui/util/async-components.js | Bin 6295 -> 6422 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/soapbox/actions/import_follows.js create mode 100644 app/soapbox/features/import_follows/index.js diff --git a/app/soapbox/actions/import_follows.js b/app/soapbox/actions/import_follows.js new file mode 100644 index 0000000000000000000000000000000000000000..7d794dfd07e701140eeacf21c5ca0e85903a9e72 GIT binary patch literal 615 zcmb7BU2B6d6n*zs+&3eLzE?UJMWNtuYg+aw!NxYACM36Pqxj#K_|X;CwJc8wC+Fjy zD_SKr0#gENEnD!TD7Ftj@jU)HK$Ywa!usX4*lf$J$n)ZzmYei#m(ndP!M}}IfqQ(q zTdh(`Z}2DN0Y7_Q=U~roe}`P9uTNctLUtgAK{MGj^1~3tG;2)&XAeMgJn0U|UKqu& zI)-rINRc5AVEHtB0hmE@2K-Wd@mC>zkXXr!sI8J*)CK?`QqmytUCps-xNV)q^^mI^ zL;4|1`DO+lc}Fxi%I<>ygmOlYf=zvfVE0&y!@`a`%0zpH4CcIGZ&BsOCtPc(|7YS# P4`C!;E4nWF#Ou9p0O!5Z literal 0 HcmV?d00001 diff --git a/app/soapbox/components/sidebar_menu.js b/app/soapbox/components/sidebar_menu.js index 6cc615c6534cbf65270b5533d23bda7c4246f153..f81bc298f6aca073c2984412e670b4c1b4a729d8 100644 GIT binary patch delta 111 zcmX@-xyxt61vcKy+=Bd~lK8azoSgjf$%ZVF>`;-(dzq#AJi)RG5ZU6*C)wu8OpaAF sXM?DjoG7i&nVg@STbh?yQaRaCA{MS$Rz!ZXfV}wRY!S=N^Of}(0bG43g8%>k delta 29 lcmdnxbIx&lP2#d|t$8@_$jG&9bVpi~ziV3jF{8 diff --git a/app/soapbox/features/compose/components/action_bar.js b/app/soapbox/features/compose/components/action_bar.js index 8bc6ef4c4737cb237f4e2867f9b85ab21a220cab..32e8562d7234e26467f81c74e04440bd857bbb76 100644 GIT binary patch delta 106 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 AJ^%m! literal 0 HcmV?d00001 diff --git a/app/soapbox/features/ui/index.js b/app/soapbox/features/ui/index.js index 3f37ffe4040f81340548c369424d432bab3b5f13..f7c00a44228dc2a28d8aa168e21e56eea5821cd7 100644 GIT binary patch delta 78 zcmeyjma%m`t}-HC%@BD V`?)8KM9H delta 12 TcmbPcG~IB6quAyHVqr`GAQJ?6 From 1b8afd22486fbdd07c031009556ed700ebb77c3a Mon Sep 17 00:00:00 2001 From: crockwave Date: Thu, 17 Sep 2020 17:33:18 -0500 Subject: [PATCH 02/43] Convert newline delimited data to space delimited data --- app/soapbox/actions/import_follows.js | Bin 615 -> 725 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/actions/import_follows.js b/app/soapbox/actions/import_follows.js index 7d794dfd07e701140eeacf21c5ca0e85903a9e72..c2b256e4c9174513966880614f23cbbcd443815d 100644 GIT binary patch delta 128 zcmaFPa+P($&G@v^yyTM1{5*y7jLeeM;DW^DRE>hfqQu-{O@(SM1%>4Nyy6mtwEUc$ z{PJQ2TLp-mUQud64oInfOrCzaj)J;^x~4Tybx~?bX;B_bxiweq#A^qIFioC3m+=$; D?SU@w delta 21 dcmcc0`kZCL&B@k```8K+ixP8-Cv!8M0sv)|2(SPE From 3c26d4ed73ce5b97cddececf4aa0e50c307b5abe Mon Sep 17 00:00:00 2001 From: crockwave Date: Fri, 18 Sep 2020 18:23:58 -0500 Subject: [PATCH 03/43] Refined import follows. Breaks on Save event --- app/soapbox/features/forms/index.js | Bin 8600 -> 8742 bytes app/soapbox/features/import_follows/index.js | Bin 15197 -> 3578 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/forms/index.js b/app/soapbox/features/forms/index.js index e6e29681899de0f47a772f8b6780d563d7e418b4..090914ef831c69f8e8446dc74e5611af7fc05108 100644 GIT binary patch delta 39 rcmbQ?yv$|848_Uc6eO9QgTp3AD!75^`3iE}ddbCQ>ajXpwbon!8+8nl delta 7 OcmZ4HGQ)Yp3`GD9jsq_M diff --git a/app/soapbox/features/import_follows/index.js b/app/soapbox/features/import_follows/index.js index 1ca095ed5f1ac1d944ae70e608d4393ee6747611..c16d60c7b095af6da21657a0f86d7fbe83981fc8 100644 GIT binary patch delta 626 zcmZ8eJ#W)c6qOr3j2)*@E4QRcl?z6-t)@00wL?p)N<|rvI+b=PqSYgQi7gpFEARC~ zs>;a3P;@62Cd41eA1D(nAZ8E({saRH_$v`&csfs4_nvd^x!;a{*U#%E*M*n$uedDj zRysjQH+{x99c*sz;xEa-aAE^zOK;^fdreW2R@{?sr6c%EzM&>KuD_A(NqQ2qfdG&8 z$YCg8_)(sga9O#DucoSaq0}c_7r*4-R_CyyLRwi;O?;v>FjnR3&|_i9j``~7;|TU( z+p>qP@}7h*v=#iI%^QiXPa-d*J8{T}2W_zE5sicm?R7X+020=R<%Let2jB%fCZg+G z!PC@TCl|;E96<(sDx6-jIDd5ev28oTr;%m-!vwgfHL<3ZQ?K94Szx1*mMNqeWST9_ zPQ3wSZk%|K;r%=gtLTC={HguG_mz9Nq_>98^&JU6*DmAn>`Ez3U0Trb+_;Ksb2EBw z`Jf2J$q`@Qt*ONtCb;YP&X~bZjVp4|W@Z%gjRyH|+z%qb3leUQ&a_22CwCH!OS$(tTl HSGT0U=&Hlr literal 15197 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 AJ^%m! From 241c83233ad4401ad4ab46ebb4419f4f65a0de67 Mon Sep 17 00:00:00 2001 From: crockwave Date: Sat, 19 Sep 2020 16:22:14 -0500 Subject: [PATCH 04/43] Debugged import follows. Handles 2 column CSVs with header. Need to change synchronous get to asynchronous get --- app/soapbox/actions/import_follows.js | Bin 725 -> 896 bytes app/soapbox/features/import_follows/index.js | Bin 3578 -> 2995 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/actions/import_follows.js b/app/soapbox/actions/import_follows.js index c2b256e4c9174513966880614f23cbbcd443815d..71d6bfb70ede5f51f7aeaa3bebcfbfc3bd41056f 100644 GIT binary patch delta 316 zcmY+Au};H442IQ82q~;Qz(3JMirR{?Q8rK+U_l+&=&3kOMYtSi9~7aeJOWZS9*Lb7 z=#!938VS7F{{8v4e~vzmKli&e$%PUX8YOvz_W*cN7M7kJu^@$}SKQrPUx}F8t{6s1 zqdF+Yr6C=T=9i0649|#>se&m=fXM{QHd*3HJrYB5>gT|3dX?L9r%T6wa7_9k)UGI+ zB~5vgA?!D?C~=H5O>sV*c3!;?aaQ-(u_ZR8W?Ilzyv?d*w-QfHf+`4TYf3A~oL)&i eADj*)ukQz6Xa4vuiVe#Q|6UUxnpJ%={Qd>_s%HZL delta 130 zcmZo*zsfq{QFwVqW=U#rL1J>MMnPgxVs5dfLN%9yLUMjyafw1&eojt)d9i}60z^)) zD77F5q*Om9Pd{BpL0v&z(;BF{D7B=tC=aIGnyc1&@+C$k7Lak1zcJ1d!n9=aHl|Ym D)E6$8 diff --git a/app/soapbox/features/import_follows/index.js b/app/soapbox/features/import_follows/index.js index c16d60c7b095af6da21657a0f86d7fbe83981fc8..e270727cba974b77837c576f45db041dffe9f56c 100644 GIT binary patch delta 61 zcmV-D0K)(J8?zUX8?hcu0+Vh6B$Jf_Aq9OYI|>Su!2&6>`2t`8lOhFS4Rds1bY(7P TZ)|LDcXP9j1vUY*CJ598b)^(n delta 451 zcmYjN!AiqG5T!ADX%!C&f<-%`NFtKxr9w-+coT$zD540i&8CU0*|0m&LJ9tW2O(eK zQS&oG|HPBKX=y#p?z}hey_s_3xB1ar@_qPfURb6Uk+oOVcWbAi|GC?(*G>Q1a#z_X z6%rv}A~RX?I)LvNHL~`m1Wg~ss53(k;Yo?)n({d4 z0LqM2HiiwkwgVV4>{Cgfl@@ed=uO4Ij4OmOgo1PNsvy@mMzQh~Qe<5{2_P9}GFgy1 z5Ux+@9*XlzEvG#I^5Vp1jk%HImY;UJwyPsVGzmDnO1Yqc@n5|)< z2NmWam0HLPW6spw(Y@<>7_r1zBsT{ Date: Sat, 19 Sep 2020 18:32:43 -0500 Subject: [PATCH 05/43] Removed use of media upload API, by implementing FileReader --- app/soapbox/actions/import_follows.js | Bin 896 -> 721 bytes app/soapbox/features/import_follows/index.js | Bin 2995 -> 2893 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/actions/import_follows.js b/app/soapbox/actions/import_follows.js index 71d6bfb70ede5f51f7aeaa3bebcfbfc3bd41056f..ebae398279d77ef5919449828fb17a24a665bb59 100644 GIT binary patch delta 124 zcmZo*zsNd4$}lsxAit2+jGJe6pPooKD{JLd`e*zN z_m9k%qTB84?9A-0H(oa12Jh3aRbpr%SwV1va->B0T1gtfvj^~?N+|K(APdAm_y|`Q z=cgk2vIG4fs#!f_RA?lBcyc@&hR|q)kf@w7hycc8n77Rw?$j+ZNQ(X5N`Rkek(LD& zhX2Sh(zQ<}&ufz!&Jyr{oLH0?hB%JlU^3~lHaWzU^c$x{)&()na4Aj9s?}~OjcVjo oo`*|qx11eUQoHYb?lw1fm1iu6|34D;!^*CmJ^SHq+cWp|8@;J&Jpcdz diff --git a/app/soapbox/features/import_follows/index.js b/app/soapbox/features/import_follows/index.js index e270727cba974b77837c576f45db041dffe9f56c..c612a2cb0f23936181faa2a06823d39b28792613 100644 GIT binary patch delta 395 zcmZXPzfQw25Qh~t>ChcIK+#P!5yh|}feJz(q^=0TfEcXiXd@ZNvM+!@5f9;)U_{Ey z19V{I4VV~t0vtCj10MY6{ONb!Ro#!(xA&m>3ATgFaV`z%VobS?mClt(;JE{CnL^>B zbl@vA%?vZd31Qek03tKA53&$q;Gwc+OS{(U*{jxlP};q4)DcLaxaN1pZnV3b^DE;@ zp-kg`9nl}aUp%WTiG2!tkw@)o__c)z3=f;OUK-p^D9OnnBd#Y%Ort3T*_~)*-P}PcJQcK-t0#7+{mm%>1&fN1HdFlpF<}Flpyp4=KredGGyRKK54oFK>+#nhKsNC?FRJ$H5f|D25WkjHl3(9E&-B z7+_yf&g3Aq=<2m`+|U!}up9Cu;R|^V*BKW#kAg@~s*JLzukV~<39uokm`YC=mh{$V z{SH9cF^eQ>%vney7y-J+NlsiCT|i+Vfa;!M%oJ7x75{=25lVMxWrkKK#wpgMAU5+K!3N6^mB8kTPH(*03vSXXgu|M z>+;Mur6>rn!p4!21x$ICPRtgqX;6V47J{$<^+KAEULQ1TADDKwO4-ERdIe;4UDs1F wVaUv0*_2!5YznGJADdr95V7r9u9s(tYZBXv>{q&;UsZvuh66>pTDCu%zY5%}@Bjb+ From bdd6b608a6ba81cf7a87b1b22ff89c8f3a5ace20 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sat, 26 Sep 2020 22:46:55 -0500 Subject: [PATCH 06/43] Chats: increase pane height 265-->350px --- app/styles/chats.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/chats.scss b/app/styles/chats.scss index e6fc5d6018..605ab0048f 100644 --- a/app/styles/chats.scss +++ b/app/styles/chats.scss @@ -5,7 +5,7 @@ bottom: 0; right: 20px; width: 265px; - height: 265px; + height: 350px; max-height: calc(100vh - 70px); display: flex; flex-direction: column; From 2d29d69f50cb8bc6f32333d01e8ca3879f05378a Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Sep 2020 11:18:25 -0500 Subject: [PATCH 07/43] ImportData: rename some stuff --- .../{import_follows.js => import_data.js} | Bin 721 -> 735 bytes app/soapbox/components/sidebar_menu.js | Bin 9786 -> 9777 bytes .../features/compose/components/action_bar.js | Bin 4464 -> 4452 bytes .../{import_follows => import_data}/index.js | Bin 2893 -> 2784 bytes app/soapbox/features/ui/index.js | Bin 22405 -> 22399 bytes .../features/ui/util/async-components.js | Bin 6422 -> 6416 bytes 6 files changed, 0 insertions(+), 0 deletions(-) rename app/soapbox/actions/{import_follows.js => import_data.js} (90%) rename app/soapbox/features/{import_follows => import_data}/index.js (77%) diff --git a/app/soapbox/actions/import_follows.js b/app/soapbox/actions/import_data.js similarity index 90% rename from app/soapbox/actions/import_follows.js rename to app/soapbox/actions/import_data.js index ebae398279d77ef5919449828fb17a24a665bb59..e80ffa2d2bb32073682036f5b4fd48c182a89024 100644 GIT binary patch delta 43 ycmcb}dY^RzFO$4meojt)d1_IyLS}A3eo;wkib8Q|a&l^Maaw6kPUU1drp*9kvJiy; delta 29 kcmcc5dXaSlFOy(!X>xLEadBE{jzVT`L4HxmWF4l>0H93@+5i9m diff --git a/app/soapbox/components/sidebar_menu.js b/app/soapbox/components/sidebar_menu.js index f81bc298f6aca073c2984412e670b4c1b4a729d8..ea9f753d4f09cb597f16ec92258fcc888afc29fa 100644 GIT binary patch delta 110 zcmdnxv(ab6bvBli#FE6x4_PF*Gjj{_i%R0b{6=OGZci{@0mR>|#(q|M@<(NR?wtJ6 v6y4H-oczR;$sgrnQ8kH3OfHafo%~tp!sNN4?32%n7)|~!DzsTvRhAI|R8=Zu delta 104 zcmdn!v&(10bvCxN{G6Qp^2vrQlI)qe1^GoK@ssy5OY?bx*$NQZ;?1(`XQe0qRK75| vURH1NeMQd6pOwrw@^f=b^D;{+Cl`pt!ZjC)$WP{%6rcP~RcP~Vl`uvCTFEF0 diff --git a/app/soapbox/features/compose/components/action_bar.js b/app/soapbox/features/compose/components/action_bar.js index 32e8562d7234e26467f81c74e04440bd857bbb76..863d49f22b1675c490b8bce2479275a56b8c7a50 100644 GIT binary patch delta 74 zcmeyM^h9Yx87oUlVoBoUMkWdF%-n+fqLO$pKY&?;+Y`)J0P!~;Wewm&QBcYsFjHI-_ RC@PC5i}MF;-pRk35ddHiAO!#b diff --git a/app/soapbox/features/import_follows/index.js b/app/soapbox/features/import_data/index.js similarity index 77% rename from app/soapbox/features/import_follows/index.js rename to app/soapbox/features/import_data/index.js index c612a2cb0f23936181faa2a06823d39b28792613..39e305c64880719e1d8d01c2f1ed374e7a869328 100644 GIT binary patch delta 146 zcmX>r_CR#QW=58j#FE6xyBOUfKn!&qg_P8^#L}D+-_+vb#Pn1v1$EEdg8ZTq1+cV2 ztqxbMrZpE=Y6V0PqFBKpGcPMOxx_QCB!??GC$YF#0iw$VXy)dlOwugeIr*h2x}^m< Y`H3l;AF(Zm+B<=x9qfS3a-8~100RYp0-5&846K)n)||)=N(<(NKpOr3p1DwW1)us6-(pH7&6; zr$oU4XmVa^a)}1A*(yN8HMtxz^Rj?4o_QrXT**0!#l;Gqxgfo65JztgWs+uL%1_^1 U&9)rj6E%)@m`^ru~8rvIr-(qn`dy@D^B*(37_1cCOi3>wiO#hV)92h$;lrS#W(NJ HIj#i&RvH!0 diff --git a/app/soapbox/features/ui/util/async-components.js b/app/soapbox/features/ui/util/async-components.js index 3da609a38538a246d0eca82914cce600ceb3f4e9..724a33e399b4c8ff5547ad453a8673fa10395f4b 100644 GIT binary patch delta 34 ocmbPcG{I Date: Sun, 27 Sep 2020 11:41:46 -0500 Subject: [PATCH 08/43] ImportData: POST CSV directly instead of reading it --- app/soapbox/features/forms/index.js | Bin 6009 -> 6013 bytes app/soapbox/features/import_data/index.js | Bin 2784 -> 2529 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/forms/index.js b/app/soapbox/features/forms/index.js index 82e778e31b7cc8d4a966d5be0647076b57fff438..bd1b932522537c79c5e3672bdf942a07f4f23e0d 100644 GIT binary patch delta 23 ecmeyV_g8O2o;ZI=YDI~Da&eh@tPWSLH5UMNxCm1K delta 19 acmeyX_fu~}o;bH&a&eh@tPWSLH5UL+PX>tq diff --git a/app/soapbox/features/import_data/index.js b/app/soapbox/features/import_data/index.js index 39e305c64880719e1d8d01c2f1ed374e7a869328..e414b26e290ecf4ea0bbff988ae43bc27dab7092 100644 GIT binary patch delta 198 zcmaDL`cQa-6%$u-eqLT`a*2i}*JMj3$H`Ziss+>Xb8_;_i=BhRtQ7J}b8>VhdojmP zUcv0ni;&T@=9)Z@MR)Qq=B1O5v1nzwW#*(hXC&sOrz+Sg0I{7yHJ1Vq0F5s$QHVxp zj0MT-l_VCWrlLS#1eYY1q-s8yS!eDNK|)ApKc%l= zA>?W7wDl>xJG&d5Vv3nF-?{UBx4$|cy}G-qpWTkMvShLmX%nVKr#6C@7VxrJiq%oy zpU`w>V@rY%1|hu z6>5?Pg&4u$w9NC<0Plo~_!46hW`YzOw3#GVYj&1iQ;AEobVpv^Z!yC0iNxVd;>MH; zn*ON_Qf3tJ2$h^OkzmYEE(Hm;E1W}~aE&72E_^y9+)c&AT1m}!Dq-5!Q)mli(b_-S uaL&2C!Dk9LAIqcc!|`Jg4n=+ab<{ivcEavhOR49!8*!ss?e*REYwZ`RxrX}y From a2500d933230b5a2bb5daf3a10ac983120188669 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Sep 2020 11:43:26 -0500 Subject: [PATCH 09/43] ImportData: form validation, Save --> Import --- app/soapbox/features/import_data/index.js | Bin 2529 -> 2567 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/import_data/index.js b/app/soapbox/features/import_data/index.js index e414b26e290ecf4ea0bbff988ae43bc27dab7092..8621d7acba56e649010202af7557db26dc8af6ca 100644 GIT binary patch delta 81 zcmaDT+%B>ql7mY@p(wSmG_xo*WpX3C@Z?C2|3;a)1^GoK@hOQViF%32C7Jno#d;7i db%m7Fw8YY!65rI~;>7e+TXj#c+R2Ta2>{Sv9%ujn delta 57 zcmZn{c__Rgl4Eii$A8V@{KSH!{EGPG{JgZxbiLxlvQ%}2l+?7u(wq|C)Z*gA^i*5* LV4&#a<(vrsjHnh5 From e6e4a5c447f81aa06dbe95892582d5982963dcb4 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Sep 2020 12:24:38 -0500 Subject: [PATCH 10/43] ImportData: allow importing Blocks --- app/soapbox/actions/import_data.js | Bin 735 -> 2011 bytes .../import_data/components/csv_importer.js | Bin 0 -> 2046 bytes app/soapbox/features/import_data/index.js | Bin 2567 -> 2170 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/soapbox/features/import_data/components/csv_importer.js diff --git a/app/soapbox/actions/import_data.js b/app/soapbox/actions/import_data.js index e80ffa2d2bb32073682036f5b4fd48c182a89024..251d2972ddccc20811c0ea9bfbf4eb26db58a3ae 100644 GIT binary patch literal 2011 zcmcIkO^d=X5WV{==GF?*-W3;A6l4{5t+GdnHPy1M2}z2I_}@2eV%J#PUHtG=^XARG z$(u|VQ^Euw8bZKG43^`#@{iT3g$g+W-;iA=!ZPZlV>m%{N%k)CMM$>XMJdW9r-t`g zI$xd&7>++C)7fG$8I2}i-eTJSocFyMw86TK$OKh+Yc}ZOrQxt8SS8|Jz757SUkZiLN z0yS&{5=CUkZHgF*c^!^50ER`vwqUP9PLc384OnC02_$eG+HYA1z!|iUAPy8a%SP{1 zZ^@K-QaR{$o-G3a97?#bt@IJNRL(VtksD;X7D}Ym0Il!L5F5O;8Rk?@J^mGy7RrU? zkI1%U0!wv@8P}cT74XFOG3P-NMF*>{g&H|Zn$tctK)$*lTsP&FDJjkh2?Xb!L4G-Y zdWAM-jIa`+B}G!>8lZ@m8PoebwQ8sQ>0epejfnsKL`Th6mp7-Ubui*ZW; delta 12 Tcmcc3f1h=O2;=5Drqhf7ApQiC diff --git a/app/soapbox/features/import_data/components/csv_importer.js b/app/soapbox/features/import_data/components/csv_importer.js new file mode 100644 index 0000000000000000000000000000000000000000..7571273b3349ac5b98398306893f5f2833b28bad GIT binary patch literal 2046 zcmbVNQES^U5Pr|ExHmfx+i!bllTt|OC~TuNV=tu?#l9rkWXY4{HYLq}-$}A#C-KTy zAf%GM`*inxrzoz*fZUnHP zA_U$lT~26q%TW~OvsQH#mICJ+r3~u%;>Tpv)@Kx}mTH@=kXgFlWGjky#3S5#wF+FZ zT3EPll!?cq>#q7yE|@Vuly_c1)PP%yvM}(M+IJ&L&RAx74z7|=*$i9-0OST&@&XPu zr>k1#DK`)JyXItrs|BD$W7rx^AE=hjk~3(*O~q`!=|cxOopXKAAm5&Z3F#xWIj^|D z3y`%CAvtcoC{}Q}zJL`I2Ho!7g>9HD1TN}j$t^|4_(IJvhS^n9JSl7}?4V6~(#SzA zHUqoiCUt@tp8|kD3l-C>G;}KQ6`b=o%(8fV=|u{MDXS{-BaQ?&Hkt$;r$44Hal(4A zr#EO9?j+tpuL!GagndKW<`xI1;&91$oZ1b_IPO&g%~gY(UYG;vew^mcqc}#bmHuCn zrW7wLN#%cULi+|ydM?~j?Q=3@?R=!~u?LS%nkRRXTBg@%y;cU^-{J8osCz1yi)ae+ z*Ju(QH3 z0g4R;{|ke|4H76By6ecOuIYyE)Xj)HOD8*1HX}!lH>amt(`?YsX%;j`+r^*y8=kf~ z(tf(EtyL1F?|`s~!2K7RMaECGsNW(>E1`)9KS`x|$@JS1DZqy&1>Pfhr&*xuCEqW6 Qnssj_K>XOE2e}{p0fy3kjsO4v literal 0 HcmV?d00001 diff --git a/app/soapbox/features/import_data/index.js b/app/soapbox/features/import_data/index.js index 8621d7acba56e649010202af7557db26dc8af6ca..c1d788ff7f7731faae121fcd06421737699264c5 100644 GIT binary patch literal 2170 zcmbtVO>f&U488kT@aD8=?0dHiLpv16Aw$s)y9TnYG+JfJljN?2;r~8Tk{vfovKGDh zgM5#Aq#i}xXyf3Hv(mxF=o(T(&*`T`gkK$0d?OTJackKFw-+GPFJ8K(auWJ!&RpQ9 zUE;E?TgM8?Z(GB!HKHl5UXjej5HfEtW?l|KJCIwWn;$O?w~?s9_qn4FyO?V&+gind zEX!Mwk4P3D>F+MOO8~;rZnTv8kG&W_TuEI%`u9AKF{{?$k(1$^RYo&{g!l+OM`0AjibK173g&Sce`B^+t#7vLErG(UzX2QO8z!Zfu{2+v2z#M57-zim#S7d@j?TuwdOIQm!@KgtrEZ`wOqJUNGvhVH`+lkc7&y$|@o`4q<0o3+ zJ;irmg7%+j_K@%I0j2E?vgdsJEFUF~JqZ7)1qkeIfj|3|65R;C?$$+8N@gvD%x~zK zz@Hsg6@5aSe|JTfkY_pOLGJFUK)1T0^C;Ej2NsBrv%p;1v5_s@Hy@nftic6l)A0vZ6h_S(!rY-9igG^ zn3@e9JgcLtXVJjVdMH@=c;(c+6!n*gPWY3Z5u6zD{1UkdTdE&7#G(uCF^p*s`I~^Q r{C1n-`1^AZrpwPy)wH4kpCZu|Oo8A$?+5Afpk1gD_XhSPN&4h3RzmRl literal 2567 zcmbVOQE%He5PtWsxHrjwCB5|_vw~tNQUutBq8av56ag)rY_1fkkyMky^?%=;NLjMt z7Q+GrHp#o=-S>TWv}`+LJ$yt_d1$O@A+h{D`DG=;(Ge=6HPZ2EZjf25`v+6~CCO+C_0YDx7dwR?dW(04($J_cvdiRXl67R0 zRin`q12Ie0Xz~Y3b~pMt?nhN z+P$}?@4`~y-N6`#_U`eo&1%HU8PV;`OVOb4l&vco@}H$~gaGxuQOZ2KGd80i(IJg? zMX-9Rg%_07ifC~j+K4xla7jSQ`5sWzQtxko?x=4d2{q;ONE`MOz4DP7vU&*24;R6S z3R%;2_%bLZ8pGSDigdktJ2AbglyDA0fOnKA;EP9H^VU^Tk1NX3dEsRROi`e$1Wq2H zmaY@NI^4jS&b;Y$l}q;#|LG-Zkbwu%npblpvt#Wo%uZBAxC{xca6=O?C%$e#_e#ZZ z?l%*GYlL#hyC-%&2wf|D?02p76eGp2q|7yxw=rDc-0^(MkzuE+-u3qU#8|G*Qy|WE0{rR+vv|Gd1ioT;k9_@_9;hPbGNUBQS?- zH$s{Q4MfeQ;l}kk_XpHzIxFd?p$Bx%u}|x~V!F~4tu^-l28k67*b;8T=ewZM0MLwz zd&xZ~^qwiD|4Sl1O*nn#^V|!&N1r$3<>32w`1CoTvP5t4i^UCBT4Dn&ffKYdlFj0~ zPP9d8cn#@*Jis;%97&#KQYq8dS>Gv=S~7NOdE{usFVD-^k?Gjud2HwP33j6T@~hX6 zO18H#I>n#H6Br#-S{{em=E6Nq9^}&uLyQzj%HW|}M~@)1vy3jB$ZaDs zvmO7G*r6(q+gDGOtjlCJFvs3|8XS_v^emIuQ3({cr>hs~07@7<$yJjBiQvDa!gg*< z=yfVI)ds}*1@}T~dI>-PPZKZ=1dU@2qN+?!fqtB_(V@pK#5A?u^*U{w&{rxfu5e$F zYL?sE*PGko2g=(PK^y4jQI=YaZ|OoM+g*e7#A@4SZS5k9ic z%2wEKi?A%bp^;}le3oj83B@P*HHYCTWoj;P+!o>H`R)R(Z8435(QI3U5fs+LlR%U0 GwE7p!87Nl( From 066655728299ddd696abb53f00d6aa9dfd7037de Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Sep 2020 12:34:35 -0500 Subject: [PATCH 11/43] ImportData: move FileChooserCSV params into CSVImporter --- app/soapbox/features/forms/index.js | Bin 6013 -> 5867 bytes .../import_data/components/csv_importer.js | Bin 2046 -> 2118 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/forms/index.js b/app/soapbox/features/forms/index.js index bd1b932522537c79c5e3672bdf942a07f4f23e0d..4330919b3d7c32e8ae4c426d5965eaa6df59c972 100644 GIT binary patch delta 7 OcmeyX_gZ(uYcT*3O#}4+ delta 43 vcmaE@`&VznYq80bMJ1V?gTp4T5p@I88^q-JOHwOJ^plIr)MItHYOT2da?B3{ diff --git a/app/soapbox/features/import_data/components/csv_importer.js b/app/soapbox/features/import_data/components/csv_importer.js index 7571273b3349ac5b98398306893f5f2833b28bad..7f837b067b052e30a1bfd39cf0a869a39e240f26 100644 GIT binary patch delta 116 zcmeyze@tM)Q#Q}Mg3=P5iFf2S^Dypai44xnEyzg)3vwx7fRf6BR9p45%$!tpEV7Bo i$*Bb;w$;(N*PQC8-r9`XF{}?dGejnoIx^has>4 delta 55 zcmX>m@Q;7O(}`b11r!wAGILU$GxGC`Q;VE~!#1-s?q%Ua6`Q<}O?a~bn-~)ST6q(h From 7926854fe6936f3e15a608aa9d7255b8ffdf1244 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Sep 2020 12:36:24 -0500 Subject: [PATCH 12/43] ImportData: fix webpackChunkName --- .../features/ui/util/async-components.js | Bin 6416 -> 6413 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/ui/util/async-components.js b/app/soapbox/features/ui/util/async-components.js index 724a33e399b4c8ff5547ad453a8673fa10395f4b..83f26c27029914fb1f7aa58cb2be6abccbb7cbd5 100644 GIT binary patch delta 17 YcmbPW)N8b%O^hWau_SSGuUIn^06Pr^M*si- delta 20 bcmeA*nqah{O^iJ)KPM-@ym)h$SThp Date: Sun, 27 Sep 2020 13:33:03 -0500 Subject: [PATCH 13/43] Halloween: transparent vignette for light theme --- app/styles/holiday/halloween.scss | 4 ++-- app/styles/themes.scss | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/styles/holiday/halloween.scss b/app/styles/holiday/halloween.scss index 8f04e74c1c..b63a1ed0fb 100644 --- a/app/styles/holiday/halloween.scss +++ b/app/styles/holiday/halloween.scss @@ -43,13 +43,13 @@ body.halloween { } .app-holder { - // Black vignette + // Vignette &::before { background-image: radial-gradient( circle, transparent 0%, transparent 60%, - #000 100% + var(--vignette-color) 100% ); } diff --git a/app/styles/themes.scss b/app/styles/themes.scss index 13d952b17a..a670b30860 100644 --- a/app/styles/themes.scss +++ b/app/styles/themes.scss @@ -64,6 +64,7 @@ body.theme-mode-light { var(--brand-color_s), calc(var(--brand-color_l) - 8%) ); + --vignette-color: transparent; // Meta-variables --primary-text-color_h: 0; @@ -92,6 +93,7 @@ body.theme-mode-dark { var(--brand-color_s), calc(var(--brand-color_l) + 8%) ); + --vignette-color: #000; // Meta-variables --primary-text-color_h: 0; From 83f31b8a00613a576ea17c5867f2840788b5f1dd Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Sep 2020 14:33:21 -0500 Subject: [PATCH 14/43] Notifications: parseInt ID when sorting --- app/soapbox/reducers/notifications.js | Bin 6069 -> 6105 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/reducers/notifications.js b/app/soapbox/reducers/notifications.js index 7dbda2c64052bb839571817befe258628aa1db11..3d0d14dfbfdca145df1e1608b57ea18c921222d7 100644 GIT binary patch delta 106 zcmdn0e^Y!S|d?Y!3LsMBWbcAi?9$}7;1z@(qix delta 84 zcmcbqzg2(3S7!IjGzE=Bz4X))4fV_vbxj2ug(L(|Q=ureq_ikc!O)sZK>=N<9g@<` I2`rVu0BcJbD*ylh From afe23f0028783bb80e52078a4f03a550dca9a132 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Sep 2020 15:27:39 -0500 Subject: [PATCH 15/43] Composer: push into timelines even if it's a reply --- app/soapbox/actions/compose.js | Bin 15851 -> 15810 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/actions/compose.js b/app/soapbox/actions/compose.js index ef6b9995dc094dfa361574470dbbde9b441a9952..b0e35f531d1825e5e4ffcf1c9c43ba08803d4a6b 100644 GIT binary patch delta 12 TcmaD|eW-dvv)JY}V)p6)Ebj%# delta 40 vcmX?9{knQXvzT;dUVKq%K~80SNq&50ih`}JtwLUDPL6__n!@H%F<*56SvL;I From 0b7763e7267108b7ef70713b6ecbf9c85c952d48 Mon Sep 17 00:00:00 2001 From: Mary Kate Date: Sun, 27 Sep 2020 15:43:23 -0500 Subject: [PATCH 16/43] fix composer jump by reseting lastToken on click and arrow up and down in autosuggesttextarea --- .../components/autosuggest_textarea.js | Bin 7177 -> 7889 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/components/autosuggest_textarea.js b/app/soapbox/components/autosuggest_textarea.js index d9a04402231ba50a4a40fdcec53f97ed8f4106f7..e60661f6b268fbaf521c6eab6ac68bdb1c853fff 100644 GIT binary patch delta 566 zcmZXSF-yZh6o3aIl(fa_(4mVrNSi>3YpGNbbr39wI4J6nCa?B1xeIrfs+7{XYx6@Y zRGj=1{u@VME>=r(LwG#iz4v`DH*I}&-lVZhh!;@r$?XMjB*49dew$nf9$mdgARXR& z1Wzrvv1cUL#Y)mDRc3`^GB0cchdmajd`r5rC70+=EG@sY169q5I#ho=UnJV2ol80bH0AWgis>`rmUxp5PE0;29 zfrFQ^zit2F4P532pb^*MXrEYmEB^`xI-o$(-L7T-qUVj}6s~@x nA${(}DW2o{{^<~db1D@u5LQD!ghn$nUtz(Fh+*-(H8Xzz@&mSx delta 30 kcmca;+i9_(m~HcHHf^@ajJ%hCSaP#E-w)=^o+2Gw0IISIFaQ7m From a67ab78c361ac689aeab567f2544f3854086f124 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Sep 2020 16:17:21 -0500 Subject: [PATCH 17/43] Timelines: refactor timelineQueue to use IDs instead of full objects, fixes #156 --- app/soapbox/actions/compose.js | Bin 15810 -> 15806 bytes app/soapbox/actions/timelines.js | Bin 8137 -> 8148 bytes app/soapbox/reducers/contexts.js | Bin 3112 -> 3309 bytes app/soapbox/reducers/timelines.js | Bin 7223 -> 7185 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/actions/compose.js b/app/soapbox/actions/compose.js index b0e35f531d1825e5e4ffcf1c9c43ba08803d4a6b..8c947655abd02c8464e53ad67bca2b30edaca2c6 100644 GIT binary patch delta 29 kcmX?9y{~%1Pf>xQ)Z&8tyy8^7l*E!mz08!&ykc9`0n1hlDF6Tf delta 16 Ycmdm2eW-fFPtnN>ge5lfifvQ}07!!eK>z>% diff --git a/app/soapbox/actions/timelines.js b/app/soapbox/actions/timelines.js index 498c89dfbd5f75b576ff4ff5f0004121033495cb..67f6b19f8a37abacb3608ed917ba492e8f700251 100644 GIT binary patch delta 108 zcmX?Uf5m>o4VKB~Y&w%~u=w!kWv1vTBqk@P7L;gCR^$?!{FOy+@(ngIW}w96a#l|! x&y>jrSQ{qivCB^GWRnAN*Rv~6KE@m6xe+KKx#?Sn%cLqdb&J$(cGgF2IJCUE6u;Mh^6(K- diff --git a/app/soapbox/reducers/timelines.js b/app/soapbox/reducers/timelines.js index b134742ba8f9c081f8f8293bfe0e2c53e3e1a56f..3c514849ad937440bfe83daba45d5f8998b4747e 100644 GIT binary patch delta 109 zcmdmPG0|d!BL|ab%4A25H9%_fca9WB5I2>}8N^+|l?LWY@Kk`fvv?Fi+|9drEjjrU ilS?x5^Yn^K5=%;pfm#A3geS|0yJ8U+-P|p{h6MnTdn4Ka delta 112 zcmbPevE5>WBgbTCjx}6*>8T|e>X|9(nwvjzq%b1!Cx>%6Z=S=Ih9btoQ-P#pa~+Q& i Date: Sun, 27 Sep 2020 16:32:07 -0500 Subject: [PATCH 18/43] pass getClickableArea into autosuggesttextarea as prop --- .../components/autosuggest_textarea.js | Bin 7889 -> 7797 bytes .../compose/components/compose_form.js | Bin 11564 -> 11615 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/components/autosuggest_textarea.js b/app/soapbox/components/autosuggest_textarea.js index e60661f6b268fbaf521c6eab6ac68bdb1c853fff..703aa97971109463d563019270e3cb5c5e994880 100644 GIT binary patch delta 49 zcmca;`_*Q{Y&IbUh4j=C=bX&s?8Ky;RL7#!#L4-r@|$O~wQx_~BxJ}^P?TS=`JvDU FZUEdz6Ab_W delta 144 zcmexrbJ2FgY_`p3*jl*F(^E^Fb25{&6O(dM9g9*E6>JqWG!<;^6soxtfFL Date: Sun, 27 Sep 2020 16:48:23 -0500 Subject: [PATCH 19/43] UI: fix PropType warning on `page` --- .../features/ui/util/react_router_helpers.js | Bin 2749 -> 2751 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/ui/util/react_router_helpers.js b/app/soapbox/features/ui/util/react_router_helpers.js index ceffd0daa7de171be0a2f8094e5607c0cc2f4bbe..133750f910a608b573d060fb6598006e447ab214 100644 GIT binary patch delta 19 acmdlhx?gm|W+t}$q^#8BlFi$h*f;=9YzG4X delta 17 Ycmdllx>t0=W+s-j(!Au&JDJ!x06yvlH~;_u From 5ad39921f9a516105e6fb54e8888ba38e7f09b7f Mon Sep 17 00:00:00 2001 From: Mary Kate Date: Sun, 27 Sep 2020 17:02:10 -0500 Subject: [PATCH 20/43] re-open compose modal after changing privacy, fixes #200 --- .../containers/privacy_dropdown_container.js | Bin 759 -> 793 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/compose/containers/privacy_dropdown_container.js b/app/soapbox/features/compose/containers/privacy_dropdown_container.js index c112bc553c18ef0d944005bb7405eb155bbd19d3..0c3bbf83bda1876229e4d8df4ba3dd48c8e899e9 100644 GIT binary patch delta 66 zcmey)I+JZfH Date: Sun, 27 Sep 2020 17:24:55 -0500 Subject: [PATCH 21/43] Interactions: optimistic Favourite and EmojiReact actions, fixes #104 --- app/soapbox/reducers/statuses.js | Bin 2624 -> 3183 bytes .../utils/__tests__/emoji_reacts-test.js | Bin 7412 -> 8307 bytes app/soapbox/utils/emoji_reacts.js | Bin 2928 -> 3415 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/reducers/statuses.js b/app/soapbox/reducers/statuses.js index 8cccd4a09c73a1d16dda359c9bf677a32f696cd3..b7f09ef2235c57089e2d59a4b39c025376b42f73 100644 GIT binary patch delta 518 zcmX>g@?K(sBU7l~M4fvq3JRfq8^3Zg^5`fOXXcjXB$lLx=57AM_?(Hov>*k@)0k|} zDp_A#l2}q&tYB-$r2qyHK9r-NpjVt)qM@FaSe9Q}lv$FRqOPM*QdF9%iBJGF456kt zJ~_WMuLP(POaqOEGPD&8H8rh)I+GKNQ-Q8?a}4vJyqiUVLieO4<`k3aAm7B2487dM z3Jn98D|JDR)3lx}z^XX;91D*W)Ps5u?|J5Fz765BC Bm1qC} delta 141 zcmaDaaX@5(f~BBWxnM6 zyy6mtg2a*x1zUya$#$ILlkc&~>sWIs00BfYH8(#iGblANxuh7Vrnn@rBvmgxwZt<| i1EfvUdh$6A2|f^0N1-?~w=@SRKlweo>Sk$<5EcM7&oO)e diff --git a/app/soapbox/utils/__tests__/emoji_reacts-test.js b/app/soapbox/utils/__tests__/emoji_reacts-test.js index fcce0a11be0ae055b26d58c36295fa37a15359fe..4663304b29366b315d74b7fce626c3b5bce576fe 100644 GIT binary patch delta 189 zcmexj`PpGYFOPykab|95PGU)FXx_%gVwuVFB!!tm^CoYUlol&W&CM@MEmkPWNL2tb zvoaOZit=+O-<7PK%r4D8c|Q~9XzOOI66s0~$PU@&Yd2$s3sXCo2f^PrfU|H910(cQU^W S2gn9-nb|-SxhH>+VF3UjctG0# delta 10 RcmezD@WpaM@5ZI+G5{d81y=w7 diff --git a/app/soapbox/utils/emoji_reacts.js b/app/soapbox/utils/emoji_reacts.js index 2cb1b3fc368d0a7c2911bb029efbfd42a802c26a..39c1941012cf2635d277b8b43739f180ab7bfbe9 100644 GIT binary patch delta 183 zcmew$c3o;i0r%uXoMKF&d6RE&`pa`E070r=dTNP=dR}5~s=B6vt*xy>YHog3rh=N< z2iY1t>vn<<^li^cQz0J delta 7 OcmcaE^+9Yy0XF~+hXW%3 From 136965acdd1197bbeeb4123831ca63f8d3c3c65a Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Sep 2020 17:55:04 -0500 Subject: [PATCH 22/43] Composer: remove click listener on unmount --- .../components/autosuggest_textarea.js | Bin 7797 -> 7896 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/components/autosuggest_textarea.js b/app/soapbox/components/autosuggest_textarea.js index 703aa97971109463d563019270e3cb5c5e994880..060e817e8468da8c5127d8830cd6ca6e0299e017 100644 GIT binary patch delta 48 zcmexrbHjGSH(}-Q%$%IiyxjcKyb=vfg=#JZAV|qiF3nBNE72=T&CM@M-MmeBKNkSj C7ZQg6 delta 12 Tcmca%`_*Q{H{s2ZBK2GVD@+Bc From d243b534866be06a529de4bfdfafedd93704fc0c Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Sep 2020 18:02:57 -0500 Subject: [PATCH 23/43] PrivacyDropdown: clean up dispatch calls --- .../containers/privacy_dropdown_container.js | Bin 793 -> 806 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/compose/containers/privacy_dropdown_container.js b/app/soapbox/features/compose/containers/privacy_dropdown_container.js index 0c3bbf83bda1876229e4d8df4ba3dd48c8e899e9..a90d54fa647173577343e4d03589693fca18b2b5 100644 GIT binary patch delta 81 zcmbQqwv25 Date: Sun, 27 Sep 2020 19:09:35 -0500 Subject: [PATCH 24/43] Purge state on logout, fixes #264 --- app/soapbox/reducers/index.js | Bin 2653 -> 3248 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/reducers/index.js b/app/soapbox/reducers/index.js index 6f4abdafe73fa9fddd4c0994023ba0c09dec4695..5ec2b581ca5b18b640ee68565256d576cec3b690 100644 GIT binary patch delta 663 zcmZ`%!AiqG5Ctz{&R#qSb4voH_1scHR8&wZQcogbyH1;xBpY^TsZv5ez>7cOUGaPT z7iW{0(u23%w{PB?H?u$cp9k;5WCb^(1YzMS&mDeX zpI#={lZ%VNR+NC0yaxWh3(`$)wGY4UDYmIB(#_#}I6lu_^t)Gpcv delta 73 zcmdlWc~@kD)yBnc?A%4EDW%D&Ma2rX3Y*zDmNMyDb8)3s6yz6`D5RvOC6?xtC?x0S SCS~TO20>M7z_e&ua{&Oo5E;V& From ce1e04c224e7a580497bd5fa8c6f91ee221f59df Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Sep 2020 19:43:42 -0500 Subject: [PATCH 25/43] Obliterate hydrateStore() --- app/soapbox/actions/compose.js | Bin 15806 -> 15573 bytes app/soapbox/actions/settings.js | Bin 3161 -> 3415 bytes app/soapbox/actions/store.js | Bin 595 -> 0 bytes app/soapbox/containers/soapbox.js | Bin 5286 -> 5110 bytes app/soapbox/initial_state.js | Bin 172 -> 0 bytes .../reducers/__tests__/compose-test.js | Bin 27954 -> 27523 bytes app/soapbox/reducers/compose.js | Bin 13508 -> 13170 bytes app/soapbox/reducers/media_attachments.js | Bin 816 -> 681 bytes app/soapbox/reducers/meta.js | Bin 686 -> 564 bytes app/soapbox/reducers/push_notifications.js | Bin 1526 -> 1024 bytes app/soapbox/reducers/settings.js | Bin 2186 -> 1734 bytes 11 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 app/soapbox/actions/store.js delete mode 100644 app/soapbox/initial_state.js diff --git a/app/soapbox/actions/compose.js b/app/soapbox/actions/compose.js index 8c947655abd02c8464e53ad67bca2b30edaca2c6..f4a644e87f7df4059436bdecc99a683441cb9ee1 100644 GIT binary patch delta 12 Ucmdm2eYJAKb>qzkO#X2I05F0E?*IS* delta 152 zcmcawxvzS|b>qp|#sd5ql_^DuC8^H&xdr*fsTz~@g|tPJ^Ye;J6mnA)Y!%W|OM**) z@*0|x7n+D!Wn>nYqh`g7w9{NKCJo%{C>u?G)+1FG*`V87rYA=bU@) zxrxk6r3tREAk=(+!Uzspo8egh+!=M_0-GzsKQeY|9v6Fw;m80@uiB3i_113Y_c zp$bEgZdU90?sfaTo^9qZh0z^g<^QX9%h|{FPl-oeo7Ug{Yt)pIO=Y#3e|Ou50J@3T z4UB+&MNo$@btLqo$I>i{49}P`OFlv!lUhncEQGN?yz`QU;V{~vDg;SYKzAJ}DUE%b z5U$o}%sZGiyRs$n0RTlu29y8* delta 153 zcmeySzD#q&T_&E4%9NtSlGNam{G!y!8<<3lia{)OYp%@Pg8ZTqh0MInlFY=M;1ZxB zg|wplTm^MKJ$RD$I|f MTGM*-6xJj@0HX>yxc~qF diff --git a/app/soapbox/initial_state.js b/app/soapbox/initial_state.js deleted file mode 100644 index dd47e4e8b74a5120414530040f7e4803f0139e71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmYj~K?=e!6b1J=#owh}m;)F@P+ZuBE_#B{d?gT*lDt4gyt^qzaQ7IPd9q}tjN~Rr zEyNT<2C?S{2hfgeoXR@YopJio!}DxA>4JkZev@Iqve(UQcwA}Kf1y1M8UXr0;Yip}uY_@q8iy`l12MMXolZEF;0sxXS BHr@aL delta 321 zcmZp^&ba9o;|4KC-rx}bAlG=0NS7eT5Z8%yk}Sm~`9+i28Lv*>CdWTnKbxDWx^}W- zxXfe)NtVfTg#{*y*a}TnVBwe?&1BA!SDKTvc@|S2qex~-YHmS(NornlrFUwjl>$fx zsLXw`t^)Vwl`M+9lPfetQ7xPNAw+*t65C|=7*#nGSLkplDCp}efIx9cVo9piZIfQAGc cE`#*&83Z@AR#Vd&?5N3%5=xt&2+ofL04UAOy2g1dRa+X=FMeZgp&IER);?bqFVLbz*F3V<)p!2Co5={1XbZ R3<$6cv!E6G0ki2B+Z>*#7Qp}j delta 359 zcmeyAb|iCy0t;_&h<}i4yho%LsZaCF($P zL53oX1sktdoLT}^faWf}bhr%2cm;)8kQGI#C8b4q5T|XPAi~b%h7u-LU>l%{piYGO gIx)E9~*XxD=XrKgr?sOP4p bWG2QZmXstWXXK{ll@zOMYFbZjVNwMEtCcXU diff --git a/app/soapbox/reducers/meta.js b/app/soapbox/reducers/meta.js index 6bd397c2ccba7297c7f09a5360fcdcf371b18592..c3f5062df0c67487f6e90c239b5aab3758097e8e 100644 GIT binary patch delta 14 VcmZ3-x`kze#6+(@oBJ3Q7y&C-1x^3} delta 121 zcmdnOvW|6vghp_Pe~@duN2E)TV~DFltwLH+ey)PLo}PYUa!F=>Ua@|0Nq$kPy7fjr zHbw^&#a3JjKv0xgQd*R!P+XE&lB$=RT9lru0nw=k5lT-j(NND#ElE_@)U@8r!>GXs E02l8j2LJ#7 diff --git a/app/soapbox/reducers/push_notifications.js b/app/soapbox/reducers/push_notifications.js index 317352b79065b1dac77e5d79125e49fc4b96791b..6b90016844376af6e084f53d90040589e43fa209 100644 GIT binary patch delta 13 Ucmeyy-N3QY=r`l$kIbx004U=H7XSbN delta 443 zcmZ{g!AiqG6h&#=X#4;{5bi>m4wMw!2n`~F0e3=^jjIxqsSdQ0F!Qo%L;Z*Rh~QVb zaoLRA0NZJcZ9cv83!rufa1C9-&`xXnv(yO0QPQY`)Atka GqxTI5>5c{f diff --git a/app/soapbox/reducers/settings.js b/app/soapbox/reducers/settings.js index 1066716d7ca0283597a42a0516867988865cdbce..be4f6b88dcacb1b3f5698cd916c7e2de5bf44ec3 100644 GIT binary patch delta 23 hcmV+y0OUa@|0Nq$l4#QxWk znYjh|MI{QQrI{%RRUqEva>mE?DXD3Rr8y+-+02>38*c`xgp3xm8u&sbzRZu8OEh#O^ fgE<7|3P|AVLF`XYEzwYiS*@ Date: Sun, 27 Sep 2020 20:27:27 -0500 Subject: [PATCH 26/43] Remove rails-ujs, #439 --- app/application.js | Bin 215 -> 247 bytes app/soapbox/common.js | Bin 234 -> 0 bytes package.json | 1 - yarn.lock | 5 ----- 4 files changed, 6 deletions(-) delete mode 100644 app/soapbox/common.js diff --git a/app/application.js b/app/application.js index 906247ea3ef9529bcce19d5c13f4ed09c8b96735..c0f54ff1d5832a5b10e120baca9ec9db194e5906 100644 GIT binary patch delta 91 zcmcc4_?>ZrSs+(YYGG++QL2V|T7FTsZen?Aaei*9esXcKKC*xwP(WSNnhT~}FF8N2 dB(#sG<9Nn0Ra7@Ah!Sj delta 59 zcmey)c%5;AnPFybL4Hw*LbXD1Ng|N0RY)t!&s9*@(=X0XEJ(_)&`-|K&CSnKx8~vk KtI(L(UH|}%-W6#8 diff --git a/app/soapbox/common.js b/app/soapbox/common.js deleted file mode 100644 index 6947fd07c431a2ba85a5a60fe0db6b50abd06993..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 234 zcmYk0Q4Yc&5Jdku#r{DP3kT>4{PhL|7e!0aWl3vH?=G|^`nQ>RGdr?mgv=Bi%Rz_` zABh-FHjEiOr3jMR-IrT#J}#T@%j7tusU|J4>fkK^2%jYoD(Ms5dpl!J5sk~){0q7Y zvKxN9c4=Z Date: Sun, 27 Sep 2020 20:51:46 -0500 Subject: [PATCH 27/43] Don't import unused react-sparklines, #439 --- app/soapbox/components/hashtag.js | Bin 1320 -> 1381 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/components/hashtag.js b/app/soapbox/components/hashtag.js index 2a0017c9c2d0222b7759bebce50954f8e0f7deca..2872a236a26501d79ec7405a61137ff1a65d3fe2 100644 GIT binary patch delta 83 zcmZ3%^^|LZG_$_G!ba(SW^;Wlg@ByYqWs)Mg_Qi%;ym>dh2qkJg8ZTqg_6W{g^bMN jlKi4dh04?t1ugwrE(IW{2I|?oikY9087MS)Crds6WpEkX delta 22 ecmaFLwSsGc^hUXU=E<5&7L#RIu225Pk`Dk~DF`Y6 From c8f839f483f5428478aeee1bf31622a2ac626a15 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Sep 2020 21:25:48 -0500 Subject: [PATCH 28/43] Remove chromatism, #439 --- app/soapbox/utils/theme.js | Bin 588 -> 2125 bytes package.json | 1 - yarn.lock | 5 ----- 3 files changed, 6 deletions(-) diff --git a/app/soapbox/utils/theme.js b/app/soapbox/utils/theme.js index a4fb01c8c46b1c4d2a8b32444f55f8e865e12928..6e847b5a4cbaa284f361586c2cf50311d0c415bd 100644 GIT binary patch literal 2125 zcma)7QE$^Q5Pt8kIL1&NNRu?(CehJNXfVM8LK=N5g*mC4lsQSUol&Ur-#Ob&nsk-m zA+2-gyZi3DyWA>U7ec`nKG8K$2_LhpR5apDzgMsnMF#yeR51R_E6#ZAEr0h24(_5fB(AkX$<2Lw~4$RRH|zeN4+RcRmZsG`#XJ(0b^ zv@q_qswH)t%U*?ed>>M!)^hCoQqlOKcw}P9i(g(`WIpxJFT%6o=yh*d=CN88Iizee zE$)(t;K4EY(8K%98c~Bxk&INImW9ZGFfZ}oBpBVEIG_qxBH*qj7>#aGiAh*K8V7eQ zVH;$_|MvWv%;;eGbuo9I9!~w0W&ok!UHtU~TXPyS(skql$y^XFBrZgb=9QooG6%2B zliMFebQwnC&AH!J_Yd8w*8U2RC3w_4+ zs7!-Q=>yAcGsh{mG*v5^c|T;kd6Jb%%gA(1BIxfmOA>#7*^hV;`5Bdp315oX$9iL< zN$e=;izL#{YzyGawD=%768=be$?7S1qylTT6M6!C2+z+oyIPSnilnQE8b#DqV3^Nh z!3102jal6rF!v<3Fv0p;#~KD9`^&Rnu6w32o`rKqJ9gkD41=IHlP;wCtVg$X8I32C z$)WicF9PVg~ghVA+=L4#~|&AkAc_If4HxXE)^`#US5x@9p){%N58PN z`jgv$Yj06vk@n5iL97?!_q5;O?#Ly|?@za~dU0=a>1est@}0KAhraE4`qp>k$!L4Hw*LbXD2eqLEBkX5UYR+OKspq`uoq!LRqi*qOHO_}_N&08F* aLL;dtF)zhAKPSIPQ!k@9XR|ju6C(hXp&Z=+ diff --git a/package.json b/package.json index 308f37eea2..df70421617 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,6 @@ "babel-plugin-transform-react-remove-prop-types": "^0.4.24", "babel-runtime": "^6.26.0", "blurhash": "^1.0.0", - "chromatism": "^3.0.0", "classnames": "^2.2.5", "compression-webpack-plugin": "^3.0.0", "cross-env": "^6.0.0", diff --git a/yarn.lock b/yarn.lock index f14e28b41a..bc1614f097 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3072,11 +3072,6 @@ chownr@^1.1.1: resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494" integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g== -chromatism@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/chromatism/-/chromatism-3.0.0.tgz#a7249d353c1e4f3577e444ac41171c4e2e624b12" - integrity sha1-pySdNTweTzV35ESsQRccTi5iSxI= - chrome-trace-event@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4" From b266813b4b23e33f60694e477a1b0fa8a3274dce Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Sep 2020 21:41:11 -0500 Subject: [PATCH 29/43] Reduce semver bundle size, #439 --- app/soapbox/utils/features.js | Bin 847 -> 830 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/utils/features.js b/app/soapbox/utils/features.js index 98266e3ca10c23e8a6851f35c6efba22f8829919..213b4cad9a9fe902c1116c4a01abb925f5816d19 100644 GIT binary patch delta 56 zcmX@lwvTOsvs`*fszO>(ey)OgacXW^YLR|gXtV=xsM delta 77 zcmdnTcAjm5vv6^0Zdq!PLRwLNu7Wy*Gcj={JA|b-@s|gTIoXNP2hQ$eY=N;i3o+?1 F0swSh8}$GH From d5517aad79ae2fc2dac601c90ebda04d7737e982 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Sep 2020 22:48:08 -0500 Subject: [PATCH 30/43] Remove standalone components --- app/soapbox/features/standalone/compose/index.js | Bin 613 -> 0 bytes .../standalone/hashtag_timeline/index.js | Bin 2582 -> 0 bytes .../features/standalone/public_timeline/index.js | Bin 2857 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 app/soapbox/features/standalone/compose/index.js delete mode 100644 app/soapbox/features/standalone/hashtag_timeline/index.js delete mode 100644 app/soapbox/features/standalone/public_timeline/index.js diff --git a/app/soapbox/features/standalone/compose/index.js b/app/soapbox/features/standalone/compose/index.js deleted file mode 100644 index c9ac782e7d6286adc538c2ff67458316d43ec647..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 613 zcma)3!D_=W488j+bW3|!@&WC3SYfBNjQv2+Vr3X&d&o{HjQ;!7#7({7L5;zZ-qS;R zHulSNgm=O&LeJhp#h19+C^JJlFK?h1&vxfsMB|7Pv#uMt-As@-q2XF;dueKy`c3oT zqv=hD(Rdfis-wvTUEWYqeD$b}`+P>eM{bze?FVv6Z0|J=_vqLQ@t1<4(`2Zo9>*a< zH(&^mJOnyLayra**KZ@!gg9~$zLf%Cfr(dZ$v_TM9NEEYN&vRn9G_AwS@CC@jPQ@m lIpxo)IaIQATIYb49;@WxgLqiM(zk7v8P^*b^{muc{QyRE%+~+_ diff --git a/app/soapbox/features/standalone/hashtag_timeline/index.js b/app/soapbox/features/standalone/hashtag_timeline/index.js deleted file mode 100644 index 6bb162b6c70e0a601ce1a25b99300e3802fde41a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2582 zcmbVOZExE)5dQ98aRY|R0%R%anga8zY(qLA2AUzr@~tRbMmpI{t}yfc=z1hb9doIC8UN2WQm4MiUK@ozI(qcxV>s15oL*V-A(~3iD`WtVfRv0 zkIxk<2de1zN}Gcbvn`5Rv!@*A;LhcW_tz`)c=omdJXWksZ<#u1wtwUW=Dfs#loG6Z z632+Rb5W{DJHW*K9aEx|&nHn7_H4z=jF(*FNVb8GTxnnm2HM?0pM`<#_~Zj>#&b;n z(oEOtMwIlkMCly%3^Sx#i7HYZETZ&UoQhIsU}vv(!`0}cffS!aT_$7bxkxD~BjlrC zDKGciGUW-=V(vc?RM-+rt)ko_cf5y^kp(%WxC>U9Fz`{BVkwAWX-HuJ4IFF@p!FfX zhGnw=u!Og%T6bSD+@s!>%TL}|hXB5~hwC33_pSXBfJbRBl=nF}P4v?D12W8&3+Hr=`|nx>0V%vhak_>EF%I%YXbqQ6LTrWD-HG>k`$ zWvXl!hW8|no4!WSEL?VZ0;Vl&kHvHj^hvp@m`)CB7+NaKNE{(o5BRO-)TAbfC-oWR zJU+=u=`Ws4GCv}pgvehYhlKt=&h+k-tkROCIk4`T;Xym6*P?bUO=f z%9)#4khjS92Yo{k?@gfnY*|htHWBO(5lz)` z7!v8wu<+*1IFPBg{wQdh(maJYN`q?LQI_tTVGhZq;2{Y zDlv;*&?D^?Ilk=)0?J{v6=biOACgwJ?c!Hwp$BbE#s#9W5Fon z#>UxRJ1SJ-K`bH7*={@4$}}adqyYr5N%`NevfJ&<^6{WcLT_*4!{~bR%37cJFfg7H ztj~Qk3kIC$`K&EKc+ZLSNiE`SRF4s0u(~DC_(U=^f9Z}%pf$xV}{4OOU RA@r{{k*lYL^#ib7{0s82Ne=)3 diff --git a/app/soapbox/features/standalone/public_timeline/index.js b/app/soapbox/features/standalone/public_timeline/index.js deleted file mode 100644 index a509c2e04e298effef503345e6f22ebd72055ee0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2857 zcmai0ZExE)5dQ98as5)+fM1fXDKIxmHlzb)pc#TJ`&1MLBhfZdiBv_Za3=V_?~X5` zU1(9yCvKQ1c>cFxrqOpw;-loX_aeBx;donfz0el6z*;z*UgTcE+Fh-?t7xNz zoIk5ZX1w#HP&w1P2>Gm7F64G4bCEHlj_qd(Ss=MIdQmv!S_CL68KF^3M#(A)gFh*% ztcDcEF@3LUehl}=1MuPF2)`p_Gc{h$H>@cP{Dx_vCL156ax%&arZo&{kE}Ob=Gyh` z`~ew)9pDOukz)*$RFMHSlIzOUXCxQ8VkX-yp=-kV1{pFJ`jLNc1h%!y0cr55>yi{j z3Z(oikzU#&@>!|k6|&3MPjHqzeOE~v`9~=vF8QE8iToaUZpITIrr8NSry%?l9oN-3+afJ#RB!c;{RTU~~Ff1g0Ob z8=?^#A#|XzbL95i#KX{+CugK>4DZSgCuqTm+(cLE)2=T=XZGFdIB?EGY8Dqw$@Z(< zceAC<9C?fN@KI1sEhHu_ME}#kTAVMW9B0Ux2qVH)x|e&+%_HBSUs;$xzFL03(@jSX zmz_Vk*zU|7K5QvNVSWn|I>>K3S^X8r%i>M6xrQP zBzXHaE(07#f0X!wft>-jaP4P(T!G*COWIx>U~z+lYp^Q#4#0D7!ta-{Pug{Od#L#) zZ7n4n=MG>e_g}2!Y2u2=^=w;dKJSyJ%Fuc+S(rn=5^Y-I1e}8 z6)bT_mO1VbyMw70iTc4`qUCiiew_7gy{6rmfK5Ws*Rx?2oOyZa93c>{(Hvd&YlNm@ z|3jl2-^q?nOU^VdGuMJgcS`msrvLx| From 57b72840e577f429269c8d9bda6a8b631d414893 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Sep 2020 22:48:21 -0500 Subject: [PATCH 31/43] Remove unused CSS, #439 --- app/styles/about.scss | 144 --------- app/styles/accounts.scss | 123 -------- app/styles/application.scss | 5 +- app/styles/basics.scss | 7 - app/styles/compact_header.scss | 34 --- app/styles/containers.scss | 88 ------ app/styles/forms.scss | 346 +-------------------- app/styles/lists.scss | 19 -- app/styles/tables.scss | 16 - app/styles/ui.scss | 52 ---- app/styles/widgets.scss | 534 --------------------------------- 11 files changed, 2 insertions(+), 1366 deletions(-) delete mode 100644 app/styles/compact_header.scss delete mode 100644 app/styles/lists.scss delete mode 100644 app/styles/widgets.scss diff --git a/app/styles/about.scss b/app/styles/about.scss index 77d93917e4..915cfd1f83 100644 --- a/app/styles/about.scss +++ b/app/styles/about.scss @@ -532,10 +532,6 @@ $small-breakpoint: 960px; background: transparent; margin: 0 -5px; - .account__header__fields { - border-top: 1px solid var(--brand-color--med); - } - .roles { display: none; } @@ -592,23 +588,6 @@ $small-breakpoint: 960px; border-radius: 0; } - .account__header__fields { - margin: 0; - border-top: 0; - - a { - color: var(--brand-color); - } - - dl:first-child .verified { - border-radius: 0 4px 0 0; - } - - .verified a { - color: $valid-value-color; - } - } - .account__header__content { padding: 20px; padding-bottom: 0; @@ -856,11 +835,6 @@ $small-breakpoint: 960px; background: var(--brand-color--med); padding: 20px 0; - .container-alt { - position: relative; - padding-right: 280px + 15px; - } - &__sections { display: flex; justify-content: space-between; @@ -1300,10 +1274,6 @@ $small-breakpoint: 960px; @media screen and (max-width: 840px) { .information-board { - .container-alt { - padding-right: 20px; - } - .panel { position: static; margin-top: 20px; @@ -1329,11 +1299,6 @@ $small-breakpoint: 960px; text-align: initial; } } - - .header .container-alt, - .features .container-alt { - display: block; - } } .cta { @@ -1491,67 +1456,6 @@ $small-breakpoint: 960px; border-radius: 0; } - .hero-widget { - margin-top: 30px; - margin-bottom: 0; - - h4 { - padding: 10px; - text-transform: uppercase; - font-weight: 700; - font-size: 13px; - color: var(--primary-text-color--faint); - } - - &__text { - border-radius: 0; - padding-bottom: 0; - } - - &__footer { - background: var(--brand-color--med); - padding: 10px; - border-radius: 0 0 4px 4px; - display: flex; - - &__column { - flex: 1 1 50%; - } - } - - .account { - padding: 10px 0; - border-bottom: 0; - - .account__display-name { - display: flex; - align-items: center; - } - - .account__avatar { - width: 44px; - height: 44px; - background-size: 44px 44px; - } - } - - &__counter { - padding: 10px; - - strong { - font-family: var(--font-display), sans-serif; - font-size: 15px; - font-weight: 700; - display: block; - } - - span { - font-size: 14px; - color: var(--primary-text-color--faint); - } - } - } - .simple_form .user_agreement .label_input > label { font-weight: 400; color: var(--primary-text-color--faint); @@ -1580,18 +1484,6 @@ $small-breakpoint: 960px; grid-row: 1; display: flex; flex-direction: column; - - .box-widget { - order: 2; - flex: 0 0 auto; - } - - .hero-widget { - margin-top: 0; - margin-bottom: 10px; - order: 1; - flex: 0 0 auto; - } } &__column-registration { @@ -1605,42 +1497,6 @@ $small-breakpoint: 960px; @media screen and (max-width: $no-gap-breakpoint) { grid-gap: 0; - - .hero-widget { - display: block; - margin-bottom: 0; - box-shadow: none; - - &__img, - &__img img, - &__footer { - border-radius: 0; - } - } - - .hero-widget, - .box-widget, - .directory__tag { - border-bottom: 1px solid var(--brand-color--med); - } - - .directory { - margin-top: 0; - - &__tag { - margin-bottom: 0; - - & > a, - & > div { - border-radius: 0; - box-shadow: none; - } - - &:last-child { - border-bottom: 0; - } - } - } } } } diff --git a/app/styles/accounts.scss b/app/styles/accounts.scss index d9bbe22836..5c70a64d36 100644 --- a/app/styles/accounts.scss +++ b/app/styles/accounts.scss @@ -177,31 +177,6 @@ } } -.nothing-here { - background: var(--brand-color--med); - box-shadow: 0 0 15px rgba($base-shadow-color, 0.2); - color: var(--primary-text-color--faint); - font-size: 14px; - font-weight: 500; - text-align: center; - display: flex; - justify-content: center; - align-items: center; - cursor: default; - border-radius: 4px; - padding: 20px; - min-height: 30vh; - - &--under-tabs { - border-radius: 0 0 4px 4px; - } - - &--flexible { - box-sizing: border-box; - min-height: 100%; - } -} - .account-role { display: inline-block; padding: 4px 6px; @@ -227,104 +202,6 @@ } } -.account__header__fields { - padding: 0; - margin: 15px -15px -15px; - border: 0 none; - border-top: 1px solid var(--brand-color--med); - border-bottom: 1px solid var(--brand-color--med); - font-size: 14px; - line-height: 20px; - - dl { - display: flex; - border-bottom: 1px solid var(--brand-color--med); - } - - dt, - dd { - box-sizing: border-box; - padding: 14px; - text-align: center; - max-height: 48px; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - } - - dt { - font-weight: 500; - width: 120px; - flex: 0 0 auto; - color: var(--primary-text-color--faint); - background: hsla(var(--background-color_hsl), 0.5); - } - - dd { - flex: 1 1 auto; - color: var(--primary-text-color--faint); - } - - a { - color: var(--highlight-text-color); - text-decoration: none; - - &:hover, - &:focus, - &:active { - text-decoration: underline; - } - } - - .verified { - border: 1px solid rgba($valid-value-color, 0.5); - background: rgba($valid-value-color, 0.25); - - a { - color: $valid-value-color; - font-weight: 500; - } - - &__mark { - color: $valid-value-color; - } - } - - dl:last-child { - border-bottom: 0; - } -} - -.directory__tag .trends__item__current { - width: auto; -} - -.pending-account { - &__header { - color: var(--primary-text-color--faint); - - a { - color: var(--background-color); - text-decoration: none; - - &:hover, - &:active, - &:focus { - text-decoration: underline; - } - } - - strong { - color: var(--primary-text-color); - font-weight: 700; - } - } - - &__body { - margin-top: 10px; - } -} - .account { padding: 10px; position: relative; diff --git a/app/styles/application.scss b/app/styles/application.scss index cb171dffd2..dfa13b9ae6 100644 --- a/app/styles/application.scss +++ b/app/styles/application.scss @@ -5,10 +5,7 @@ @import 'reset'; @import 'basics'; @import 'containers'; -@import 'lists'; @import 'footer'; -@import 'compact_header'; -@import 'widgets'; @import 'forms'; @import 'accounts'; @import 'stream_entries'; @@ -16,7 +13,7 @@ @import 'loading'; @import 'ui'; @import 'polls'; -@import 'introduction'; +// @import 'introduction'; @import 'emoji_picker'; @import 'about'; @import 'tables'; diff --git a/app/styles/basics.scss b/app/styles/basics.scss index 092f06202b..4a5c8916b8 100644 --- a/app/styles/basics.scss +++ b/app/styles/basics.scss @@ -176,13 +176,6 @@ body { margin-top: 1em; } - &__dismiss { - display: inline-block; - text-transform: uppercase; - margin-left: 5px; - font-size: 13px; - } - a { color: var(--brand-color--hicontrast); text-decoration: underline; diff --git a/app/styles/compact_header.scss b/app/styles/compact_header.scss deleted file mode 100644 index 3f6fc003e6..0000000000 --- a/app/styles/compact_header.scss +++ /dev/null @@ -1,34 +0,0 @@ -.compact-header { - h1 { - font-size: 24px; - line-height: 28px; - color: var(--primary-text-color--faint); - font-weight: 500; - margin-bottom: 20px; - padding: 0 10px; - word-wrap: break-word; - - @media screen and (max-width: 740px) { - text-align: center; - padding: 20px 10px 0; - } - - a { - color: inherit; - text-decoration: none; - } - - small { - font-weight: 400; - color: var(--primary-text-color--faint); - } - - img { - display: inline-block; - margin-bottom: -5px; - margin-right: 15px; - width: 36px; - height: 36px; - } - } -} diff --git a/app/styles/containers.scss b/app/styles/containers.scss index 53bd272c2f..74eebe61ee 100644 --- a/app/styles/containers.scss +++ b/app/styles/containers.scss @@ -1,14 +1,3 @@ -.container-alt { - width: 700px; - margin: 0 auto; - margin-top: 40px; - - @media screen and (max-width: 740px) { - width: 100%; - margin: 0; - } -} - .logo-container { margin: 100px auto 50px; @@ -111,80 +100,3 @@ margin-left: 8px; } } - -.grid-3 { - display: grid; - grid-gap: 10px; - grid-template-columns: 3fr 1fr; - grid-auto-columns: 25%; - grid-auto-rows: max-content; - - .column-0 { - grid-column: 1 / 3; - grid-row: 1; - } - - .column-1 { - grid-column: 1; - grid-row: 2; - } - - .column-2 { - grid-column: 2; - grid-row: 2; - } - - .column-3 { - grid-column: 1 / 3; - grid-row: 3; - } - - .landing-page__call-to-action { - min-height: 100%; - } - - @media screen and (max-width: 738px) { - grid-template-columns: minmax(0, 50%) minmax(0, 50%); - - .landing-page__call-to-action { - padding: 20px; - display: flex; - align-items: center; - justify-content: center; - } - - .row__information-board { - width: 100%; - justify-content: center; - align-items: center; - } - - .row__mascot { - display: none; - } - } - - @media screen and (max-width: $no-gap-breakpoint) { - grid-gap: 0; - grid-template-columns: minmax(0, 100%); - - .column-0 { - grid-column: 1; - } - - .column-1 { - grid-column: 1; - grid-row: 3; - } - - .column-2 { - grid-column: 1; - grid-row: 2; - } - - .column-3 { - grid-column: 1; - grid-row: 4; - } - } -} diff --git a/app/styles/forms.scss b/app/styles/forms.scss index 5471f97787..147199870a 100644 --- a/app/styles/forms.scss +++ b/app/styles/forms.scss @@ -542,155 +542,6 @@ code { font-size: 24px; } -.flash-message { - background: var(--brand-color--med); - color: var(--primary-text-color--faint); - border-radius: 4px; - padding: 15px 10px; - margin-bottom: 30px; - text-align: center; - - &.notice { - border: 1px solid rgba($valid-value-color, 0.5); - background: rgba($valid-value-color, 0.25); - color: $valid-value-color; - } - - &.alert { - border: 1px solid rgba($error-value-color, 0.5); - background: rgba($error-value-color, 0.25); - color: $error-value-color; - } - - a { - display: inline-block; - color: var(--primary-text-color--faint); - text-decoration: none; - - &:hover { - color: var(--primary-text-color); - text-decoration: underline; - } - } - - p { - margin-bottom: 15px; - } - - .oauth-code { - outline: 0; - box-sizing: border-box; - display: block; - width: 100%; - border: 0; - padding: 10px; - font-family: var(--font-monospace), monospace; - background: var(--brand-color--med); - color: var(--primary-text-color); - font-size: 14px; - margin: 0; - - &::-moz-focus-inner { - border: 0; - } - - &::-moz-focus-inner, - &:focus, - &:active { - outline: 0 !important; - } - - &:focus { - background: var(--brand-color--faint); - } - } - - strong { - font-weight: 500; - - @each $lang in $cjk-langs { - &:lang(#{$lang}) { - font-weight: 700; - } - } - } - - @media screen and (max-width: 740px) and (min-width: 441px) { - margin-top: 40px; - } -} - -.form-footer { - margin-top: 30px; - text-align: center; - - a { - color: var(--primary-text-color--faint); - text-decoration: none; - - &:hover { - text-decoration: underline; - } - } -} - -.quick-nav { - list-style: none; - margin-bottom: 25px; - font-size: 14px; - - li { - display: inline-block; - margin-right: 10px; - } - - a { - color: var(--highlight-text-color); - text-transform: uppercase; - text-decoration: none; - font-weight: 700; - - &:hover, - &:focus, - &:active { - color: var(--highlight-text-color); - } - } -} - -.oauth-prompt, -.follow-prompt { - margin-bottom: 30px; - color: var(--primary-text-color--faint); - - h2 { - font-size: 16px; - margin-bottom: 30px; - text-align: center; - } - - strong { - color: var(--primary-text-color--faint); - font-weight: 500; - - @each $lang in $cjk-langs { - &:lang(#{$lang}) { - font-weight: 700; - } - } - } - - @media screen and (max-width: 740px) and (min-width: 441px) { - margin-top: 40px; - } -} - -.qr-wrapper { - display: flex; - flex-wrap: wrap; - align-items: flex-start; -} - .qr-code { flex: 0 0 auto; background: var(--foreground-color); @@ -705,35 +556,7 @@ code { } } -.qr-alternative { - margin-bottom: 20px; - color: var(--primary-text-color--faint); - flex: 150px; - - samp { - display: block; - font-size: 14px; - } -} - -.table-form { - p { - margin-bottom: 15px; - - strong { - font-weight: 500; - - @each $lang in $cjk-langs { - &:lang(#{$lang}) { - font-weight: 700; - } - } - } - } -} - -.simple_form, -.table-form { +.simple_form { .warning { box-sizing: border-box; background: rgba($error-value-color, 0.5); @@ -773,173 +596,6 @@ code { } } -.action-pagination { - display: flex; - flex-wrap: wrap; - align-items: center; - - .actions, - .pagination { - flex: 1 1 auto; - } - - .actions { - padding: 30px 0; - padding-right: 20px; - flex: 0 0 auto; - } -} - -.post-follow-actions { - text-align: center; - color: var(--primary-text-color--faint); - - div { - margin-bottom: 4px; - } -} - -.alternative-login { - margin-top: 20px; - margin-bottom: 20px; - - h4 { - font-size: 16px; - color: var(--primary-text-color); - text-align: center; - margin-bottom: 20px; - border: 0; - padding: 0; - } - - .button { - display: block; - } -} - -.scope-danger { - color: $warning-red; -} - -.form_admin_settings_site_short_description, -.form_admin_settings_site_description, -.form_admin_settings_site_extended_description, -.form_admin_settings_site_terms, -.form_admin_settings_custom_css, -.form_admin_settings_closed_registrations_message { - textarea { - font-family: var(--font-monospace), monospace; - } -} - -.input-copy { - background: var(--background-color); - border: 1px solid var(--background-color); - border-radius: 4px; - display: flex; - align-items: center; - padding-right: 4px; - position: relative; - top: 1px; - transition: border-color 300ms linear; - - &__wrapper { - flex: 1 1 auto; - } - - input[type=text] { - background: transparent; - border: 0; - padding: 10px; - font-size: 14px; - font-family: var(--font-monospace), monospace; - } - - button { - flex: 0 0 auto; - margin: 4px; - text-transform: none; - font-weight: 400; - font-size: 14px; - padding: 7px 18px; - padding-bottom: 6px; - width: auto; - transition: background 300ms linear; - } - - &.copied { - border-color: $valid-value-color; - transition: none; - - button { - background: $valid-value-color; - transition: none; - } - } -} - -.connection-prompt { - margin-bottom: 25px; - - .fa-link { - background-color: var(--brand-color--med); - border-radius: 100%; - font-size: 24px; - padding: 10px; - } - - &__column { - align-items: center; - display: flex; - flex: 1; - flex-direction: column; - flex-shrink: 1; - max-width: 50%; - - &-sep { - align-self: center; - flex-grow: 0; - overflow: visible; - position: relative; - z-index: 1; - } - - p { - word-break: break-word; - } - } - - .account__avatar { - margin-bottom: 20px; - } - - &__connection { - background-color: var(--brand-color--med); - box-shadow: 0 0 15px rgba($base-shadow-color, 0.2); - border-radius: 4px; - padding: 25px 10px; - position: relative; - text-align: center; - - &::after { - background-color: var(--brand-color--med); - content: ''; - display: block; - height: 100%; - left: 50%; - position: absolute; - top: 0; - width: 1px; - } - } - - &__row { - align-items: flex-start; - display: flex; - flex-direction: row; - } -} - .columns-area { form.simple_form { padding: 15px; diff --git a/app/styles/lists.scss b/app/styles/lists.scss deleted file mode 100644 index 6019cd8002..0000000000 --- a/app/styles/lists.scss +++ /dev/null @@ -1,19 +0,0 @@ -.no-list { - list-style: none; - - li { - display: inline-block; - margin: 0 5px; - } -} - -.recovery-codes { - list-style: none; - margin: 0 auto; - - li { - font-size: 125%; - line-height: 1.5; - letter-spacing: 1px; - } -} diff --git a/app/styles/tables.scss b/app/styles/tables.scss index 8fbe8cca60..bb7c07a3a3 100644 --- a/app/styles/tables.scss +++ b/app/styles/tables.scss @@ -224,20 +224,4 @@ a.table-action-link { font-weight: 700; } } - - .nothing-here { - border: 1px solid var(--background-color); - border-top: 0; - box-shadow: none; - - @media screen and (max-width: $no-gap-breakpoint) { - border-top: 1px solid var(--background-color); - } - } - - @media screen and (max-width: 870px) { - .accounts-table tbody td.optional { - display: none; - } - } } diff --git a/app/styles/ui.scss b/app/styles/ui.scss index a8f09663ac..2d4d54f71d 100644 --- a/app/styles/ui.scss +++ b/app/styles/ui.scss @@ -219,12 +219,6 @@ display: flex; } -.domain_buttons { - height: 18px; - padding: 10px; - white-space: nowrap; -} - .muted { .status__content p, .status__content a { @@ -670,52 +664,6 @@ 100% { opacity: 1; } } -.layout-toggle { - display: flex; - padding: 5px; - - button { - box-sizing: border-box; - flex: 0 0 50%; - background: transparent; - padding: 5px; - border: 0; - position: relative; - - &:hover, - &:focus, - &:active { - svg path:first-child { - fill: var(--background-color); - } - } - } - - svg { - width: 100%; - height: auto; - - path:first-child { - fill: var(--brand-color--med); - } - - path:last-child { - fill: var(--background-color); - } - } - - &__active { - color: var(--brand-color); - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - background: var(--brand-color--med); - border-radius: 50%; - padding: 0.35rem; - } -} - .verified-icon { display: inline-block; margin: 0 4px 0 1px; diff --git a/app/styles/widgets.scss b/app/styles/widgets.scss deleted file mode 100644 index 92e8c71216..0000000000 --- a/app/styles/widgets.scss +++ /dev/null @@ -1,534 +0,0 @@ -.hero-widget { - margin-bottom: 10px; - box-shadow: 0 0 15px rgba($base-shadow-color, 0.2); - - &__img { - width: 100%; - position: relative; - overflow: hidden; - border-radius: 4px 4px 0 0; - background: $base-shadow-color; - - img { - object-fit: cover; - display: block; - width: 100%; - height: 100%; - margin: 0; - border-radius: 4px 4px 0 0; - } - } - - &__text { - background: var(--brand-color--med); - padding: 20px; - border-radius: 0 0 4px 4px; - font-size: 15px; - color: var(--primary-text-color--faint); - line-height: 20px; - word-wrap: break-word; - font-weight: 400; - - .emojione { - width: 20px; - height: 20px; - margin: -3px 0 0; - } - - p { - margin-bottom: 20px; - - &:last-child { - margin-bottom: 0; - } - } - - em { - display: inline; - margin: 0; - padding: 0; - font-weight: 700; - background: transparent; - font-family: inherit; - font-size: inherit; - line-height: inherit; - color: var(--primary-text-color); - } - - a { - color: var(--primary-text-color--faint); - text-decoration: none; - - &:hover { - text-decoration: underline; - } - } - } - - @media screen and (max-width: $no-gap-breakpoint) { - display: none; - } -} - -.endorsements-widget { - margin-bottom: 10px; - padding-bottom: 10px; - - h4 { - padding: 10px; - text-transform: uppercase; - font-weight: 700; - font-size: 13px; - color: var(--primary-text-color--faint); - } - - .account { - padding: 10px 0; - - &:last-child { - border-bottom: 0; - } - - .account__display-name { - display: flex; - align-items: center; - } - - .account__avatar { - width: 44px; - height: 44px; - background-size: 44px 44px; - } - } -} - -.box-widget { - padding: 20px; - border-radius: 4px; - background: var(--background-color); - box-shadow: 0 0 1px 1px rgba($base-shadow-color, 0.2); -} - -.contact-widget, -.landing-page__information.contact-widget { - box-sizing: border-box; - padding: 20px; - min-height: 100%; - border-radius: 4px; - background: var(--brand-color--med); - box-shadow: 0 0 15px rgba($base-shadow-color, 0.2); -} - -.contact-widget { - font-size: 15px; - color: var(--primary-text-color--faint); - line-height: 20px; - word-wrap: break-word; - font-weight: 400; - - strong { - font-weight: 500; - } - - p { - margin-bottom: 10px; - - &:last-child { - margin-bottom: 0; - } - } - - &__mail { - margin-top: 10px; - - a { - color: var(--primary-text-color); - text-decoration: none; - } - } -} - -.moved-account-widget { - padding: 15px; - padding-bottom: 20px; - border-radius: 4px; - background: var(--brand-color--med); - box-shadow: 0 0 15px rgba($base-shadow-color, 0.2); - color: var(--primary-text-color--faint); - font-weight: 400; - margin-bottom: 10px; - - strong, - a { - font-weight: 500; - - @each $lang in $cjk-langs { - &:lang(#{$lang}) { - font-weight: 700; - } - } - } - - a { - color: inherit; - text-decoration: underline; - - &.mention { - text-decoration: none; - - span { - text-decoration: none; - } - - &:focus, - &:hover, - &:active { - text-decoration: none; - - span { - text-decoration: underline; - } - } - } - } - - &__message { - margin-bottom: 15px; - - .fa { - margin-right: 5px; - color: var(--primary-text-color--faint); - } - } - - &__card { - .detailed-status__display-avatar { - position: relative; - cursor: pointer; - } - - .detailed-status__display-name { - margin-bottom: 0; - text-decoration: none; - - span { - font-weight: 400; - } - } - } -} - -.memoriam-widget { - padding: 20px; - border-radius: 4px; - background: $base-shadow-color; - box-shadow: 0 0 15px rgba($base-shadow-color, 0.2); - font-size: 14px; - color: var(--primary-text-color--faint); - margin-bottom: 10px; -} - -.page-header { - background: var(--brand-color--med); - box-shadow: 0 0 15px rgba($base-shadow-color, 0.2); - border-radius: 4px; - padding: 60px 15px; - text-align: center; - margin: 10px 0; - - h1 { - color: var(--primary-text-color); - font-size: 36px; - line-height: 1.1; - font-weight: 700; - margin-bottom: 10px; - } - - p { - font-size: 15px; - color: var(--primary-text-color--faint); - } - - @media screen and (max-width: $no-gap-breakpoint) { - margin-top: 0; - background: var(--brand-color--faint); - - h1 { - font-size: 24px; - } - } -} - -.directory { - background: var(--brand-color--med); - border-radius: 4px; - box-shadow: 0 0 15px rgba($base-shadow-color, 0.2); - - &__tag { - box-sizing: border-box; - margin-bottom: 10px; - - & > a, - & > div { - display: flex; - align-items: center; - justify-content: space-between; - background: var(--brand-color--med); - border-radius: 4px; - padding: 15px; - text-decoration: none; - color: inherit; - box-shadow: 0 0 15px rgba($base-shadow-color, 0.2); - } - - & > a { - &:hover, - &:active, - &:focus { - background: var(--brand-color--med); - } - } - - &.active > a { - background: var(--brand-color); - cursor: default; - } - - &.disabled > div { - opacity: 0.5; - cursor: default; - } - - h4 { - flex: 1 1 auto; - font-size: 18px; - font-weight: 700; - color: var(--primary-text-color); - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - - .fa { - color: var(--primary-text-color--faint); - } - - small { - display: block; - font-weight: 400; - font-size: 15px; - margin-top: 8px; - color: var(--primary-text-color--faint); - } - } - - &.active h4 { - &, - .fa, - small { - color: var(--primary-text-color); - } - } - - .avatar-stack { - flex: 0 0 auto; - width: (36px + 4px) * 3; - } - - &.active .avatar-stack .account__avatar { - border-color: var(--brand-color); - } - } -} - -.avatar-stack { - display: flex; - justify-content: flex-end; - - .account__avatar { - flex: 0 0 auto; - width: 36px; - height: 36px; - border-radius: 50%; - position: relative; - margin-left: -10px; - background: var(--background-color); - border: 2px solid var(--brand-color--med); - - &:nth-child(1) { - z-index: 1; - } - - &:nth-child(2) { - z-index: 2; - } - - &:nth-child(3) { - z-index: 3; - } - } -} - -.accounts-table { - width: 100%; - - .account { - padding: 0; - border: 0; - } - - strong { - font-weight: 700; - } - - thead th { - text-align: center; - text-transform: uppercase; - color: var(--primary-text-color--faint); - font-weight: 700; - padding: 10px; - - &:first-child { - text-align: left; - } - } - - tbody td { - padding: 15px 0; - vertical-align: middle; - border-bottom: 1px solid var(--brand-color--med); - } - - tbody tr:last-child td { - border-bottom: 0; - } - - &__count { - width: 120px; - text-align: center; - font-size: 15px; - font-weight: 500; - color: var(--primary-text-color); - - small { - display: block; - color: var(--primary-text-color--faint); - font-weight: 400; - font-size: 14px; - } - } - - &__comment { - width: 50%; - vertical-align: initial !important; - } - - @media screen and (max-width: $no-gap-breakpoint) { - tbody td.optional { - display: none; - } - } -} - -.moved-account-widget, -.memoriam-widget, -.box-widget, -.contact-widget, -.landing-page__information.contact-widget, -.directory, -.page-header { - @media screen and (max-width: $no-gap-breakpoint) { - margin-bottom: 0; - box-shadow: none; - border-radius: 0; - } -} - -$maximum-width: 1235px; -$fluid-breakpoint: $maximum-width + 20px; - -.statuses-grid { - min-height: 600px; - - @media screen and (max-width: 640px) { - width: 100% !important; // Masonry layout is unnecessary at this width - } - - &__item { - width: (960px - 20px) / 3; - - @media screen and (max-width: $fluid-breakpoint) { - width: (940px - 20px) / 3; - } - - @media screen and (max-width: 640px) { - width: 100%; - } - - @media screen and (max-width: $no-gap-breakpoint) { - width: 100vw; - } - } - - .detailed-status { - border-radius: 4px; - - @media screen and (max-width: $no-gap-breakpoint) { - border-top: 1px solid var(--background-color); - } - - &.compact { - .detailed-status__meta { - margin-top: 15px; - } - - .status__content { - font-size: 15px; - line-height: 20px; - - .emojione { - width: 20px; - height: 20px; - margin: -3px 0 0; - } - - .status__content__spoiler-link { - line-height: 20px; - margin: 0; - } - } - - .media-gallery, - .status-card, - .video-player { - margin-top: 15px; - } - } - } -} - -.notice-widget { - margin-bottom: 10px; - color: var(--primary-text-color--faint); - - p { - margin-bottom: 10px; - - &:last-child { - margin-bottom: 0; - } - } - - a { - font-size: 14px; - line-height: 20px; - text-decoration: none; - font-weight: 500; - color: var(--brand-color); - - &:hover, - &:focus, - &:active { - text-decoration: underline; - } - } -} From c597200798a5bb2485c681be2767df1149d30037 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Sep 2020 23:20:15 -0500 Subject: [PATCH 32/43] Remove unused CSS, #439 --- app/styles/about.scss | 952 --------------------------------- app/styles/application.scss | 11 +- app/styles/dashboard.scss | 76 --- app/styles/rtl.scss | 79 +-- app/styles/stream_entries.scss | 159 ------ app/styles/tables.scss | 227 -------- 6 files changed, 7 insertions(+), 1497 deletions(-) delete mode 100644 app/styles/dashboard.scss delete mode 100644 app/styles/stream_entries.scss delete mode 100644 app/styles/tables.scss diff --git a/app/styles/about.scss b/app/styles/about.scss index 915cfd1f83..6a09753a6c 100644 --- a/app/styles/about.scss +++ b/app/styles/about.scss @@ -1,7 +1,5 @@ $maximum-width: 1235px; $fluid-breakpoint: $maximum-width + 20px; -$column-breakpoint: 700px; -$small-breakpoint: 960px; .public-layout { .container { @@ -194,477 +192,6 @@ $small-breakpoint: 960px; } } } - - $no-columns-breakpoint: 600px; - - .grid { - display: grid; - grid-gap: 10px; - grid-template-columns: minmax(300px, 3fr) minmax(298px, 1fr); - grid-auto-columns: 25%; - grid-auto-rows: max-content; - - .column-0 { - grid-row: 1; - grid-column: 1; - } - - .column-1 { - grid-row: 1; - grid-column: 2; - } - - @media screen and (max-width: $no-columns-breakpoint) { - grid-template-columns: 100%; - grid-gap: 0; - - .column-1 { - display: none; - } - } - } - - .public-account-header { - overflow: hidden; - margin-bottom: 10px; - box-shadow: 0 0 15px rgba($base-shadow-color, 0.2); - - &.inactive { - opacity: 0.5; - - .public-account-header__image, - .avatar { - filter: grayscale(100%); - } - - .logo-button { - background-color: var(--primary-text-color--faint); - } - } - - &__image { - border-radius: 4px 4px 0 0; - overflow: hidden; - height: 300px; - position: relative; - background: var(--background-color); - - &::after { - content: ""; - display: block; - position: absolute; - width: 100%; - height: 100%; - box-shadow: inset 0 -1px 1px 1px rgba($base-shadow-color, 0.15); - top: 0; - left: 0; - } - - img { - object-fit: cover; - display: block; - width: 100%; - height: 100%; - margin: 0; - border-radius: 4px 4px 0 0; - } - - @media screen and (max-width: 600px) { - height: 200px; - } - } - - &--no-bar { - margin-bottom: 0; - - .public-account-header__image, - .public-account-header__image img { - border-radius: 4px; - - @media screen and (max-width: $no-gap-breakpoint) { - border-radius: 0; - } - } - } - - @media screen and (max-width: $no-gap-breakpoint) { - margin-bottom: 0; - box-shadow: none; - - &__image::after { - display: none; - } - - &__image, - &__image img { - border-radius: 0; - } - } - - &__bar { - position: relative; - margin-top: -80px; - display: flex; - justify-content: flex-start; - - &::before { - content: ""; - display: block; - background: var(--brand-color--faint); - position: absolute; - bottom: 0; - left: 0; - right: 0; - height: 60px; - border-radius: 0 0 4px 4px; - z-index: -1; - } - - .avatar { - display: block; - width: 120px; - height: 120px; - padding-left: 20px - 4px; - flex: 0 0 auto; - - img { - display: block; - width: 100%; - height: 100%; - margin: 0; - border-radius: 50%; - border: 4px solid var(--brand-color--faint); - background: var(--background-color); - } - } - - @media screen and (max-width: 600px) { - margin-top: 0; - background: var(--brand-color--faint); - border-radius: 0 0 4px 4px; - padding: 5px; - - &::before { - display: none; - } - - .avatar { - width: 48px; - height: 48px; - padding: 7px 0; - padding-left: 10px; - - img { - border: 0; - border-radius: 4px; - } - - @media screen and (max-width: 360px) { - display: none; - } - } - } - - @media screen and (max-width: $no-gap-breakpoint) { - border-radius: 0; - } - - @media screen and (max-width: $no-columns-breakpoint) { - flex-wrap: wrap; - } - } - - &__tabs { - flex: 1 1 auto; - margin-left: 20px; - - &__name { - padding-top: 20px; - padding-bottom: 8px; - - h1 { - font-size: 20px; - line-height: 18px * 1.5; - color: var(--primary-text-color); - font-weight: 500; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - text-shadow: 1px 1px 1px $base-shadow-color; - - small { - display: block; - font-size: 14px; - color: var(--primary-text-color); - font-weight: 400; - overflow: hidden; - text-overflow: ellipsis; - } - } - } - - @media screen and (max-width: 600px) { - margin-left: 15px; - display: flex; - justify-content: space-between; - align-items: center; - - &__name { - padding-top: 0; - padding-bottom: 0; - - h1 { - font-size: 16px; - line-height: 24px; - text-shadow: none; - - small { - color: var(--primary-text-color--faint); - } - } - } - } - - &__tabs { - display: flex; - justify-content: flex-start; - align-items: stretch; - height: 58px; - - .details-counters { - display: flex; - flex-direction: row; - min-width: 300px; - } - - @media screen and (max-width: $no-columns-breakpoint) { - .details-counters { - display: none; - } - } - - .counter { - width: 33.3%; - box-sizing: border-box; - flex: 0 0 auto; - color: var(--primary-text-color--faint); - padding: 10px; - border-right: 1px solid var(--brand-color--faint); - cursor: default; - text-align: center; - position: relative; - - a { - display: block; - } - - &:last-child { - border-right: 0; - } - - &::after { - display: block; - content: ""; - position: absolute; - bottom: 0; - left: 0; - width: 100%; - border-bottom: 4px solid var(--brand-color); - opacity: 0.5; - transition: all 400ms ease; - } - - &.active { - &::after { - border-bottom: 4px solid var(--highlight-text-color); - opacity: 1; - } - - &.inactive::after { - border-bottom-color: var(--primary-text-color--faint); - } - } - - &:hover { - &::after { - opacity: 1; - transition-duration: 100ms; - } - } - - a { - text-decoration: none; - color: inherit; - } - - .counter-label { - font-size: 12px; - display: block; - } - - .counter-number { - font-weight: 500; - font-size: 18px; - margin-bottom: 5px; - color: var(--primary-text-color); - font-family: var(--font-display), sans-serif; - } - } - - .spacer { - flex: 1 1 auto; - height: 1px; - } - - &__buttons { - padding: 7px 8px; - } - } - } - - &__extra { - display: none; - margin-top: 4px; - - .public-account-bio { - border-radius: 0; - box-shadow: none; - background: transparent; - margin: 0 -5px; - - .roles { - display: none; - } - } - - &__links { - margin-top: -15px; - font-size: 14px; - color: var(--primary-text-color--faint); - - a { - display: inline-block; - color: var(--primary-text-color--faint); - text-decoration: none; - padding: 15px; - font-weight: 500; - - strong { - font-weight: 700; - color: var(--primary-text-color); - } - } - } - - @media screen and (max-width: $no-columns-breakpoint) { - display: block; - flex: 100%; - } - } - } - - .account__section-headline { - border-radius: 4px 4px 0 0; - - @media screen and (max-width: $no-gap-breakpoint) { - border-radius: 0; - } - } - - .detailed-status__meta { - margin-top: 25px; - } - - .public-account-bio { - background: var(--brand-color--med); - box-shadow: 0 0 15px rgba($base-shadow-color, 0.2); - border-radius: 4px; - overflow: hidden; - margin-bottom: 10px; - - @media screen and (max-width: $no-gap-breakpoint) { - box-shadow: none; - margin-bottom: 0; - border-radius: 0; - } - - .account__header__content { - padding: 20px; - padding-bottom: 0; - color: var(--primary-text-color); - } - - &__extra, - .roles { - padding: 20px; - font-size: 14px; - color: var(--primary-text-color--faint); - } - - .roles { - padding-bottom: 0; - } - } - - .static-icon-button { - color: var(--brand-color); - font-size: 18px; - - & > span { - font-size: 14px; - font-weight: 500; - } - } - - .card-grid { - display: flex; - flex-wrap: wrap; - min-width: 100%; - margin: 0 -5px; - - & > div { - box-sizing: border-box; - flex: 1 0 auto; - width: 300px; - padding: 0 5px; - margin-bottom: 10px; - max-width: 33.333%; - - @media screen and (max-width: 900px) { - max-width: 50%; - } - - @media screen and (max-width: 600px) { - max-width: 100%; - } - } - - @media screen and (max-width: $no-gap-breakpoint) { - margin: 0; - border-top: 1px solid var(--brand-color--med); - - & > div { - width: 100%; - padding: 0; - margin-bottom: 0; - border-bottom: 1px solid var(--brand-color--med); - - &:last-child { - border-bottom: 0; - } - - .card__bar { - background: var(--brand-color--med); - - &:hover, - &:active, - &:focus { - background: var(--brand-color--faint); - } - } - } - } - } } .container { @@ -831,481 +358,6 @@ $small-breakpoint: 960px; } } -.information-board { - background: var(--brand-color--med); - padding: 20px 0; - - &__sections { - display: flex; - justify-content: space-between; - flex-wrap: wrap; - } - - &__section { - flex: 1 0 0; - font-family: var(--font-sans-serif), sans-serif; - font-size: 16px; - line-height: 28px; - color: var(--primary-text-color); - text-align: right; - padding: 10px 15px; - - span, - strong { - display: block; - } - - span { - &:last-child { - color: var(--primary-text-color--faint); - } - } - - strong { - font-family: var(--font-display), sans-serif; - font-weight: 500; - font-size: 32px; - line-height: 48px; - } - - @media screen and (max-width: $column-breakpoint) { - text-align: center; - } - } - - .panel { - position: absolute; - width: 280px; - box-sizing: border-box; - background: var(--background-color); - padding: 20px; - padding-top: 10px; - border-radius: 4px 4px 0 0; - right: 0; - bottom: -40px; - - .panel-header { - font-family: var(--font-display), sans-serif; - font-size: 14px; - line-height: 24px; - font-weight: 500; - color: var(--primary-text-color--faint); - padding-bottom: 5px; - margin-bottom: 15px; - border-bottom: 1px solid var(--brand-color--faint); - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; - - a, - span { - font-weight: 400; - color: var(--primary-text-color); - } - - a { - text-decoration: none; - } - } - } - - .owner { - text-align: center; - - .avatar { - width: 80px; - height: 80px; - margin: 0 auto; - margin-bottom: 15px; - - img { - display: block; - width: 80px; - height: 80px; - border-radius: 48px; - } - } - - .name { - font-size: 14px; - - a { - display: block; - color: var(--primary-text-color); - text-decoration: none; - - &:hover { - .display_name { - text-decoration: underline; - } - } - } - - .username { - display: block; - color: var(--primary-text-color--faint); - } - } - } -} - -.landing-page { - p, - li { - font-family: var(--font-sans-serif), sans-serif; - font-size: 16px; - font-weight: 400; - font-size: 16px; - line-height: 30px; - margin-bottom: 12px; - color: var(--primary-text-color--faint); - - a { - color: var(--highlight-text-color); - text-decoration: underline; - } - } - - em { - display: inline; - margin: 0; - padding: 0; - font-weight: 700; - background: transparent; - font-family: inherit; - font-size: inherit; - line-height: inherit; - color: var(--primary-text-color); - } - - h1 { - font-family: var(--font-display), sans-serif; - font-size: 26px; - line-height: 30px; - font-weight: 500; - margin-bottom: 20px; - color: var(--primary-text-color--faint); - - small { - font-family: var(--font-sans-serif), sans-serif; - display: block; - font-size: 18px; - font-weight: 400; - color: var(--primary-text-color); - } - } - - h2 { - font-family: var(--font-display), sans-serif; - font-size: 22px; - line-height: 26px; - font-weight: 500; - margin-bottom: 20px; - color: var(--primary-text-color--faint); - } - - h3 { - font-family: var(--font-display), sans-serif; - font-size: 18px; - line-height: 24px; - font-weight: 500; - margin-bottom: 20px; - color: var(--primary-text-color--faint); - } - - h4 { - font-family: var(--font-display), sans-serif; - font-size: 16px; - line-height: 24px; - font-weight: 500; - margin-bottom: 20px; - color: var(--primary-text-color--faint); - } - - h5 { - font-family: var(--font-display), sans-serif; - font-size: 14px; - line-height: 24px; - font-weight: 500; - margin-bottom: 20px; - color: var(--primary-text-color--faint); - } - - h6 { - font-family: var(--font-display), sans-serif; - font-size: 12px; - line-height: 24px; - font-weight: 500; - margin-bottom: 20px; - color: var(--primary-text-color--faint); - } - - ul, - ol { - margin-left: 20px; - - &[type='a'] { - list-style-type: lower-alpha; - } - - &[type='i'] { - list-style-type: lower-roman; - } - } - - ul { - list-style: disc; - } - - ol { - list-style: decimal; - } - - li > ol, - li > ul { - margin-top: 6px; - } - - hr { - width: 100%; - height: 0; - border: 0; - border-bottom: 1px solid hsla(var(--background-color_hsl), .6); - margin: 20px 0; - - &.spacer { - height: 1px; - border: 0; - } - } - - &__information, - &__forms { - padding: 20px; - } - - &__call-to-action { - background: var(--brand-color--med); - border-radius: 4px; - padding: 25px 40px; - overflow: hidden; - box-sizing: border-box; - - .row { - width: 100%; - display: flex; - flex-direction: row-reverse; - flex-wrap: nowrap; - justify-content: space-between; - align-items: center; - } - - .row__information-board { - display: flex; - justify-content: flex-end; - align-items: flex-end; - - .information-board__section { - flex: 1 0 auto; - padding: 0 10px; - } - - @media screen and (max-width: $no-gap-breakpoint) { - width: 100%; - justify-content: space-between; - } - } - - .row__mascot { - flex: 1; - margin: 10px -50px 0 0; - - @media screen and (max-width: $no-gap-breakpoint) { - display: none; - } - } - } - - &__logo { - margin-right: 20px; - - img { - height: 50px; - width: auto; - mix-blend-mode: lighten; - } - } - - &__information { - padding: 45px 40px; - margin-bottom: 10px; - - &:last-child { - margin-bottom: 0; - } - - strong { - font-weight: 500; - color: var(--primary-text-color); - } - - .account { - border-bottom: 0; - padding: 0; - - &__display-name { - align-items: center; - display: flex; - margin-right: 5px; - } - - div.account__display-name { - &:hover { - .display-name strong { - text-decoration: none; - } - } - - .account__avatar { - cursor: default; - } - } - - &__avatar-wrapper { - margin-left: 0; - flex: 0 0 auto; - } - - &__avatar { - width: 44px; - height: 44px; - background-size: 44px 44px; - } - - .display-name { - font-size: 15px; - - &__account { - font-size: 14px; - } - } - } - - @media screen and (max-width: $small-breakpoint) { - .contact { - margin-top: 30px; - } - } - - @media screen and (max-width: $column-breakpoint) { - padding: 25px 20px; - } - } - - &__information, - &__forms, - #soapbox-timeline { - box-sizing: border-box; - background: var(--brand-color--med); - border-radius: 4px; - box-shadow: 0 0 6px rgba(#000000, 0.1); - } - - &__mascot { - height: 104px; - position: relative; - left: -40px; - bottom: 25px; - - img { - height: 190px; - width: auto; - } - } - - &__short-description { - .row { - display: flex; - flex-wrap: wrap; - align-items: center; - margin-bottom: 40px; - } - - @media screen and (max-width: $column-breakpoint) { - .row { - margin-bottom: 20px; - } - } - - p a { - color: var(--primary-text-color--faint); - } - - h1 { - font-weight: 500; - color: var(--primary-text-color); - margin-bottom: 0; - - small { - color: var(--primary-text-color--faint); - - span { - color: var(--primary-text-color--faint); - } - } - } - - p:last-child { - margin-bottom: 0; - } - } - - &__hero { - margin-bottom: 10px; - - img { - display: block; - margin: 0; - max-width: 100%; - height: auto; - border-radius: 4px; - } - } - - @media screen and (max-width: 840px) { - .information-board { - .panel { - position: static; - margin-top: 20px; - width: 100%; - border-radius: 4px; - - .panel-header { - text-align: center; - } - } - } - } - - @media screen and (max-width: 675px) { - .header-wrapper { - padding-top: 0; - - &.compact { - padding-bottom: 0; - } - - &.compact .hero .heading { - text-align: initial; - } - } - } - - .cta { - margin: 20px; - } -} - .public-layout { position: relative; background-color: var(--brand-color); @@ -1553,10 +605,6 @@ $small-breakpoint: 960px; } } -.public-layout pre.canary { - white-space: pre-wrap; -} - .about-page { background: var(--brand-color--faint); border-radius: inherit; diff --git a/app/styles/application.scss b/app/styles/application.scss index dfa13b9ae6..06e2921d74 100644 --- a/app/styles/application.scss +++ b/app/styles/application.scss @@ -8,7 +8,6 @@ @import 'footer'; @import 'forms'; @import 'accounts'; -@import 'stream_entries'; @import 'boost'; @import 'loading'; @import 'ui'; @@ -16,8 +15,6 @@ // @import 'introduction'; @import 'emoji_picker'; @import 'about'; -@import 'tables'; -@import 'dashboard'; @import 'rtl'; @import 'accessibility'; @import 'donations'; @@ -35,10 +32,10 @@ @import 'components/account-header'; @import 'components/user-panel'; @import 'components/compose-form'; -@import 'components/group-card'; -@import 'components/group-detail'; -@import 'components/group-form'; -@import 'components/group-sidebar-panel'; +// @import 'components/group-card'; +// @import 'components/group-detail'; +// @import 'components/group-form'; +// @import 'components/group-sidebar-panel'; @import 'components/sidebar-menu'; @import 'components/hotkeys-modal'; @import 'components/emoji-reacts'; diff --git a/app/styles/dashboard.scss b/app/styles/dashboard.scss deleted file mode 100644 index 2099c5312d..0000000000 --- a/app/styles/dashboard.scss +++ /dev/null @@ -1,76 +0,0 @@ -.dashboard__counters { - display: flex; - flex-wrap: wrap; - margin: 0 -5px; - margin-bottom: 20px; - - & > div { - box-sizing: border-box; - flex: 0 0 33.333%; - padding: 0 5px; - margin-bottom: 10px; - - & > div, - & > a { - padding: 20px; - background: var(--brand-color--faint); - border-radius: 4px; - } - - & > a { - text-decoration: none; - color: inherit; - display: block; - - &:hover, - &:focus, - &:active { - background: var(--brand-color--med); - } - } - } - - &__num, - &__text { - text-align: center; - font-weight: 500; - font-size: 24px; - line-height: 21px; - color: var(--primary-text-color); - font-family: var(--font-display), sans-serif; - margin-bottom: 20px; - line-height: 30px; - } - - &__text { - font-size: 18px; - } - - &__label { - font-size: 14px; - color: var(--primary-text-color--faint); - text-align: center; - font-weight: 500; - } -} - -.dashboard__widgets { - display: flex; - flex-wrap: wrap; - margin: 0 -5px; - - & > div { - flex: 0 0 33.333%; - margin-bottom: 20px; - - & > div { - padding: 0 5px; - } - } - - a:not(.name-tag) { - color: var(--background-color); - font-weight: 500; - text-decoration: none; - } -} diff --git a/app/styles/rtl.scss b/app/styles/rtl.scss index 848547ee29..e8e59d7345 100644 --- a/app/styles/rtl.scss +++ b/app/styles/rtl.scss @@ -7,16 +7,6 @@ body.rtl { padding-right: 15px; } - .landing-page__logo { - margin-right: 0; - margin-left: 20px; - } - - .landing-page .features-list .features-list__row .visual { - margin-left: 0; - margin-right: 15px; - } - .column-link__icon, .column-header__icon { margin-right: 0; @@ -83,23 +73,16 @@ body.rtl { right: 10px; } - .status, - .activity-stream .status.light { + .status { padding-left: 10px; padding-right: 68px; } - .status__info .status__display-name, - .activity-stream .status.light .status__display-name { + .status__info .status__display-name { padding-left: 25px; padding-right: 0; } - .activity-stream .pre-header { - padding-right: 68px; - padding-left: 0; - } - .status__prepend { margin-left: 0; margin-right: 68px; @@ -110,11 +93,6 @@ body.rtl { right: -26px; } - .activity-stream .pre-header .pre-header__icon { - left: auto; - right: 42px; - } - .account__avatar-overlay-overlay { right: auto; left: 0; @@ -125,8 +103,7 @@ body.rtl { left: 0; } - .status__relative-time, - .activity-stream .status.light .status__header .status__meta { + .status__relative-time { float: left; } @@ -256,44 +233,6 @@ body.rtl { margin-left: 45px; } - .landing-page .header-wrapper .mascot { - right: 60px; - left: auto; - } - - .landing-page__call-to-action .row__information-board { - direction: rtl; - } - - .landing-page .header .hero .floats .float-1 { - left: -120px; - right: auto; - } - - .landing-page .header .hero .floats .float-2 { - left: 210px; - right: auto; - } - - .landing-page .header .hero .floats .float-3 { - left: 110px; - right: auto; - } - - .landing-page .header .links .brand img { - left: 0; - } - - .landing-page .fa-external-link { - padding-right: 5px; - padding-left: 0 !important; - } - - .landing-page .features #soapbox-timeline { - margin-right: 0; - margin-left: 30px; - } - @media screen and (min-width: 631px) { .column, .drawer { @@ -329,18 +268,6 @@ body.rtl { } } - .landing-page__information { - .account__display-name { - margin-right: 0; - margin-left: 5px; - } - - .account__avatar-wrapper { - margin-left: 12px; - margin-right: 0; - } - } - .card__bar .display-name { margin-left: 0; margin-right: 15px; diff --git a/app/styles/stream_entries.scss b/app/styles/stream_entries.scss deleted file mode 100644 index 653454ae25..0000000000 --- a/app/styles/stream_entries.scss +++ /dev/null @@ -1,159 +0,0 @@ -.activity-stream { - box-shadow: 0 0 15px rgba($base-shadow-color, 0.2); - border-radius: 4px; - overflow: hidden; - margin-bottom: 10px; - - @media screen and (max-width: $no-gap-breakpoint) { - margin-bottom: 0; - border-radius: 0; - box-shadow: none; - } - - &--headless { - border-radius: 0; - margin: 0; - box-shadow: none; - - .detailed-status, - .status { - border-radius: 0 !important; - } - } - - div[data-component] { - width: 100%; - } - - .entry { - background: var(--brand-color--med); - - .detailed-status, - .status, - .load-more { - animation: none; - } - - &:last-child { - .detailed-status, - .status, - .load-more { - border-bottom: 0; - border-radius: 0 0 4px 4px; - } - } - - &:first-child { - .detailed-status, - .status, - .load-more { - border-radius: 4px 4px 0 0; - } - - &:last-child { - .detailed-status, - .status, - .load-more { - border-radius: 4px; - } - } - } - - @media screen and (max-width: 740px) { - .detailed-status, - .status, - .load-more { - border-radius: 0 !important; - } - } - } - - &--highlighted .entry { - background: var(--brand-color--med); - } -} - -.button.logo-button { - flex: 0 auto; - font-size: 14px; - background: var(--brand-color); - color: #fff; - text-transform: none; - line-height: 36px; - height: auto; - padding: 3px 15px; - border: 0; - - svg { - width: 20px; - height: auto; - vertical-align: middle; - margin-right: 5px; - fill: var(--primary-text-color); - } - - &:active, - &:focus, - &:hover { - background: var(--brand-color--hicontrast); - } - - &:disabled, - &.disabled { - &:active, - &:focus, - &:hover { - background: var(--brand-color--med); - } - } - - &.button--destructive { - &:active, - &:focus, - &:hover { - background: $error-red; - } - } - - @media screen and (max-width: $no-gap-breakpoint) { - svg { - display: none; - } - } -} - -.embed, -.public-layout { - .detailed-status { - padding: 15px; - } - - .status { - padding: 15px 15px 15px (48px + 15px * 2); - min-height: 48px + 2px; - - &__avatar { - left: 15px; - top: 17px; - } - - &__content { - padding-top: 5px; - } - - &__prepend { - margin-left: 48px + 15px * 2; - padding-top: 15px; - } - - &__prepend-icon-wrapper { - left: -32px; - } - - .media-gallery, - &__action-bar, - .video-player { - margin-top: 10px; - } - } -} diff --git a/app/styles/tables.scss b/app/styles/tables.scss deleted file mode 100644 index bb7c07a3a3..0000000000 --- a/app/styles/tables.scss +++ /dev/null @@ -1,227 +0,0 @@ -.table { - width: 100%; - max-width: 100%; - border-spacing: 0; - border-collapse: collapse; - - th, - td { - padding: 8px; - line-height: 18px; - vertical-align: top; - border-top: 1px solid var(--brand-color--med); - text-align: left; - background: var(--brand-color--med); - } - - & > thead > tr > th { - vertical-align: bottom; - border-bottom: 2px solid var(--brand-color--med); - border-top: 0; - font-weight: 500; - } - - & > tbody > tr > th { - font-weight: 500; - } - - & > tbody > tr:nth-child(odd) > td, - & > tbody > tr:nth-child(odd) > th { - background: var(--brand-color--med); - } - - a { - color: var(--highlight-text-color); - text-decoration: underline; - - &:hover { - text-decoration: none; - } - } - - strong { - font-weight: 500; - - @each $lang in $cjk-langs { - &:lang(#{$lang}) { - font-weight: 700; - } - } - } - - &.inline-table { - & > tbody > tr:nth-child(odd) { - & > td, - & > th { - background: transparent; - } - } - - & > tbody > tr:first-child { - & > td, - & > th { - border-top: 0; - } - } - } - - &.batch-table { - & > thead > tr > th { - background: var(--brand-color--med); - border-top: 1px solid var(--background-color); - border-bottom: 1px solid var(--background-color); - - &:first-child { - border-radius: 4px 0 0; - border-left: 1px solid var(--background-color); - } - - &:last-child { - border-radius: 0 4px 0 0; - border-right: 1px solid var(--background-color); - } - } - } - - &--invites tbody td { - vertical-align: middle; - } -} - -.table-wrapper { - overflow: auto; - margin-bottom: 20px; -} - -samp { - font-family: var(--font-monospace), monospace; -} - -button.table-action-link { - background: transparent; - border: 0; - font: inherit; -} - -button.table-action-link, -a.table-action-link { - text-decoration: none; - display: inline-block; - margin-right: 5px; - padding: 0 10px; - color: var(--primary-text-color--faint); - font-weight: 500; - - &:hover { - color: var(--primary-text-color); - } - - i.fa { - font-weight: 400; - margin-right: 5px; - } - - &:first-child { - padding-left: 0; - } -} - -.batch-table { - &__toolbar, - &__row { - display: flex; - - &__select { - box-sizing: border-box; - padding: 8px 16px; - cursor: pointer; - min-height: 100%; - - input { - margin-top: 8px; - } - - &--aligned { - display: flex; - align-items: center; - - input { - margin-top: 0; - } - } - - @media screen and (max-width: $no-gap-breakpoint) { - display: none; - } - } - - &__actions, - &__content { - padding: 8px 0; - padding-right: 16px; - flex: 1 1 auto; - } - } - - &__toolbar { - border: 1px solid var(--background-color); - background: var(--brand-color--med); - border-radius: 4px 0 0; - height: 47px; - align-items: center; - - &__actions { - text-align: right; - padding-right: 16px - 5px; - } - - @media screen and (max-width: $no-gap-breakpoint) { - display: none; - } - } - - &__row { - border: 1px solid var(--background-color); - border-top: 0; - background: var(--brand-color--med); - - @media screen and (max-width: $no-gap-breakpoint) { - &:first-child { - border-top: 1px solid var(--background-color); - } - } - - &:hover { - background: var(--background-color); - } - - &:nth-child(even) { - background: var(--brand-color--med); - - &:hover { - background: var(--brand-color--faint); - } - } - - &__content { - padding-top: 12px; - padding-bottom: 16px; - - &--unpadded { - padding: 0; - } - } - } - - .status__content { - padding-top: 0; - - summary { - display: list-item; - } - - strong { - font-weight: 700; - } - } -} From 3d81dd2892f67236878f54228da8f2e0981946ed Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Sep 2020 23:53:43 -0500 Subject: [PATCH 33/43] DetailedStatus: fix link on display name --- .../status/components/detailed_status.js | Bin 7301 -> 7327 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/status/components/detailed_status.js b/app/soapbox/features/status/components/detailed_status.js index 131de49ecbfe01b2037ea69a278078ebcd13f5a1..ee162810ee286a1b9f7dea4aa78459bce17a6460 100644 GIT binary patch delta 42 ycmZp*oNu{dinwHQPGWJfUt(^mt$JEcequ>xUb=2hW?r`X Date: Mon, 28 Sep 2020 00:01:36 -0500 Subject: [PATCH 34/43] fix spacing on preferences options --- app/styles/dyslexic.scss | 1 + app/styles/forms.scss | 9 +-------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/styles/dyslexic.scss b/app/styles/dyslexic.scss index 9dd348fec6..6db2cadc2f 100644 --- a/app/styles/dyslexic.scss +++ b/app/styles/dyslexic.scss @@ -1,5 +1,6 @@ .dyslexic { font-family: 'OpenDyslexic' !important; + margin-bottom: 8px; } body.dyslexic { diff --git a/app/styles/forms.scss b/app/styles/forms.scss index 147199870a..da97a6006b 100644 --- a/app/styles/forms.scss +++ b/app/styles/forms.scss @@ -13,7 +13,7 @@ code { .simple_form { .input { - margin-bottom: 15px; + margin-bottom: 8px; overflow: hidden; &.hidden { @@ -43,7 +43,6 @@ code { &.boolean { position: relative; - margin-bottom: 0; .label_input > label { font-family: inherit; @@ -111,7 +110,6 @@ code { span.hint { display: block; font-size: 12px; - margin-top: 4px; } p.hint { @@ -172,15 +170,10 @@ code { font-size: 14px; color: var(--primary-text-color); display: block; - margin-bottom: 8px; word-wrap: break-word; font-weight: 500; } - .hint { - margin-top: 6px; - } - ul { flex: 390px; } From 57be8b0e2c6ce16320f21ce06567b7f856dd50c0 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 28 Sep 2020 10:25:12 -0500 Subject: [PATCH 35/43] DetailedStatus: display name spacing hotfix --- app/styles/components/detailed-status.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/styles/components/detailed-status.scss b/app/styles/components/detailed-status.scss index ceab5899c1..5bf63db280 100644 --- a/app/styles/components/detailed-status.scss +++ b/app/styles/components/detailed-status.scss @@ -114,6 +114,10 @@ color: var(--primary-text-color); } + span.hover-ref-wrapper { + display: inline; + } + .display-name__account { display: block; margin-top: -10px; From 061a820ce5b186ac920ebaa48b3effb1d51bc82c Mon Sep 17 00:00:00 2001 From: Mary Kate Date: Mon, 28 Sep 2020 00:57:31 -0500 Subject: [PATCH 36/43] fix language picker dropdown arrow --- .../__snapshots__/forms-test.js.snap | 38 ++++++++++-------- app/soapbox/features/forms/index.js | Bin 5867 -> 5901 bytes app/styles/forms.scss | 18 +++++++++ 3 files changed, 39 insertions(+), 17 deletions(-) diff --git a/app/soapbox/features/forms/__tests__/__snapshots__/forms-test.js.snap b/app/soapbox/features/forms/__tests__/__snapshots__/forms-test.js.snap index 0f1e2df506..1bd05c5fd5 100644 --- a/app/soapbox/features/forms/__tests__/__snapshots__/forms-test.js.snap +++ b/app/soapbox/features/forms/__tests__/__snapshots__/forms-test.js.snap @@ -55,23 +55,27 @@ exports[` renders correctly 1`] = ` `; exports[` renders correctly 1`] = ` - +
+ +
`; exports[` renders correctly 1`] = ` diff --git a/app/soapbox/features/forms/index.js b/app/soapbox/features/forms/index.js index 4330919b3d7c32e8ae4c426d5965eaa6df59c972..5c7951ddb1442f85e7280feccf5f085f543c4360 100644 GIT binary patch delta 50 zcmaE@+pD*sUqm`3vrHj5C$YHLR=qeiCpEc5x4bB^pdhtK-EMN9h$gFzK2XKxZ6c;j E0OK(c_W%F@ delta 16 XcmeCxd#$^nUu5!X5sl3^MNF6gJ!%Gb diff --git a/app/styles/forms.scss b/app/styles/forms.scss index da97a6006b..5025a5a43e 100644 --- a/app/styles/forms.scss +++ b/app/styles/forms.scss @@ -429,6 +429,7 @@ code { } select { + appearance: none; box-sizing: border-box; font-size: 16px; color: var(--primary-text-color); @@ -444,6 +445,23 @@ code { padding-right: 30px; height: 41px; position: relative; + margin-top: 8px; + cursor: pointer; + } + + .select-wrapper::after { + display: block; + font-family: 'ForkAwesome'; + content: ''; + width: 10px; + position: absolute; + right: 12px; + top: 1px; + border-left: 1px solid var(--highlight-text-color); + height: 39px; + padding: 12px; + box-sizing: border-box; + pointer-events: none; } .label_input { From 76b7b32e2331846f3c1526b10cf6a34a9e7bff65 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 28 Sep 2020 13:05:20 -0500 Subject: [PATCH 37/43] Revoke OAuth token on logout, fixes #445 --- app/soapbox/actions/auth.js | Bin 9473 -> 9792 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js index 50a26cd3c4e939a5022f1b9ea637277f970a8bcc..09a225bf55c7badea5646f8216640bc45255ff8e 100644 GIT binary patch delta 260 zcmZqlI^eTGQFyWeFPlhlNn%N=f~`V&YDqANsiA4jH91Z~Z1M$J5fd&2Akf!Wa4acF z%`GTVD9KkyNi8lZ%CA)LcPuT*019NM<|*XoDdgm*=a-g%)K8X^6ywQH1j_0crIrEZ zCkyh4X@ITK16tylrxC3Vl2zAHP){r<08z;~nW=dt@tG;=v6JoiBpiuRT%4L*lv<)5 ptEmHaqyoe#RtjLfll^%mB@>gAQ;Un^!A^v$s|9**v#anPK>!waQKA3< delta 24 gcmX@$)9AH9QFwBIg5cx}Vyu(Hg!wnOitH8y0B@NHaR2}S From edf3612f93b1b91729b5694d384a2145f1338cb5 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 28 Sep 2020 13:52:13 -0500 Subject: [PATCH 38/43] SoapboxConfig: hide CustomCSS for now, #447 --- app/soapbox/features/soapbox_config/index.js | Bin 18654 -> 18662 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/soapbox_config/index.js b/app/soapbox/features/soapbox_config/index.js index a3e775d7ce35f517dd4b7174115d58443d421e5c..9b8b1942dd3b6e84f3b1f5bfeddf3d6e0cdd39d5 100644 GIT binary patch delta 32 ocmcaNk@49?#touo%+>l@ljZfSHv5?!WMxs%(y!gjZ*!gp0KNDMr2qf` delta 43 zcmV+`0M!5HkpbS30k9P|lT0uWlQ1qRlUpt`laM4U-E#8M8e+sSI06 B4yXVC From 7d44e8411198f7823c910ca1be7c4092ad1bb898 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 28 Sep 2020 14:57:15 -0500 Subject: [PATCH 39/43] Timelines: fix existingQueuedStatus bug --- app/soapbox/reducers/timelines.js | Bin 7185 -> 7175 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/reducers/timelines.js b/app/soapbox/reducers/timelines.js index 3c514849ad937440bfe83daba45d5f8998b4747e..c86376406dc047d9597dfd890dc33a8fdfc0ecb8 100644 GIT binary patch delta 12 TcmbPe(QdKfE%)Z{+)@GnBzpxA delta 23 ecmZp-m}s%#EjO25dTNP=dS;5c=H|EDQUU;G^#|$z From fb94664c08d8c75f127042e1ef04dd4c16a67e66 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 28 Sep 2020 15:24:17 -0500 Subject: [PATCH 40/43] Composer: fix #449 hydrate tagHistory --- app/soapbox/reducers/compose.js | Bin 13170 -> 13266 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/reducers/compose.js b/app/soapbox/reducers/compose.js index 1e0b6d6142ea114c4eefcc641e310280008fe034..c72ea6d87109723ceeaba4c06a6263087aefca62 100644 GIT binary patch delta 224 zcmeyAb}4;>GplN~LP=t}M`m$Jeo>`DtwLH+ey)OgaeiV!QhtSgacW6PW?p*nW=q!d z+VwgL>IJ1qIho1on$}zjKv0xgQd*R!P+XE&lB$=RT9lruQ4N+*P)JElODxSPi7zP1 zEK5wTw1No)K=?XPWdx)VPP0<*ocxoWR|O%Wm!4Xpk(gYPnV$!=TQ4(3Qxjrp?dEpF G*NgzHN=)4V delta 32 ocmcbV{wZyPGwbFe)}z{!ON|oQ^omnUG}I^WHB#FA(eNQ70OraKX#fBK From 18d08a3630eb2a3282918fbb394a8120b3000ee2 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 28 Sep 2020 19:05:45 -0500 Subject: [PATCH 41/43] Revert "Composer: remove click listener on unmount" This reverts commit 136965acdd1197bbeeb4123831ca63f8d3c3c65a. --- .../components/autosuggest_textarea.js | Bin 7896 -> 7797 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/components/autosuggest_textarea.js b/app/soapbox/components/autosuggest_textarea.js index 060e817e8468da8c5127d8830cd6ca6e0299e017..703aa97971109463d563019270e3cb5c5e994880 100644 GIT binary patch delta 12 Tcmca%`_*Q{H{s2ZBK2GVD@+Bc delta 48 zcmexrbHjGSH(}-Q%$%IiyxjcKyb=vfg=#JZAV|qiF3nBNE72=T&CM@M-MmeBKNkSj C7ZQg6 From b78a00a306b4d91c29103fac128d7cacb5cefef6 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 28 Sep 2020 19:05:56 -0500 Subject: [PATCH 42/43] Revert "pass getClickableArea into autosuggesttextarea as prop" This reverts commit 99f0a069dd6092e7d9c835a5f2ffc2db42bf14bf. --- .../components/autosuggest_textarea.js | Bin 7797 -> 7889 bytes .../compose/components/compose_form.js | Bin 11615 -> 11564 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/components/autosuggest_textarea.js b/app/soapbox/components/autosuggest_textarea.js index 703aa97971109463d563019270e3cb5c5e994880..e60661f6b268fbaf521c6eab6ac68bdb1c853fff 100644 GIT binary patch delta 144 zcmexrbJ2FgY_`p3*jl*F(^E^Fb25{&6O(dM9g9*E6>JqWG!<;^6soxtfFL Date: Mon, 28 Sep 2020 19:06:06 -0500 Subject: [PATCH 43/43] Revert "fix composer jump by reseting lastToken on click and arrow up and down in autosuggesttextarea" This reverts commit 0b7763e7267108b7ef70713b6ecbf9c85c952d48. --- .../components/autosuggest_textarea.js | Bin 7889 -> 7177 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/components/autosuggest_textarea.js b/app/soapbox/components/autosuggest_textarea.js index e60661f6b268fbaf521c6eab6ac68bdb1c853fff..d9a04402231ba50a4a40fdcec53f97ed8f4106f7 100644 GIT binary patch delta 30 kcmca;+i9_(m~HcHHf^@ajJ%hCSaP#E-w)=^o+2Gw0IISIFaQ7m delta 566 zcmZXSF-yZh6o3aIl(fa_(4mVrNSi>3YpGNbbr39wI4J6nCa?B1xeIrfs+7{XYx6@Y zRGj=1{u@VME>=r(LwG#iz4v`DH*I}&-lVZhh!;@r$?XMjB*49dew$nf9$mdgARXR& z1Wzrvv1cUL#Y)mDRc3`^GB0cchdmajd`r5rC70+=EG@sY169q5I#ho=UnJV2ol80bH0AWgis>`rmUxp5PE0;29 zfrFQ^zit2F4P532pb^*MXrEYmEB^`xI-o$(-L7T-qUVj}6s~@x nA${(}DW2o{{^<~db1D@u5LQD!ghn$nUtz(Fh+*-(H8Xzz@&mSx