From ce6446f059261781ef260850a3133bab46e8aa07 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 20 Jul 2020 17:30:10 -0500
Subject: [PATCH 01/79] Center icon in theme-toggle

---
 app/styles/components/theme-toggle.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/styles/components/theme-toggle.scss b/app/styles/components/theme-toggle.scss
index f1a33e66b9..c0cadc68f4 100644
--- a/app/styles/components/theme-toggle.scss
+++ b/app/styles/components/theme-toggle.scss
@@ -2,7 +2,7 @@
   .setting-toggle {
 
     &__label {
-      margin-bottom: 0px;
+      margin-bottom: 0;
       vertical-align: middle;
     }
 
@@ -11,6 +11,8 @@
 
       &-track-check,
       &-track-x {
+        display: flex;
+        align-items: center;
         height: 15px;
         color: #fff;
       }

From 5c0bef4e9b01968baf96c5c170d295298403e622 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 20 Jul 2020 20:36:11 -0500
Subject: [PATCH 02/79] Fix header .still-image on mobile

---
 app/styles/components/account-header.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/styles/components/account-header.scss b/app/styles/components/account-header.scss
index f20e0c3baf..bfd61aa8ca 100644
--- a/app/styles/components/account-header.scss
+++ b/app/styles/components/account-header.scss
@@ -22,6 +22,7 @@
     background: var(--accent-color--med);
     @media screen and (max-width: 895px) {height: 225px;}
     &--none {height: 125px;}
+
     img {
       object-fit: cover;
       display: block;
@@ -30,6 +31,10 @@
       margin: 0;
     }
 
+    .still-image {
+      height: 100%;
+    }
+
     .still-image--play-on-hover::before {
       content: 'GIF';
       position: absolute;

From f81f5d057bd43c4bd1133dc547456f5d5f13d818 Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Sun, 26 Jul 2020 15:07:53 -0500
Subject: [PATCH 03/79] Make emoji selector text visible on dark mode, fixes
 #249

---
 app/styles/emoji_picker.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/styles/emoji_picker.scss b/app/styles/emoji_picker.scss
index 12dd4f0848..e282a3c177 100644
--- a/app/styles/emoji_picker.scss
+++ b/app/styles/emoji_picker.scss
@@ -109,6 +109,7 @@
   input {
     font-size: 14px;
     font-weight: 400;
+    color: var(--primary-text-color);
     padding: 7px 9px;
     font-family: inherit;
     display: block;

From 97515b77942bec89ec1022fe993b9ec41a5ef00b Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 26 Jul 2020 15:09:45 -0500
Subject: [PATCH 04/79] yarn start --> yarn dev

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 30fa61a1dd..4538075eef 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ yarn
 Finally, run the dev server:
 
 ```sh
-yarn start
+yarn dev
 ```
 
 **That's it!** :tada:
@@ -140,7 +140,7 @@ NODE_ENV=development
 ```
 
 #### Local dev server
-- `yarn dev` - Exact same as above, aliased to `yarn start` for convenience.
+- `yarn dev` - Run the local dev server.
 
 #### Building
 - `yarn build` - Compile without a dev server, into `/static` directory.

From 7fd8c860b6043e2c1cf92eba8073343005b4cf0c Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Sun, 26 Jul 2020 17:30:54 -0500
Subject: [PATCH 05/79] add toggle to collapse and expand Fediverse tab
 explaination box, fixes #63

---
 app/soapbox/actions/settings.js               | Bin 2820 -> 2844 bytes
 .../features/ui/components/explanation_box.js | Bin 747 -> 2260 bytes
 app/styles/basics.scss                        |   5 ++++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/actions/settings.js b/app/soapbox/actions/settings.js
index 815479b9611a9eb67a95ca78479eb521d877eeaf..0c2f35a8b77e391e78e8d456588bd0f44fdee5ee 100644
GIT binary patch
delta 35
qcmZn>n<KWNhe=F9A+@3)CowOvBr`wHDZj!>p`@rZb#oU}6$b#`Bn*fE

delta 12
TcmbOu)*`l{hiUT?rV0)K9;pOm

diff --git a/app/soapbox/features/ui/components/explanation_box.js b/app/soapbox/features/ui/components/explanation_box.js
index 4f27d056bc880f3c052c96f9cf264d9a0e647abf..f3d84a4f0f462f9aad1cb406a228d0a5decea649 100644
GIT binary patch
literal 2260
zcmbtV!EW0y488j+c#3VnafTh!IxX7n(8IQ(?X4&b#a2>nvgBFvmd(h&kCNqBNg8Cp
zfE+A|d?X(q8CKP@(eOw~p<&g?3c|*GhZh0spB@@nKmV?&a?drMr`lYMHuqK4YO>_?
z(AZ*4+3-9y&Ii676jBI^;kSMQ(}tGqW(?6mNmoqJ&r~V0rYZp@zM<E>(EPxY;nnDP
zkMK9G)>1flB}u)Mn^_^TKtY98Gln+#(i)A9nAjT;Yx+dBW@4Sdnrip0b`b|Kq>M?S
zW~w(f+ynulDh-v(7_x&BqAma|o^w(wI)@HeIfsyLYEA?(a5<)#4hCUj+)2x|qX2Dh
zoilh&fKDN76U4?_A`tTga{v4u?kDT`F6uVM%3NWje$qtKXKC85us&sukS)Me)==Fx
z!hQk_yv%(TBWoX<RJRua{zl+CrfQ;#w-Gxk-BoM?Snjl3uQ|nJ2f}XTCUTKt7kKcB
z_L>>J_&lRq_?iqk##kXHlmxa^B*_ejqaLoYbR*WN+Alr<yf{cY4z5Ry1_dWd!G5yH
zu%@C^{rsg5Z9{JdRbu{_hGB>mVCJSD!pzmBndT^(-N2<N<*zGa6TOU=N;g)z;|=As
zLe0Ng)~!Sa^8OzTxvm(FCoTdXY$+u-Jq8?E&HWd-G$Wic^+<oT3@5%f8^v<GSW@Kq
z$l*O9_;FUPD4fbL51i_fqiT=EgA$Icyo`PU^cz#Dp<bo$MTorjA>|a8M0BVvgv>I~
zO-tblR)i}Gb9?NSX8PQq3}}PF`^f!(bzr-k_=AXBU}SlxS-TGHBE&emtZ|@B8Ez0G
zdjPmB*-x-){6Z?4`N>Yr?pQcGfX;@8$>f|*o?FXs(R*xn2pDbLzuqnGJu?nR37CzC
zV74_ODE5bD-Nz3;9(KhjKkLpger3g$u4Ge@VPi(aD&8&C7#m?kdCCr_AH@>yCt&_9
z{vm#de;%ApOZiKL7{(pjI^0K-;+C`Gd)C>$oz|xBH5+?$Im31?#>aEKOeS6%&PXB8
zvHoE_c)Bp6>b$2hx_$8kYPEx#T%72)5nP@-hj4M%OZ#$WT)d)CMz+jd>O(~DdYGkc
F@D~C?`2zp|

delta 73
zcmV-P0Ji_s5$gqzKMx9JcyMoWbRcA9W?^+~bhBv#0|5ekJClS3I+M-?hzdL}WNCIj
feF`8TlkEj1lN|^elQ{?&lT!#&lc)#{lfMWRn=}`z

diff --git a/app/styles/basics.scss b/app/styles/basics.scss
index 7f5b06e0e4..2dafa35a3c 100644
--- a/app/styles/basics.scss
+++ b/app/styles/basics.scss
@@ -170,7 +170,10 @@ body {
   &__title {
     font-weight: bold;
     font-size: 16px;
-    margin-bottom: 1em;
+  }
+
+  &__explanation {
+    margin-top: 1em;
   }
 
   &__dismiss {

From 30a5a0baa955a2d649262e2d72507df5fb80f7c5 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 27 Jul 2020 23:55:23 -0500
Subject: [PATCH 06/79] Fix compose form border-radius

---
 app/styles/components/compose-form.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/styles/components/compose-form.scss b/app/styles/components/compose-form.scss
index b2d61bc228..edb565832d 100644
--- a/app/styles/components/compose-form.scss
+++ b/app/styles/components/compose-form.scss
@@ -298,6 +298,7 @@
     display: flex;
     justify-content: space-between;
     flex: 0 0 auto;
+    border-radius: 0 0 5px 5px;
 
     .compose-form__buttons {
       display: flex;

From 9b666115408b1c81dc958b25573c8ff1f2f35ad3 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 28 Jul 2020 10:50:51 -0500
Subject: [PATCH 07/79] Revert "Merge branch 'patch-1' into 'develop'"

This reverts commit 20bfeb1db6cfc20a2d5a305d5c392c3dcf1e60e2, reversing
changes made to 475881e80bb69cff2f3512987460b00de146453c.
---
 .../reducers/__tests__/compose-test.js        | Bin 27287 -> 27861 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/reducers/__tests__/compose-test.js b/app/soapbox/reducers/__tests__/compose-test.js
index c3ebe7ded3fdb156ed5a30262bfaabfa7e8227ee..d5306aa338193c5e6e512e4d44dbd7001f3408ae 100644
GIT binary patch
delta 308
zcmbu4u}T9$6h#S$<OgQO?sYbi6e)!50;UkHLQ0!)=k7W<GjG}VHjuvvOkw9YDE@?<
zRSLgGHxT0o*dDltbDwvk-Ph>#+T2a2OGI9S^wA3`M2S-cl9qiyM+0=IxNid-)g4EQ
zwtMoap$O+KSs_6ZuYQd@H#g^w)BS~#a?=EmuaBnuVrKcfIK3=MyB?Fj-7oMCv1LW7
zHn-T6l==|z{Ol?h1y1&x{I)U=3+D&@u~wN9E45aJl0&qpRs8G6c3(O!skT8ddH*yY
Fs~?nAank?*

delta 26
icmcb5lX3c0#tkl_llkSPC$AILp1ecceKWtru@C@~iV7eA


From 2aca716cfab5fc60dfbc4c99764707c88949386d Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 28 Jul 2020 10:52:29 -0500
Subject: [PATCH 08/79] Revert "Merge branch 'decouple_spoiler_from_nsfw' into
 'develop'"

This reverts commit 03c2a8f29456f41eb6c1a1350fb8044c57b6693a, reversing
changes made to b6c0884a1dacd86e5ae07f032f8601cb67dbad29.
---
 .../containers/sensitive_button_container.js  | Bin 1648 -> 1769 bytes
 app/soapbox/reducers/compose.js               | Bin 12884 -> 13083 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/features/compose/containers/sensitive_button_container.js b/app/soapbox/features/compose/containers/sensitive_button_container.js
index dc98de561f5b27d5908024075a56d7011f6189a5..3497c000933e504d730f2676fcc546cf89805dfe 100644
GIT binary patch
delta 86
zcmeys^OAQ%DifE2LP}<FVp2|O%48cR8McD_%$(Gs$q7tPIN;)X%pGvf<}J*vj3Nk4
Nw$(6Yn{`>8838r>9z*~D

delta 25
hcmaFK`+;XeD%0d?O!p^GW-i*y&(h4ec@wKSBLIyt37Y@_

diff --git a/app/soapbox/reducers/compose.js b/app/soapbox/reducers/compose.js
index c2e39e866da28c4e2736c8d38966ebfb500868e4..d9d554d4767e499ac324593acf50e8d40d687380 100644
GIT binary patch
delta 172
zcmcbTGCOU95U;sLaY<rHs$P0(iH3SgYFc7xPDy-mYF=?>NoHB9x~4)+jRKO2;)49l
zoYW$9&CU9}G2D_03YlpN8j6?-CO^~`pFEF`XYv9GDGmiNsO6d@t2J3uMPl+Fi5-*o
xYjFeR#F-V;)F#j8RpC&uvsEzERH&XjQCoQOd_L~U{=D3iuj)u|J}ucP0RZ>OIKcn_

delta 88
zcmbQ8b|qzl5U)~kNn%N=UV3VYhI&eBT4HHVNqli?UU6ngW?8DbrlvwQ*W^Gcwaq2G
rhTM}saB@zL<>i_DP(q5COF?1s1s?UuA5<hJyGrf=(VHhrbw~gJfA}9K


From 665a27d4c92bd6da05970040c0d9ba1d426a0083 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 28 Jul 2020 10:57:20 -0500
Subject: [PATCH 09/79] Update compose CW tests

---
 .../reducers/__tests__/compose-test.js        | Bin 27861 -> 27679 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/reducers/__tests__/compose-test.js b/app/soapbox/reducers/__tests__/compose-test.js
index d5306aa338193c5e6e512e4d44dbd7001f3408ae..d063bc77ebca0c3495960083dca7929a85bca7da 100644
GIT binary patch
delta 31
lcmcb5lX3nH#tkl_llkSPH?I?oWdt!MuM^eYyhB_z6ad6t3o-xz

delta 201
zcmbP#gYoK3#tkl_KKlAWsk!-OsR|_-nZ*hvsl_D<`FY8y3dIHanK`LN3P8b>)a3lq
zf}GS8g|wplT!q}kqU_APbcNj1l*~kh#A1cw)V$)%lFYKy&5okgj4As1t|^%%NamH~
hE9B*uC=?_X1Jy!}EiOqcNhRN=$&R9)o0-IALjjp@N!|be


From bc787e0bbe4aeebfd0bc9774e0a5178d5a3336fb Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Tue, 28 Jul 2020 12:23:15 -0500
Subject: [PATCH 10/79] add markdown posts

---
 app/soapbox/actions/compose.js                | Bin 15732 -> 16000 bytes
 .../compose/components/compose_form.js        | Bin 11443 -> 11594 bytes
 .../containers/compose_form_container.js      | Bin 2163 -> 2213 bytes
 .../containers/markdown_button_container.js   | Bin 0 -> 901 bytes
 app/soapbox/reducers/compose.js               | Bin 12884 -> 13198 bytes
 app/styles/components/status.scss             |  31 ++++++++++++++++++
 6 files changed, 31 insertions(+)
 create mode 100644 app/soapbox/features/compose/containers/markdown_button_container.js

diff --git a/app/soapbox/actions/compose.js b/app/soapbox/actions/compose.js
index 28442f994239e61e99d2ebedce1bc7979ee1f385..26d63a635b455ce1177a25dd4bf31683209da543 100644
GIT binary patch
delta 154
zcmexT)lj?PAcwNAW01Ftf4E<~vxlRfyQ_k&g1WQ6Z-9TWYdlP9vI4Wh=0hCHg1pK3
zc_pcNCGjPd1*uk(9pw~E5{t4^^2_toV>K0QZEY1wib_)z>=o2YQY%XIb77JSR#1_G
foW#sL_04xB4dpp}p|X?bn=7+J9kKbo#Z(pma@I4t

delta 22
ecmZpu{Zh5zAjf8AP8Gq;6QnfdH%nQiu>b&U$p`NM

diff --git a/app/soapbox/features/compose/components/compose_form.js b/app/soapbox/features/compose/components/compose_form.js
index ae64a75f1580aa93e0d8de4cb2b0855376eb282d..3ef832bbe8ea4af67e0163e518d60c281d7226c6 100644
GIT binary patch
delta 83
zcmdlSc`9lHD>H|0Vo`QVetF*HkBlmOxlm4gQfWy^{$xjH(ao&Ps%#uE@yYyLVw<%%
V?<#UDDA>St=4r`qX4hWB2ms?X9Ap3h

delta 22
ecmX>VwK;MFEA!?MW>vP$(>d=dZl0&Th7kZ}!3dZD

diff --git a/app/soapbox/features/compose/containers/compose_form_container.js b/app/soapbox/features/compose/containers/compose_form_container.js
index 0a7cefc96b6321287bff5e1b61b804ce79fb43d1..957c8d77301f8b79666d7ed80e15b3d76c902412 100644
GIT binary patch
delta 33
jcmew?uvBn^ArpIUVo`QVe);5uOfno$cHU+!CQmj1&VdVr

delta 12
TcmZ1~_*r0sA=Bn$CMPxk9}ffl

diff --git a/app/soapbox/features/compose/containers/markdown_button_container.js b/app/soapbox/features/compose/containers/markdown_button_container.js
new file mode 100644
index 0000000000000000000000000000000000000000..fc3ae94358ae260f8611597c43ead30b0b5f0415
GIT binary patch
literal 901
zcma)5TWi8F6n^(toVTW+_1)nH(-$8EVZMzau{~;Lo0Q~q6QuurC#kVh1`bN;<;!==
ziK=R23C@rktuZHPVP{PRiA9;y$YRl)lBa>{U~4?lf|0Kck<k}qmW^}6|21lIV`9ig
zF=n$3pnfrH9Hidk%!3^+r9BqrTVEBKr@L5K8SOe&hrbz={$!I2P2~^@+$oJqbWZNk
zU1>VwiXpskz(yQF6+zRxRpLAVsMrY>6D~pVJqckPZg$32ng8cqh6gN?AS;`aF1n0g
z8Ltr2pqAT`fzS?_y3zk4kFdw|g>pTAoAwE1{YH{-ZC2LQ4yGWSe;@i(+y%5LOrIg-
zE#($VHolxE-Xke0aS~9O&n#oMjv?D47cSmoFYGaiX_Jo>Uasw4I)X|6B?e2qkl)uY
zRtm-*&<4C!a%MDHQ#!UAMMp~44YBpx_;clIN%^5~fV&D`F2UJ>(X&$JN0EZxcYufx
ue@>=IxnJ-b*-7CkoE4rsKLA`<oJGM?<`0jkZg*kGV^QDvO2zFV@)|!GST|Mx

literal 0
HcmV?d00001

diff --git a/app/soapbox/reducers/compose.js b/app/soapbox/reducers/compose.js
index c2e39e866da28c4e2736c8d38966ebfb500868e4..b789139fb9701da36da41b8966743bb7940bbd03 100644
GIT binary patch
delta 210
zcmcbT(wDx$h>643G05A+KiqFJBa_r-OQ!40e7T85*(v$uc~%M~MWv~mdD!Av_+et|
zIuOBVt_6Gutq=61CM!s)DI%#-EG|hbN!3eFEzwYi3u{jPC!;f2Q$=F)9|=7cIR!At
iO)StWMo|W_WAYv?y~!K2SvN<?rt%U{yLpe+40ZsKHAR8|

delta 65
zcmeB6zml@Sh-tGg(>><RwrtTXo40dK;F~PMBsAGvUwE>BisIz`GOU~Jq@FNOKETJi
U*+XsuFNiVOLr!h8icS_g0Pb=Xg#Z8m

diff --git a/app/styles/components/status.scss b/app/styles/components/status.scss
index 0d349764b8..526f59cb0d 100644
--- a/app/styles/components/status.scss
+++ b/app/styles/components/status.scss
@@ -1,3 +1,34 @@
+.status__content {
+  p, li {
+    strong {
+      font-weight: bold;
+    }
+  }
+
+  p, li {
+    em {
+      font-style: italic;
+    }
+  }
+
+  ul, ol, blockquote {
+    margin-bottom: 20px;
+    margin-left: 15px;
+  }
+
+  ul {
+    list-style: disc inside none;
+  }
+
+  ol {
+    list-style: decimal inside none;
+  }
+
+  blockquote p {
+    font-style: italic;
+  }
+}
+
 .status__content--with-action {
   cursor: pointer;
 }

From daf039d9bb098bb522007c96ba62db2b3ebc4b63 Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Tue, 28 Jul 2020 13:24:31 -0500
Subject: [PATCH 11/79] generalize markdown to content_type

---
 app/soapbox/actions/compose.js                | Bin 16000 -> 15966 bytes
 .../compose/components/compose_form.js        | Bin 11594 -> 11600 bytes
 .../containers/compose_form_container.js      | Bin 2213 -> 2222 bytes
 .../containers/markdown_button_container.js   | Bin 901 -> 993 bytes
 app/soapbox/reducers/compose.js               | Bin 13198 -> 13244 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/actions/compose.js b/app/soapbox/actions/compose.js
index 26d63a635b455ce1177a25dd4bf31683209da543..93e923c5424d90917bc920bfcd920b71c70f1dfa 100644
GIT binary patch
delta 91
zcmZpuy;rm0Acs^)WPoeDvxlRfyQ_k&g1WQ6Z-9TWYdlbRvOKfmW)@C=LH^|Yypq(s
slK7I!f>iZb&CMNBR`M)mi8-Z{744K*KqgE+ZKXT;o(11#X{%Hg0BC0&#{d8T

delta 133
zcmcat(@?wNAcwNAW01Ftf4E<~vxlRfyQ_k&g1WQ6Z-9TWYdlP9vI4Wh=06<%f~L8N
zMcFC&<$3C{nhLhIwhARhrKt+`3hE`P6(#y`Nd+sYNI_0wW}f=yC@CxX$p>W=Ip7Ay
MSn6;7VVTAP0Ca~d)&Kwi

diff --git a/app/soapbox/features/compose/components/compose_form.js b/app/soapbox/features/compose/components/compose_form.js
index 3ef832bbe8ea4af67e0163e518d60c281d7226c6..dde769ac55ecc1dfcf8d28adda4710d0df3085f5 100644
GIT binary patch
delta 29
lcmX>Vbs=g)B_~gEeqKpxUP*jOWkKrXgPanZr*m#r1^~d#3`YO}

delta 25
hcmcZ*bt-B@B_~I2Vo`QVetF*HL@u$-b2&FF0|1Tm3NHWv

diff --git a/app/soapbox/features/compose/containers/compose_form_container.js b/app/soapbox/features/compose/containers/compose_form_container.js
index 957c8d77301f8b79666d7ed80e15b3d76c902412..99189385da0e78f1d95501960f59544d9b76fa1a 100644
GIT binary patch
delta 35
qcmZ1~xK40`Arnt>eqKpxUP*jOWkKrX^NiB0C8-r9`kO<T0@(oO(+pSu

delta 25
gcmZ1{xKwb1ArnV#Vo`QVetF*H^NiA)W0?Zk0Ci;us{jB1

diff --git a/app/soapbox/features/compose/containers/markdown_button_container.js b/app/soapbox/features/compose/containers/markdown_button_container.js
index fc3ae94358ae260f8611597c43ead30b0b5f0415..1fd809966486843cb763a2f10dee4d8170674080 100644
GIT binary patch
delta 136
zcmZo=f5^VUj7d2;Kd&S;uOz;tvLIDGR#U;&)>c8iB(<VMKR2-`J0-t7Pkpi@lMhkq
lW-zttlw@QU>m??aWR|5W*h5V!$Vtr1Q&+IUFj$s30|1qkF5UnD

delta 43
ncmaFJ-pangjEOrpu_!wwzdTPpR&#PBlMf321XJteO6CjzM>h{9

diff --git a/app/soapbox/reducers/compose.js b/app/soapbox/reducers/compose.js
index b789139fb9701da36da41b8966743bb7940bbd03..c8294edecb372e810b069680527958e509105318 100644
GIT binary patch
delta 225
zcmeB6-;=(<h>0a6GQf2*Ba_tRQ&K#e6PQjj%O>aNm89mC#FtbSq*^Jcm!wvd=;tOD
zWvAqq=c#YDWQ%8!Lsp`$gRW-sMjqkKySRG!n1O~*J}50UnO{X|@_rdsX*7L_$t9Wj
id3t4uIi;zaH%K-TGI+Ct+;Uz*mOIGlZC26AVg~?E2~Yt5

delta 194
zcmdm!-j}|?h>643G05A+KiqFJBa_tT0H*8Ae7T85*(v$uc~%M~MWv~mUD)DT_+et|
zIuOBwTnqRRS`(xtCx1{<n!G@gRUS#DVsS}gNvd9YYKewAOnCA^6_LpXl7^E-n1m*$
fOAEpDZT6G;%#2}8yxekLbiv8-a(bJCbh6k1BBMfP


From b31cf22f43cfdca9a5258aa71eb4bd299d6ced86 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 28 Jul 2020 13:36:10 -0500
Subject: [PATCH 12/79] Markdown refactoring

---
 app/soapbox/actions/compose.js                | Bin 15966 -> 15969 bytes
 .../compose/components/compose_form.js        | Bin 11600 -> 11564 bytes
 .../containers/compose_form_container.js      | Bin 2222 -> 2163 bytes
 .../containers/markdown_button_container.js   | Bin 993 -> 999 bytes
 app/soapbox/reducers/compose.js               | Bin 13244 -> 13245 bytes
 app/styles/components/status.scss             |  10 +++++++---
 6 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/actions/compose.js b/app/soapbox/actions/compose.js
index 93e923c5424d90917bc920bfcd920b71c70f1dfa..8466d80692e43800689c1af1984a9acf40b2965e 100644
GIT binary patch
delta 33
pcmcat^RQ+^x21q{eqKpxUP(x0L8?YsVovGgi8e}`cUdlB0RRMZ4ru@Y

delta 31
ncmaD@bFXGYw<Vu%Vo`QVetDioSz=CU>g0nmiktUZE@1%x=nM^{

diff --git a/app/soapbox/features/compose/components/compose_form.js b/app/soapbox/features/compose/components/compose_form.js
index dde769ac55ecc1dfcf8d28adda4710d0df3085f5..af8ce4263f9b3dda180be4cf5c5e5c0b76bdb951 100644
GIT binary patch
delta 12
TcmcZ*wI*sqCFkb3oST&aC@2Mz

delta 29
kcmZ1zbs=g)B_~gEeqKpxUP*jOWkKrX22P31m7JTE0lMc4$^ZZW

diff --git a/app/soapbox/features/compose/containers/compose_form_container.js b/app/soapbox/features/compose/containers/compose_form_container.js
index 99189385da0e78f1d95501960f59544d9b76fa1a..0a7cefc96b6321287bff5e1b61b804ce79fb43d1 100644
GIT binary patch
delta 12
TcmZ1{_*r0sA=Bm@CMPxkAD;vd

delta 43
ycmew?uugD;Arnt>eqKpxUP*jOWkKrX^NiBGC8-r9`nick*(v$ud7HJEJlOziY!BW5

diff --git a/app/soapbox/features/compose/containers/markdown_button_container.js b/app/soapbox/features/compose/containers/markdown_button_container.js
index 1fd809966486843cb763a2f10dee4d8170674080..0b4a642ca14d1217056736bf494e103bb382dbdd 100644
GIT binary patch
delta 38
jcmaFJ{+xY66}NMKUP)?RNl0Zu>c*x+OvwDnKFm`AGF%T|

delta 32
gcmaFP{*Zk_6^CzPQFcmxdEUm>Lriea<RIp$0NT|I?f?J)

diff --git a/app/soapbox/reducers/compose.js b/app/soapbox/reducers/compose.js
index c8294edecb372e810b069680527958e509105318..60418da8552e2a7a1dd3380ff87d246dc0275efe 100644
GIT binary patch
delta 24
gcmdm!zBhftM~TU^B)KR5l2Ds`Ooe~5fn<*q0FsdkO8@`>

delta 16
Ycmdm+z9)UdM~TUwCG<BdO3sl207)DNaR2}S

diff --git a/app/styles/components/status.scss b/app/styles/components/status.scss
index 526f59cb0d..7137874def 100644
--- a/app/styles/components/status.scss
+++ b/app/styles/components/status.scss
@@ -1,17 +1,21 @@
 .status__content {
-  p, li {
+  p,
+  li {
     strong {
       font-weight: bold;
     }
   }
 
-  p, li {
+  p,
+  li {
     em {
       font-style: italic;
     }
   }
 
-  ul, ol, blockquote {
+  ul,
+  ol,
+  blockquote {
     margin-bottom: 20px;
     margin-left: 15px;
   }

From eda4c7d6295419f942813cd0fe58c073351ba4d5 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 28 Jul 2020 13:53:01 -0500
Subject: [PATCH 13/79] Add markdown reducer tests

---
 .../reducers/__tests__/compose-test.js        | Bin 27287 -> 27562 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/reducers/__tests__/compose-test.js b/app/soapbox/reducers/__tests__/compose-test.js
index c3ebe7ded3fdb156ed5a30262bfaabfa7e8227ee..62eb472a9bc3543a57fd5bb4694e3dd6815b3468 100644
GIT binary patch
delta 183
zcmbP!m2uT|#tkJb@(K#c`FSO&c_r~Bl?AC*3hE`P6(#z)iAC8d`Q>@)lMO}1C*R}b
z*xbv)mZqSfkXfRkUYuG|tWc7Xs!)($TmsXs3(`J$fs*KC9yWE=kjMbncxMksKX+Fh
sE}%9bC`-&Kg_~cHlbD$|IWR<avOTM|CN>v<Rj4b}YFY#JgGdkt0Gxn3`v3p{

delta 23
fcmZ2=opJhA#tkJblg;G?H?LyhOJk|kwB`Z;aH<E^


From 5333680a3238220c413f59d6c190ef4734609a47 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 28 Jul 2020 14:13:29 -0500
Subject: [PATCH 14/79] Linter fixes

---
 app/soapbox/reducers/__tests__/alerts-test.js | Bin 1689 -> 1665 bytes
 .../reducers/__tests__/notifications-test.js  | Bin 18204 -> 18126 bytes
 app/styles/components/audio-player.scss       |   4 ++--
 app/styles/components/columns.scss            |   2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/reducers/__tests__/alerts-test.js b/app/soapbox/reducers/__tests__/alerts-test.js
index f5af4a50f8eabf8f737089b0ab6180c13d27a8fb..ab935b45ce2d01626947a2b797324eac2867efbb 100644
GIT binary patch
delta 81
zcmbQq+sL~?o^`ShqwHimR`$sTOe&M}Sw$wlVC54vRM+8B0E1c>qnc~-I#!9vUQAp-
ZRUDHyu&_;jz{&<xEx`;_Gnt)j5&$zx6mb9m

delta 94
zcmZqVoyogFo^`S;tD1y@LN%8H9Au|fS}7Rl07WLRW0jhm&&o5|ky%U>B3}y<hX9bC
a$@5qxCU0R?n0$#<id{hgEIau<>m&fhNEL_x

diff --git a/app/soapbox/reducers/__tests__/notifications-test.js b/app/soapbox/reducers/__tests__/notifications-test.js
index 3831067baec3f508c4e62486363142dffe0d8261..ef6d99d883fc9b2b0d7cef13618d5799cc805a9d 100644
GIT binary patch
delta 25
hcmbQ!$9S%nal>ly$p-35lgwUE4lv}{%qPjG2LOa*2<rd<

delta 65
zcmX@t%Q&Zxal>ly$&HGNla=}9Co6NPPIlHYoLtPOGI@fI*yK(829pnSs7!7)m!JGl
VUxZBo2x2uSA7ED6d`IGwE&%207FqxR

diff --git a/app/styles/components/audio-player.scss b/app/styles/components/audio-player.scss
index 551e19bc9f..7073f141a0 100644
--- a/app/styles/components/audio-player.scss
+++ b/app/styles/components/audio-player.scss
@@ -173,11 +173,11 @@
     white-space: nowrap;
     overlow: hidden;
     text-overflow: ellipsis;
-    background: hsl( var(--brand-color_h), var(--brand-color_s), 20% );
+    background: hsl(var(--brand-color_h), var(--brand-color_s), 20%);
     padding: 5px;
 
     &__label {
-      color: white;
+      color: #ffffff;
     }
 
     button {
diff --git a/app/styles/components/columns.scss b/app/styles/components/columns.scss
index c005a6e603..7e6bafdc0a 100644
--- a/app/styles/components/columns.scss
+++ b/app/styles/components/columns.scss
@@ -260,7 +260,7 @@
   position: absolute;
   right: 0;
   top: -49px;
-  
+
   @media screen and (max-width: $nav-breakpoint-2) {
     top: -35px;
     font-size: 14px;

From a3201605b44aa908b202105fa1fbff627291e804 Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Tue, 28 Jul 2020 13:52:44 -0500
Subject: [PATCH 15/79] add uploads to polls

---
 app/soapbox/actions/compose.js                | Bin 15732 -> 15598 bytes
 app/soapbox/components/status.js              | Bin 16885 -> 16923 bytes
 .../containers/upload_button_container.js     | Bin 700 -> 642 bytes
 .../status/components/detailed_status.js      | Bin 6328 -> 6362 bytes
 app/soapbox/reducers/compose.js               | Bin 12884 -> 12885 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/actions/compose.js b/app/soapbox/actions/compose.js
index 28442f994239e61e99d2ebedce1bc7979ee1f385..a0e7b55b10b2eee004e58390644c9d9b42fe6032 100644
GIT binary patch
delta 16
XcmexT^{#S5t^DLZBhJk{3K_BhNS_Ac

delta 46
zcmaD?`K4+@tvpL+nu5k;1wJ|Ug8ZBu^;pfx52QsV*JyK0ww7052>^<1PLS`D1pt#v
B5AXm0

diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js
index 889afc01e0b7692d2aca4e7bffa0cf59ef0d0961..15c985e4b015815b7585c99e93b1790cc7d77f81 100644
GIT binary patch
delta 70
zcmey`%s9J+aYMX3OF@24&SpRPrJP{a<R2R5oLmY(keQ~SF}cf7eshH8QZYf02n<w%
KwfwgK#RvdEuNJ2O

delta 42
ycmbQ;!uYkBaYMZP<`VfSoUFO2DVd3rc{I%@FIEwoywXs3bGGJEvCYa3KNta7D-W;$

diff --git a/app/soapbox/features/compose/containers/upload_button_container.js b/app/soapbox/features/compose/containers/upload_button_container.js
index e4a6d70a0844c3045012674b2a220cb03e608632..8bf1c9047f762e7099cd5ddab5e2ebd4302c2a14 100644
GIT binary patch
delta 11
ScmdnP+Qhn{gK_d9#$Ny$o&?eW

delta 45
zcmZo--NU+}gOR5+FR?5!Gbb@AC)H}Q0i%>aL4Hn-daR~`qOGk$UTIFw<QB$%09;!S
AN&o-=

diff --git a/app/soapbox/features/status/components/detailed_status.js b/app/soapbox/features/status/components/detailed_status.js
index a31d826bed3dd13e755151b6886e374d6fd3cac0..4afa84ec394424f28735d4d4da3132d2f9e0c999 100644
GIT binary patch
delta 80
zcmdmCc*}6ZNiLRx{G6Q0ySP?B80p;RoLmY(keQ~SF<D+ve)Dne_gq3C5eTRTsjubY
Wnw%&qHMv(raB{P#@aC^#hZzAi6B%#-

delta 39
xcmV+?0NDT9F}N|X$qJL)3Yi6MWn^h#lX(j_lP?k$lROa<v)Bvo3bWW20s=)#4(<Q|

diff --git a/app/soapbox/reducers/compose.js b/app/soapbox/reducers/compose.js
index c2e39e866da28c4e2736c8d38966ebfb500868e4..3af8e146891f2c1ca06e9b48b94a792af3fa008f 100644
GIT binary patch
delta 32
ocmcbTay4Z`x5Q*?NuJ5``M4)9kdT_pD62VHQ$=F)ABhM_0MbSaasU7T

delta 32
ocmcbbawTO$x5VTRoSc*A@$pPvBq24KQC4fRmWssYzY-CW0O7(682|tP


From 563e4e5bab8381f1a575f8ce5899892f3a8710ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A1rbara=20de=20Castro=20Fernandes?=
 <barbara.dcf@gmail.com>
Date: Tue, 16 Jun 2020 09:06:44 -0300
Subject: [PATCH 16/79] Show profile preview on hover

---
 app/soapbox/components/status.js              | Bin 16885 -> 17812 bytes
 .../status/components/detailed_status.js      | Bin 6328 -> 7245 bytes
 .../features/ui/components/user_panel.js      | Bin 3881 -> 4174 bytes
 app/soapbox/pages/home_page.js                | Bin 2854 -> 2881 bytes
 app/styles/components/drawer.scss             |   2 +-
 app/styles/components/status.scss             |  22 +++++++++++++++++-
 app/styles/components/user-panel.scss         |   8 ++++++-
 7 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js
index 889afc01e0b7692d2aca4e7bffa0cf59ef0d0961..41ccfc0ffb233995c74c31a2062ee36e8285c050 100644
GIT binary patch
delta 917
zcma)4&ubGw6sDvI%|Ve|w2Hja(%q%$#wvxFWCI=o6&fgLB{@ht*?mh!HZ#l4<VRVS
z2p&Bsj{k$;sgR?1^M4S$iAT?#b#`NGVsdb9^WHb}zVCbA&zCFjUag#e%~feH<dKA9
zfzc6R7=Rz~9vHS=@{!1Xgrd}^C6{X$Lnif2BTvE<I{A`&oj(8wBkt1xv*%B#pq&6K
z;FCaLF%SC8_FEOWyI5`O>ZEh^^R+P*P2SO;fdi%mP927nd3<R1h;+M6^e8b6&Vn-#
zZiL8yFb~Wg8SM_KC%Y9WKiCgPmSIgFps40Gg|0?vep8wUe1MVuUXQ3loDrlxm>aT7
zg?%~Sv@FOf0_9^#B%1M@j!T^~>SJ-Pr6r=xh@=B-476o7_kI0KYaXQ~FF}oE8xpIk
zStSd^50MN~UzQTT@a?~OXZx9*b)wf4PIm4*Tt7^g=5i(^EEPR3<X>HoXpU3sQr{-e
z%Rh4J!{*H=Sx5}vtjTqT8cbs3#2IjLKgk6w6TJ+UH4^o0yP%G1Z`J$Fb@i)uOWklb
z)JJDcz1X^<8V*rM#;U5-*3|dy>xI7=C$7u;Og{3|o7(L$^^9j$0)uIEop?5{fA*Y!
zkY@opaSW1&6*%3RL$!DI_LFdQT7&?7xzKLy?%lta_9022RL?S(dOSVqyk3}ma>}c}
E0T$~&kpKVy

delta 64
zcmV-G0Kfl~ivjh60kGNwvls-73bXJIzz?%1AVwOqygKOvlO;crldB~dlhHpLlkPts
WlMg@#0Sc2CKxLDEKo_%IK{y0P0T<Q)

diff --git a/app/soapbox/features/status/components/detailed_status.js b/app/soapbox/features/status/components/detailed_status.js
index a31d826bed3dd13e755151b6886e374d6fd3cac0..a88395e2a910275eed438c9e5eb3d7241c130cd2 100644
GIT binary patch
delta 913
zcma)4&59F25C+2@HWv|QLGe<8Ff(j+#wdZ9&E&SQLL!1Fi6Cz8ObuzAbPwH~N!Fo>
zFW_llZ$5xGAs1i5XYlIX7qDltKZ(h~qEA&{SAE}C^`rT-{aw^rbdqwR;EhD_iZDzd
z7JLG>=lSMMsULC!V91p8rv~#OEkR3O>)km8NCl5+g4M^jRMPVVI}npZVxtZw*6YI#
zJlW2UOm_Kg?{{rM<$#}?W)OhmLePU5Wf7lw6QaWL03%8qo3rEsWGE0B5Eg+mA@idd
zjnudU?dPp@?%M9^1IpvNp)fWm!*50NlxHYRdo!X3c}0-M;5<@eD!rTej_X2|k*HoP
zqR`1Vblm7vVv3E8l97lWBZ_8tk{Qc99>=E3a1&)D??5fo2()`_Sm`a|eI!}w%TD6g
zzWq1vYCr3<1hNQ=%l%*da%UlDQo&Bmn>zlL1=>(tIak`Yl=ZLsMRIVr_+s6AcXbIi
za5muPkWQFF5#$wodrA5lRw>^Fs|vbj>?-!Gd68S6ia%EOK`Eend&?vY`IM;_QBZ*O
za6u#cy{jQxU22f8pXb$DHAr=lV36mac-n!p#~Y~8VY8*v`B?)JjMY|oc+`CMw5)^H
c;Fs)fqwC*)NwPj=AJ_9;Kcd;Peek*V7g9$y@Bjb+

delta 57
zcmV-90LK5#IJhyeas#uf13Ln<F$UxVlZ^}Hv%d_R36tLzZIf9RA(L+xSChyWIte^4
PPGNRTX>Mz?%@}|Kn;;e`

diff --git a/app/soapbox/features/ui/components/user_panel.js b/app/soapbox/features/ui/components/user_panel.js
index 83dfd20992d4188bc5e7ed66fe9bca820d143592..da515ffed6bd79e36fa59a501a0d1e9ec947ebb0 100644
GIT binary patch
delta 420
zcmZ9I!AiqG5Qee!(j0=`1dELIkc1{aKqWZ}9xQ?ZFJ3m=DMXWO*xd*v1n(XM*{A4D
z=s|pmzJxF0ZrZ4I4+Hzp&iDVb%ab*{-}OdmUNSC$W<-c7$x*<ZvmBgOD2$-u-sdxb
zkc$i_aKl*{FG>{WEO|gGeGBw?N=2INwiCuO(`+nVgd{ShFvB^iGHDnBLa5u>Ex2y}
zp(L-c1E|A(aNut;_?_D->JRs(^>1|7sRZ(%Bn4)U4>kO`2f;R@GwJ4`@tO@XtlJPx
zWU2LFw0hZp8=O&A2njiP#A{OC>iih9F1YJK7(uP>?Xeo#N5`(&4~-+ClvRbinrXOs
j<EmHtbo`@w?Lyv#`4f(^;)QnDp{ox&=xa~)WnX>+7YvK2

delta 136
zcmX@7uu^VAIMd`BrfrkgG8=Aw$1KA*IiHoAS>29n@;)x5%~h-uIUTu@^Ye;J6mk;_
zf=d!hQbY0sit-DJ6>JrXL0kn}JB4a41qG-gARi*Gm!4Xpp`M$nu4z44k6)X;D7B=t
bC{JN>55FQuZmOmZP)qIP8~nPHIR#t+J^(Ae

diff --git a/app/soapbox/pages/home_page.js b/app/soapbox/pages/home_page.js
index f06bd90eb10396ec3914bb8ff5f3fff34920b318..eeeafede96e998ab5624b71804e6cef733071d31 100644
GIT binary patch
delta 49
zcmZ1`c2I0X7Bh2hs?O$A<_1PE;|WU%BVS^2a(-!EiD!y!b#7|yWC2c*&Dm_bSpcM_
B5U~IN

delta 26
icmX>owoGh87W3vJ=4!^xA6beSCm&)H-rUBvn*{)h-3i?Q

diff --git a/app/styles/components/drawer.scss b/app/styles/components/drawer.scss
index 7dc5a1a10c..39e936158b 100644
--- a/app/styles/components/drawer.scss
+++ b/app/styles/components/drawer.scss
@@ -20,7 +20,7 @@
 .column,
 .drawer {
   flex: 1 1 100%;
-  overflow: hidden;
+  overflow: visible;
 }
 
 .drawer__pager {
diff --git a/app/styles/components/status.scss b/app/styles/components/status.scss
index 0d349764b8..f167cf2ac7 100644
--- a/app/styles/components/status.scss
+++ b/app/styles/components/status.scss
@@ -152,7 +152,6 @@
 .status__info .status__display-name {
   display: block;
   max-width: 100%;
-  padding-right: 25px;
 }
 
 .status__info {
@@ -160,6 +159,27 @@
   z-index: 4;
 }
 
+.status__profile,
+.detailed-status__profile {
+  display: inline-block;
+
+  .user-panel {
+    position: absolute;
+    display: flex;
+    opacity: 0;
+    pointer-events: none;
+    transition-property: opacity;
+    transition-duration: 0.5s;
+    z-index: 999;
+
+    &--visible {
+      opacity: 1;
+      transition-delay: 1s;
+      pointer-events: all;
+    }
+  }
+}
+
 .status-check-box {
   border-bottom: 1px solid var(--background-color);
   display: flex;
diff --git a/app/styles/components/user-panel.scss b/app/styles/components/user-panel.scss
index cf49a3d68a..44ec3cd9b4 100644
--- a/app/styles/components/user-panel.scss
+++ b/app/styles/components/user-panel.scss
@@ -3,7 +3,13 @@
   display: flex;
   width: 265px;
   flex-direction: column;
-  overflow-y: hidden;
+
+  &,
+  .user-panel__account__name,
+  .user-panel__account__username {
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
 
   &__header {
     display: block;

From 444e3641ee64d93a43f7d6b0459ca92f3b412654 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 28 Jul 2020 14:42:58 -0500
Subject: [PATCH 17/79] Fix disappearing poll button when media is uploaded

---
 .../compose/containers/poll_button_container.js | Bin 683 -> 623 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/features/compose/containers/poll_button_container.js b/app/soapbox/features/compose/containers/poll_button_container.js
index c27967b940097f05d65ec7f321a618347c792bd7..db24886e2782440b010a2a62e5155bcbda486850 100644
GIT binary patch
delta 11
ScmZ3@`krON_szzP6^sBM76gj`

delta 49
zcmaFQvYK_mcUFa(8U>As=OtxxQ&Tb%;}c6t5|cA>Q}arS)nhgFiZiQH73>rYHh!yQ
F1OVH25{3W(


From f6ebe5cbd76c36dfa145394421ef634cc189e1ed Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Tue, 28 Jul 2020 20:01:16 -0500
Subject: [PATCH 18/79] profile card basic functionality, needs some UI
 improvements

---
 app/soapbox/components/display_name.js        | Bin 1364 -> 1459 bytes
 app/soapbox/components/status.js              | Bin 17812 -> 17632 bytes
 app/soapbox/containers/account_container.js   | Bin 2333 -> 2332 bytes
 .../profile_hover_card_container.js           | Bin 0 -> 2335 bytes
 .../features/ui/components/action_button.js   | Bin 0 -> 3452 bytes
 .../features/ui/components/user_panel.js      | Bin 4174 -> 4081 bytes
 app/styles/application.scss                   |   1 +
 app/styles/components/profile_hover_card.scss |  54 ++++++++++++++++++
 app/styles/components/status.scss             |  16 ------
 9 files changed, 55 insertions(+), 16 deletions(-)
 create mode 100644 app/soapbox/features/profile_hover_card/profile_hover_card_container.js
 create mode 100644 app/soapbox/features/ui/components/action_button.js
 create mode 100644 app/styles/components/profile_hover_card.scss

diff --git a/app/soapbox/components/display_name.js b/app/soapbox/components/display_name.js
index 1016c9f5a89eaef7c92a25f63e31da2bf4f20f40..30dbce9a2f8474ad448900e551260431aaad08e4 100644
GIT binary patch
delta 100
zcmcb@wV8W@l2kxZenCiOL29u=T2X$kf_edvuUi5V*eDUiD5ao~oROK6Qk0r!r2to|
gmzSTCIysHefJ+B1y?Gkr3TAEvg=(1k$!4r_0RQA7xc~qF

delta 42
vcmdnYeT8d+(ndEA#>s0Kbv8d@T)`}6qhDN*m}keO00f%WK&qCDtCkA@FKP?@

diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js
index 41ccfc0ffb233995c74c31a2062ee36e8285c050..c3af6fd2d20917ef9ccdd5488e6d5dee0c597064 100644
GIT binary patch
delta 331
zcmbQz&G?{`al=FAz<{Fsw9K4TkNmRKBIm@S6zBZBlElos)FOqnqWoM1bv-@(wA93s
z(xTL2{Q`*E_zaNZ_++4JEJBkPGK=YF7W?KW0gY9tMHmA#35XI43iONf6AO~^D}buv
zbHU0si?Yn%5&~HtmRX#cl#^<ukd~NJoVxi9-x2=Ftn#Xp_2rcXQRGXCN>e9qkT(R$
zuz+MX^C=WdaU-eOyxOXob#lFf%w$amr^!P0LTU;MHn_c;n4FwnnpfhPGC9FsX7VWq
jab&Y5+iQyRx?~m?<Rn)5CFZ8uaZP4)P~05jXu$#iB{Ows

delta 524
zcmZuuO;5r=5Df|ky$}<<Xd+`Yfhx43l3+~%4;)GKfPss$z%*>qcAM@(Ax(dP@mOQL
zc;{%+zu*sne`3Kz`EYJK@6CH}b|%lU*O%Dmbn~jt(YYfQ8lXGOgtROxIug-$kSl$v
zbeL%~3oQ}7BIc7lqlRw$eY-rLdZ3)P4OBrV2FL6+L}fcnrv}dPh6?BF-DcDckCI=>
zd&+C99g#tUj09Q<TxxZhE1N`gdNu4)l1Vem7y<7%h!zm53mKCPb1v<Qo(je5f<2Vd
z($4_$n_zk<B}9*MIbf;d$K{a1>0@>^AIcUHbb!@Cw5H5-oug<hv!cBJv6?|CmH#tK
z%+12L6yHBx^j+3kl@51RFA<E()eTSrzbtS4UL-iEX!S)QAGjD9sCga;W~<OT@fQEO
kd6qBu_OO)&19h<mH*)#Qiy01nFwypckK3JaTq(xC0SA@2TmS$7

diff --git a/app/soapbox/containers/account_container.js b/app/soapbox/containers/account_container.js
index 8e1f067deead0351676de7ebccf55bb25d13ae65..1e890a7e21037333df33be99116ab9fcf1e83da7 100644
GIT binary patch
delta 11
ScmbO$G)HKIKgZ+%j<Wz5bp#y%

delta 11
ScmbOuG*@VYKgVQ0j&lGQZUh_v

diff --git a/app/soapbox/features/profile_hover_card/profile_hover_card_container.js b/app/soapbox/features/profile_hover_card/profile_hover_card_container.js
new file mode 100644
index 0000000000000000000000000000000000000000..d9ae0986f8e276a2e51543ec3ad0c7e0906742c8
GIT binary patch
literal 2335
zcma)8O>f&c5WVYH%w8%Pu<UzcWt*hv*1%>FwCSlR1X>*1Y$Z}lQrQH8|9giLB~i|1
zH-HZm`R3!zJPs|YT4@WPkrfv9T2&Bhw~j9((I4GwRX;q}X#8<a->G#Q6Q+eiNr~j*
z6go*Y^5!XoRqQAJf%dv6R3j(!YPF`H!IE4kJ##GN58B*HTQ1?F(iO87`5hX=4tN$#
z5NHavt*XYdU5V!eI)14bj#EeIjL&4-XuMTa2#J(#P@mAAFljM>rUbqk)b~tc>FtPN
zBi19(tQ!L4wL?rs*M${I-Za)K`I;TIhcNlB15Kta2y@LVA(yncQyev;VvaR3iq$*y
zv~H{@&6@Qc2ugj!I90T#IADWhckY;iMbv3y;V?BZgLzkz#fYj{{lzki56U&cKn96%
z-%Du0XRzgPT0nLMZ3LjvHd=N|7yuVRtigJ;T`bA!bQ#glCq^MZ2vaj#9D}IbZ*`H9
zHi}LzNqp+W&vDP1(!zT$;^ZvtB@sM#x`^IS%8ZJV83V*|FG~ER9#P*i&2N>oOi0v#
zPZlLN@QSV|9{^VvQGiopf88=)heu%q$@s$g?~hhHrAo(qEYg;T$Hr<Q4>Q0;5PNh(
zw0e-cIiUl!bC+%<%xC<&5p;{YG6z}uk_}yTy#p8%wYtI4LKAb;$-=Yg<<kz}<<RCW
zAD1NA4D3;ul`Dq1?3{}|B)?64AEY9ivg`r9V~@BIihQ(?=SN!+HNU+g*(R}67IUoB
z53v`><AoED%fCdr;;JmwKgjdlGmwYCZYz^-G#g9m65W8KsN*HX0X+WhB<1{g75j3)
zyLXUu`v4m*9-$M<U#!9`CVoya>Cs6hEl4x*m506soaaQkmsnu;Hp_m9q<)B8ZDxbV
z)6QDIIKldAv!>*y>?q1K;Qo_Rp1VO854GI#(e0Ky$0OmlCEg7pGvf=;`q7v8gcq*r
zn|`F3vN>cibCWR!D{M)H@8)Do!B0W-&doSDUw2gvvvqVg8vTpQa|zLC(n>n<2t(7q
z`}qDcUw<+reBT3KW;|2u?=v=3Pa1?W6kMp^)Uv}_8J&7JFJ4)}seJu=vFZhH@@Lh=
z;HQ9pjkEY;cX<qShqK0Zj@K@mu-$I=0^%6LF1*y)|6ZCr-w8$OFnK_&8dE-hLHf%;
dllRlZ-Jhe}Xei9|Hj5N|&^@L{h2DtE=odKf0apM3

literal 0
HcmV?d00001

diff --git a/app/soapbox/features/ui/components/action_button.js b/app/soapbox/features/ui/components/action_button.js
new file mode 100644
index 0000000000000000000000000000000000000000..e1c88d23230a907750a317f203289e700a2590fd
GIT binary patch
literal 3452
zcmbtW+iu)85PjdTm^?`WcD3)DZfZM80Rv4DxH0lj1c6rK+H5FN6)D@PqJPf}FS=P9
zJ1t-s+Tn0+XXXrfS*hB<70Yr1$6A#T)$|>`Tyb~QLawA_c-)N@HZ?1nhe7SKEE|&@
z1bbhr>ciKH>4`QE$D0bz4V@2n=T}H&Gt+6IU`H<5JEnDZ!}J=s{2QaXlt#=V<0u-8
zUo^%j>4VWKs}Aa6n=4FCGHLYoV9y8rA(5tLuY=yHWKd_*8yk$|BGdYhtn8~`1(F1V
zQo8~;Dk0SUd7i6Anl%a<`ABpSD*rN3nMwjKAvuJPE2+1cvq~OUh@m!s?rrg4KdWX;
zu>{vUXn_|yh`fO`97JonmNmk76j0~d#~VRM;k)1;S#aW|`@h)&_}ex6r(xPKbUq8A
zKUuPIexGr}<qc#Nw$5E9Qg|(R{soMJJd-&SJ}&TPyt_u)LOycl<x8%v-4!@%3CzwL
zVg)y!(e;rF_Q=}!aLMFbybS)bwbvyBU|IF2$qf6T-s4PY#7)yr*uMfoET9_X=?yb+
zRI&&y048giT3SUw=n0<g<qH2oH)PctuB*)Cw}bt-@S=pA*uGHGffW0GNW4jYgdifv
zmookf$wOqe`)+xK$wm%%#3uTbz_)J@TI!Vkfb*v$_yGtp#i0|=U2Bis#}O~0B(a%e
zqQHb^KG2Z?7thnzsaES1{#WvX#xHmZF+C@D+gvX7aBUQcZ?dODIg!bj1448T|4AKO
zBDSU2gXMZZ!f@t!JuatBwgwc;8Y5Yq4RpJ*WCrJ!W<0&J2g78c;RJiOR7z@Ho>Qy)
z1+n+|_@>y6ZU>zdV@bKbLSo>!aj1t06W5SCpsBFSCOtMXUr@B*J*h_<W2~eOv|487
zXmDuc{N{MWi+4oYalrPT%R=3!Sy8;b!_D$LM<SD~j&UY5|Cix3m|L#X+e{XMU0K;0
zX|BRe!S9eZOx-Xbps@8Oo<4FRu4TF8tY)RUW6$<C7<W;)G9r6m5}s1PMM)s(G!#0v
zkvo|OYi`OG`bU<m!VeAA*g;sYP)|p0ZJ-QV_(ouJVv*3#5D^s&Krn-vL_HTq;<;>u
zuz&&3tiJGJ69>I0SrW*xzcSKA4=?un;CD1rJ)Mj#y7LL|5p%(I3m<VU;Z`+VV7Lrj
z4%`S_gHTz)3L8CTu-*Dk&t1=<m}R<zNhN;qBig@7_K{FGYU3Y1U~qQ#EfqICs=Ca=
za*xAnA?>{+9nPLzt^0P=%&v_(*uHXD^z=Kg)8dM-L^h|%<rHua&=a%Rw;s-ud&e4O
z#plCUTs$2NxwrkNjwf}XS&UpwHk$%pA$5c8bjPCIxDysLa7)E6xenc(Ea_8WPb~e~
zzt{Q~80-d_)BP`yJQc-HAktU!r<=;}KPo#tr6yI5qeiou#8HBjxZHJ?P$o@h=V!M0
s`vFHz`2UkIe#;TgY9DPiGxYe>TjWQ207m^BbT%OW4C@2&1mCT`1H{{oa{vGU

literal 0
HcmV?d00001

diff --git a/app/soapbox/features/ui/components/user_panel.js b/app/soapbox/features/ui/components/user_panel.js
index da515ffed6bd79e36fa59a501a0d1e9ec947ebb0..dd7fb0d88bd508dc069154209708c902b898994c 100644
GIT binary patch
delta 25
hcmX@7@KJt)Kl9`qX1&R4nJqTIV>V&j?8eH$4FG}12$lc<

delta 112
zcmew;e@<b8KeMEQLRn^UW>QY7l|n#KenCiOL29vHQht8UWN&68ek9qFqSDmKmCQEm
sIuIS3H#3_ts^}<GE2x(irxxiJB<7{&=;}gEQ@4Vdt5Cc7B?|{P0E1H|EC2ui

diff --git a/app/styles/application.scss b/app/styles/application.scss
index bb3d0ca822..b040685c9e 100644
--- a/app/styles/application.scss
+++ b/app/styles/application.scss
@@ -71,3 +71,4 @@
 @import 'components/error-boundary';
 @import 'components/video-player';
 @import 'components/audio-player';
+@import 'components/profile_hover_card';
diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss
new file mode 100644
index 0000000000..ed99d923f3
--- /dev/null
+++ b/app/styles/components/profile_hover_card.scss
@@ -0,0 +1,54 @@
+.display-name__account {
+  position: relative;
+}
+
+.profile-hover-card {
+  @include standard-panel;
+  position: absolute;
+  opacity: 0;
+  transition-property: opacity;
+  transition-duration: 0.5s;
+  z-index: 998;
+  opacity: 1;
+  transition-delay: 1s;
+  left: -10px;
+
+  @media(min-width: 750px) {
+    left: -80px;
+  }
+
+  .profile-hover-card__container {
+    position: relative;
+  }
+
+  .profile-hover-card__action-button {
+    z-index: 999;
+    position: absolute;
+    right: 20px;
+    top: 120px;
+  }
+
+  .user-panel {
+    box-shadow: none;
+
+    .user-panel-stats-item a strong {
+      text-decoration: none;
+    }
+  }
+
+  .profile-hover-card__badges {
+    margin: 0 20px 20px;
+    display: flex;
+
+    .badge, .relationship-tag {
+      padding: 2px 4px;
+      margin-right: 5px;
+      border-radius: 3px;
+      font-size: 11px;
+    }
+  }
+
+  .profile-hover-card__bio {
+    margin: 0 20px 20px;
+  }
+}
diff --git a/app/styles/components/status.scss b/app/styles/components/status.scss
index f167cf2ac7..153b0118ca 100644
--- a/app/styles/components/status.scss
+++ b/app/styles/components/status.scss
@@ -162,22 +162,6 @@
 .status__profile,
 .detailed-status__profile {
   display: inline-block;
-
-  .user-panel {
-    position: absolute;
-    display: flex;
-    opacity: 0;
-    pointer-events: none;
-    transition-property: opacity;
-    transition-duration: 0.5s;
-    z-index: 999;
-
-    &--visible {
-      opacity: 1;
-      transition-delay: 1s;
-      pointer-events: all;
-    }
-  }
 }
 
 .status-check-box {

From d76f4d422ef096d0c305593a34887069b13cc50b Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Tue, 28 Jul 2020 20:21:59 -0500
Subject: [PATCH 19/79] update detail status page and mobile settings for
 porfile hover card

---
 app/soapbox/components/status.js              | Bin 17632 -> 17698 bytes
 .../profile_hover_card_container.js           | Bin 2335 -> 2465 bytes
 .../status/components/detailed_status.js      | Bin 7245 -> 7123 bytes
 app/styles/components/profile_hover_card.scss |  22 +++++++++++++++---
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js
index c3af6fd2d20917ef9ccdd5488e6d5dee0c597064..7a2db665c234e4a0954ea5499c3645f80f8ee67e 100644
GIT binary patch
delta 99
zcmaFR$+)PCaf7hDV0mU<N`ARsW?o)uQFvxbNyg*~dG*Ow@^+Xqn=9mRD#$Bl7W?KW
YW#*)6U})7;P*a=CXeGQk*`byN06r`u=>Px#

delta 27
jcmZ3~#rU9;af7h@<XQ6SlfC8bHqVm3sjzvnLq7`umuL#6

diff --git a/app/soapbox/features/profile_hover_card/profile_hover_card_container.js b/app/soapbox/features/profile_hover_card/profile_hover_card_container.js
index d9ae0986f8e276a2e51543ec3ad0c7e0906742c8..7d1d47aaaca6286a700486922c752e91b3330c1d 100644
GIT binary patch
delta 183
zcmbO)v`~11A(MY*Zb5!gi9&KtVsWuwVs2`&LRwLNu7WyPAP*#<Zp{T%RIQL%?3<sI
znUkte3sqK}pIDHTU!k8_9G?r4*{sW?$IPU`HTgWNs9!b0R1NilqWm<VPTh?BveY8o
m<iw&BbsdFj1uWvax@DQgnMpaR>Q)L+mO`y&?dFNBearx6=RnB-

delta 43
zcmZ1|JYQ&oA=Bm-CM{;(vdrSlq?}X*H8lkduE~LH8qDf;T$BCTbT&J(B`^a36FduD

diff --git a/app/soapbox/features/status/components/detailed_status.js b/app/soapbox/features/status/components/detailed_status.js
index a88395e2a910275eed438c9e5eb3d7241c130cd2..56dec3dd894fe575b721f47ebeb38883804b8127 100644
GIT binary patch
delta 441
zcmX?WaoK!BC9^<4QGQxxPO3+KS!$7UVo}QEzf2PKX{m`NrA4X5`UMc#_zaMAd@@iT
zi%@)WeqKppW?pKMx;0m3Zb5!gi9)qPX0dO663}FYT7|Tt{9Fa~;{3#dr2Go~%;NZ5
zunbT&S84@Vc}i+pVrfo^LUK-Gak0YY1I&6%LLk?KWfo^9<)m6Eq$TDQr*76|d%-+8
zi%V4sX1GRqW?o8uxn5=-(Dv}ml#-0ebGf7hQM8s6m8MP><u)Xsi3Ox-b1}CdBR7)v
z&Fgq1xF>Ix5S@HXTu;l6O92Jgpog9_EF>liNSFmE;&!H{f|{BFG<1=yt5wiPwZlf=
UC9}97C$Z8mF*kMd9*K#}0Gd>qp#T5?

delta 558
zcmZvZ%}T>S5XaH_0jUU{Qq;qMLKAH_R;jJgRs_XUMGs1QYSLyy7n0qO-F{JW^a=7J
zLax4nc=9ED3Bfc~>4(FfW_~;W|IB=p-pen;6nf;?zc(p%!1kF7S%kFsb&1wyuE!{*
zf@|HFX?kNQT3@+czD)Qh!b!`)I@qSeaZZ9bJfGRb!AZTY!_i{45oaS~?KAa2c#XAU
z7%HHsP^m(nP>c1EYl?QKhAm<$Sw@{9@V1XJ1(RB!xaJ_=Czj~wP(CYq12wBoK45+x
zUQ6nx=n#&6TPxw0v~A3~6@C}z=8a-RO+kA2rWenPm~C?`>a$dA{6DGzL0FaK@J-76
zqrIAFM?2}QrGsf3v#sZqqS8ht9a=Kl1+ALwb-de2T>RZDe3eg|(+mGONB~?69b6fW
rKrl}SV}CSFH4Y2Kz#AAjaIh^F%JqEV<ak_%AOJ1AlJ}y!%ya4+k*U6l

diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss
index ed99d923f3..d8c47175d1 100644
--- a/app/styles/components/profile_hover_card.scss
+++ b/app/styles/components/profile_hover_card.scss
@@ -1,17 +1,25 @@
 .display-name__account {
   position: relative;
+  cursor: pointer;
 }
 
 .profile-hover-card {
   @include standard-panel;
   position: absolute;
+  pointer-events: none;
   opacity: 0;
   transition-property: opacity;
-  transition-duration: 0.5s;
+  transition-duration: 0.2s;
+  transition-delay: 0.7s;
   z-index: 998;
-  opacity: 1;
-  transition-delay: 1s;
   left: -10px;
+  top: 70px;
+
+  &--visible {
+      opacity: 1;
+      pointer-events: all;
+    }
+
 
   @media(min-width: 750px) {
     left: -80px;
@@ -45,6 +53,7 @@
       margin-right: 5px;
       border-radius: 3px;
       font-size: 11px;
+      opacity: 1;
     }
   }
 
@@ -52,3 +61,10 @@
     margin: 0 20px 20px;
   }
 }
+
+.detailed-status {
+  .profile-hover-card {
+    top: -20px;
+    left: 80px;
+  }
+}

From 209f826c15d2065a19a7af561b9f38f00c95580d Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Mon, 27 Jul 2020 17:26:03 -0500
Subject: [PATCH 20/79] add reason field on registration when by approval mode
 is on

---
 app/soapbox/__fixtures__/intlMessages.json    |   1 +
 app/soapbox/actions/auth.js                   | Bin 8602 -> 8838 bytes
 .../components/registration_form.js           | Bin 5583 -> 6007 bytes
 3 files changed, 1 insertion(+)

diff --git a/app/soapbox/__fixtures__/intlMessages.json b/app/soapbox/__fixtures__/intlMessages.json
index a8217149eb..d46a8934c1 100644
--- a/app/soapbox/__fixtures__/intlMessages.json
+++ b/app/soapbox/__fixtures__/intlMessages.json
@@ -834,6 +834,7 @@
   "registration.lead": "With an account on {instance} you\"ll be able to follow people on any server in the fediverse.",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
+  "registration.reason": "Reason for Joining",
   "relative_time.days": "{number}d",
   "relative_time.hours": "{number}h",
   "relative_time.just_now": "now",
diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js
index c241b801f22228393d132ee86d7104ee0383071f..a8d6d5f0fcf54f4a92e90dceb1f39349dc9f1bb4 100644
GIT binary patch
delta 231
zcmbQ`+~&IBqo8ndeqM2jLSAZWO0i=>K~a8LV$S3|PO-_W1bH|Tp#q!l3wkrkW~M1<
zfYmwY=cQ#9<tCP7=I3cDRC6f+!Q_ejB9pZQxF;tH8){gCg%lKO6;gAGQx)JEVHTik
z@>JJRP>;+nEmBBKPR=jQD^bWuELKQLP0dp%E=|hKEGbD%QAo=NN<$r_r>?1qW(krr
QmI(_m11;aYQTQb<0MZ&slmGw#

delta 75
zcmZp3o#njYqu^!-AxlQ3qSTVoqCADX)YOz>=ls01%%a@HlFa-(E(IvCpS(cWjSJ4T
Sn%p2FHF<@!_U5x9J9z=d(HFA-

diff --git a/app/soapbox/features/landing_page/components/registration_form.js b/app/soapbox/features/landing_page/components/registration_form.js
index 36faad10329ad4847f0aa2b620b2b673f04b71ed..2b172910c3e84cd6fc34f6c83b148a1b5ee09a00 100644
GIT binary patch
delta 222
zcmX@F{atUvUluO~g`(8N;`}@-g=&S&6e|VwqSW-v;*z4olFa-(J&2sTjzUUmT4HHV
ziEnCgabkKZP+1UImqJ>8k%Cu#W?p7q`sN=jpLw(t6sj}xic1pnl2i54Q%f||6AKE8
z^2-u);)_xXOEZg7Q`9vT)YP~X6ecg>)tr2qSDPDRiDoTGjFC@F2Wlyhiw<%VD|}M(
l(n~UIt4$3Iz#0_!j3?I$7))L*Ajztrpl?^Z`JUiMW&j6lNU{I`

delta 21
dcmeyacV2tLUzW{2tnYXxTZ!{;UL<^#831mE2?78B


From 4ce5ba6c1af5e88b25bd763a9c15616ff69ebbf6 Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Tue, 28 Jul 2020 21:19:11 -0500
Subject: [PATCH 21/79] textarea input

---
 app/soapbox/features/forms/index.js | Bin 4905 -> 5559 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/features/forms/index.js b/app/soapbox/features/forms/index.js
index 75feac6d47009ba926541c0aac837be8dd23bea5..24857c33fdd60ddb6b4313d1cc8e425daaa3aa71 100644
GIT binary patch
delta 98
zcmZ3fwq1L}PPWN=Sh+YtQY%Uli&7IOpJol^D1mX5*$fdfF|1abC$p_%M2N_7$4ype
UuN8r5R<Ke~hw0tCiM^Z~0PxWx8~^|S

delta 17
Zcmdn4y;5z%PPWYl**h3FpXYkP1pr4e2crN0


From 774adf9baa203588e1c0f7943a826377f5fa8369 Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Tue, 28 Jul 2020 21:30:35 -0500
Subject: [PATCH 22/79] update reason or joining form to simpletextarea

---
 app/soapbox/features/forms/index.js           | Bin 5559 -> 5557 bytes
 .../components/registration_form.js           | Bin 6007 -> 6132 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 24857c33fdd60ddb6b4313d1cc8e425daaa3aa71..471a173f8672d1f23ffbcc68dc53c812d25f4f6f 100644
GIT binary patch
delta 12
Tcmdn4y;XaI9Q$Sk_UU{89@+#K

delta 15
Wcmdn0y<K~Q96M8H-ex)W>3jez83gVC

diff --git a/app/soapbox/features/landing_page/components/registration_form.js b/app/soapbox/features/landing_page/components/registration_form.js
index 2b172910c3e84cd6fc34f6c83b148a1b5ee09a00..0d6a9db713e3a6a1bc1c8734a5f6a7d7416b698e 100644
GIT binary patch
delta 214
zcmeya_eFoh1V+B#%-n*U)R5GQlEk9a#LYd7h0L3MSk-w2Q6;z(6ej-@5udzQOxXme
zt~ftWT_GhkEwMDG#5c9LI59odRy{nUQXwT@p)$Wzp*%6KM4=>KAuB&K&t6?Y-)=Ia
zun1d5W?qSHHOLGvh#B!95ln+ZGBS%5$}@9v6f#nC3KU9<6^c^JGE>VzMi(h078K-U
WCMT9;g4_Txd2#|D+vb}>^H>0Xc}xcY

delta 113
zcmeyO|6Omx1jfya7;~Au6cmb56N~fntQ4vhGE=M+)QeKnGmA@#5=%1k^YkEc>N*N3
zscDI&IVHZS#l?x~sX%2xU|kAn`9%s|`I&i{dFh+ESao<OALW&re3w_79imfnvyJc$
F763dUC}{uy


From d99e5d543cbc23091398e0e8dd9208d7582fef4f Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Tue, 28 Jul 2020 21:46:27 -0500
Subject: [PATCH 23/79] fix linter

---
 .../profile_hover_card_container.js           | Bin 2465 -> 2419 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/features/profile_hover_card/profile_hover_card_container.js b/app/soapbox/features/profile_hover_card/profile_hover_card_container.js
index 7d1d47aaaca6286a700486922c752e91b3330c1d..a7a33d17e44739553aa12328fca38dcfb9ab90cd 100644
GIT binary patch
delta 12
TcmZ1|{8?y27}Mq!CRug>AVmZp

delta 56
zcmew?v`~0M7?XBpZb5!gi9)qPX0dO6Qf5x7LajntQGTw1dU1YYK~jE&er9oeE?8!B
IFp~m108%IvJOBUy


From 84b4681b50a7e438edabc0d02785255bc8a947d4 Mon Sep 17 00:00:00 2001
From: Sean King <seanking2919@protonmail.com>
Date: Wed, 29 Jul 2020 11:51:29 -0600
Subject: [PATCH 24/79] Fix detailed status

---
 .../status/components/detailed_status.js      | Bin 7123 -> 7129 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 56dec3dd894fe575b721f47ebeb38883804b8127..bd3b0bd6455b587cc20e5240c533b709b56e7ffd 100644
GIT binary patch
delta 28
kcmca?e$#w|zxd=7al6S2#HUU+mXMz8D=xm-Pok9>0Hfv#1ONa4

delta 28
kcmca<e%XA3zxZT(3DL>^;&zk!#V1czk&xURBGJkW0Gve$!T<mO


From ee97e947793f15dc3ed8cc1a5fcc673cf628f585 Mon Sep 17 00:00:00 2001
From: marykatefain <mk@marykatefain.com>
Date: Wed, 29 Jul 2020 21:08:36 +0000
Subject: [PATCH 25/79] Bookmark posts

---
 app/soapbox/actions/bookmarks.js              | Bin 0 -> 2682 bytes
 app/soapbox/actions/interactions.js           | Bin 8072 -> 10151 bytes
 app/soapbox/components/sidebar_menu.js        | Bin 9050 -> 9379 bytes
 app/soapbox/components/status_action_bar.js   | Bin 14829 -> 15237 bytes
 app/soapbox/containers/status_container.js    | Bin 6126 -> 6306 bytes
 app/soapbox/features/bookmarks/index.js       | Bin 0 -> 2501 bytes
 .../features/compose/components/action_bar.js | Bin 3999 -> 4160 bytes
 app/soapbox/features/ui/index.js              | Bin 20402 -> 20523 bytes
 .../features/ui/util/async-components.js      | Bin 5699 -> 5812 bytes
 .../reducers/__tests__/status_lists-test.js   | Bin 508 -> 625 bytes
 app/soapbox/reducers/status_lists.js          | Bin 2880 -> 3976 bytes
 11 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 app/soapbox/actions/bookmarks.js
 create mode 100644 app/soapbox/features/bookmarks/index.js

diff --git a/app/soapbox/actions/bookmarks.js b/app/soapbox/actions/bookmarks.js
new file mode 100644
index 0000000000000000000000000000000000000000..544ed2ff2244553b9e39e1ef8133a7fc3681a973
GIT binary patch
literal 2682
zcmdT_TW{Jh7=7ngd~b0i6tveOHc=Y1s%+f|NRy@trHRv81c%wq)QR%n=SyOet|3Xc
zmmwtQ@?DNUpL0TX`-}+)_hbkMc)(&o=$69~5|-`2@w}0I<%|c!#2vs~%&~|baU6(H
z<Q!MxN9H|dGG~CFbnz&oT)^e+?aim@^2Wc~1gq(49r(d!?yqJaH%tHP+7DJR0jD)c
zmhD(ISkGpD5S*`C1a+@EpI$FO{?1}mL7n#RfBQ21eAPC9dQ=yzMMldA>QO!FwhW=D
z`(g@7P9s4w3W?&*WtMGsA={ofgj_fb02mfIqkv+<_n{0NDpD$*VHYOvbqD}S0F{rC
z>&eS&ioQEs({Ym$F1RxU=e}s7ZwOyxVNB?QbLW~?>KskGv1|-*9O$L&j2eJ0@sAvH
zfm~NoT;)lHSTq_8a+GRDKi`c`2wYD*Vu~2%dnpHe+6#cu2gOf9(yEl8jdVSR6YeF1
z#weBIRGDg(k5iaTBoS4nBf%&v02cnMO0{LZI257U!i%hiO$T`tVb1I6L(rf<=*7z!
zfeWB{nwDjct{15@M3}LRRkv(GHnf|EBsE#5S_<lMJdpp=0@^5LPpZnSgWj?DwZ|9j
zo;2*;vmBJ+BIagBHEwr9P>5F{0I=2cotk=oWR;orpNA5&fuhgyOm}I|A&vh|-$oHR
zlLWW&@2YdHhC4ZSMZ`j($}e;^DHrt|o}YWy?e8B=ld!Zb;r(eK672tC7)`q@g-|-4
zHk^Op7)|{u^e$ZOsMiL|Xewh5r;kSJU+6c8qa2pixwh0^u2KJ*8?D-MU2LOiB9+0u
JVJ3~n@f(rWVG{rV

literal 0
HcmV?d00001

diff --git a/app/soapbox/actions/interactions.js b/app/soapbox/actions/interactions.js
index 7451c14f978dac75cec8cc2a05bd74b21f75cc16..1acfa9c57b473362c2548e53015c5c27534636b8 100644
GIT binary patch
delta 872
zcmaKqO)mpM7{^mlY|AFiuC}Dxj5e`7kmBMc5sFI0OJ7#cwcV~L+Nqr_5^;B=&&|Qr
zS={*ud;>lK>A~G@n9dZjr=92d&GY~5%w8<qW-g7%O0|wH8=WDthfh+6rt^M|b}d{*
zD#3cagin*YVOMaCBz3n-?smLhc<JhiEM+q5o2mSIF`v#A(%LqfM=Gs>;t5CTqNo*?
zm(!ZY1L+lb=aJRa+6HnSZia*8x`VO8R(lQ?#HtSFgz*>`*MYrzhDY18xIi8%x^)#i
z5$V3>MPgqG<AbVh9l(TNhS&ahpj;t!-8S|Tw9{0wjGF0*!@eAZrvWuc0j*&eCLsx8
z>vn^{qa11q{%HHS6RJAq9Nc#f(#vJDtipge#iq8DS+;ORZp5h67HQOIQd7w@E*qM1
zHNvd@rwF_EA0n1n#mBD7h%nBkwv=hMxDwPpdZ6$iAovhMh{|-PjUme<b>}ZK0r`g5
zuIH!>hkh|YyK|I-BVU9iwG;_NDa`gwN=Y}($G#368y~w$>Jwwce@6Vyf1UWmFRS5S
RR<IcM!u(+G{k8Pw{{%3!AOHXW

delta 28
kcmZ4P-(f!?dE;~@*2&VmoSWaUDez5>S76<|N%|`{0GLq<E&u=k

diff --git a/app/soapbox/components/sidebar_menu.js b/app/soapbox/components/sidebar_menu.js
index a62c3295708985f9a477d6c8c4ba83bacf24b16b..f338023715ced119bbb64e9d085f7aa1b04f2a3a 100644
GIT binary patch
delta 114
zcmccRw%Bt+2fJcYetvdtVo`Rnl|r>bW{Q=9dUAeFX>Oh#Ok(mvc2N!|sH)8k?0*F(
mpOx0*fJ-w<86Y^0va#GSnPSb_$sc(|CfkWgZmyNQ%LxFS6e>Uf

delta 29
lcmZ4NdCP4>2m9u8>|X^ZC#VQb_Eol=?4YE**+x2@69Bu*3fTYv

diff --git a/app/soapbox/components/status_action_bar.js b/app/soapbox/components/status_action_bar.js
index 807c8f3cf281328def99fdb4c09c37d1798be308..1ee84ca00a049ff8a0787c842bf1d0a026c376a3 100644
GIT binary patch
delta 272
zcmaD`+*-cjB)dXVetvdtVo|o0LbXC>ij{(TaY<rHX|Wzme6k~ph_Mq?k-9>y4wr&L
zX&y`#T^B-Tav-;~C`=htUr}m7eo@Kfg{;DxAF<zN;eZ)C`5}+Q=Dj?noa|7M$@!AX
z>`*%=UlbLe%qPLU*+}du=j0=*s*~p^@tDC(PEAqQRIpdbO)V}?OiwM=LpVUe3Ly$p
aJy}s+Ob}+Pb53S*wnD9@^=3hZJCXn|=V2uP

delta 38
ucmZoIe_OoaBs*JCYC(Qc$>fEs!kddZZnJF8<1OXfY$pDcbMtz|Ymxv&T@T~{

diff --git a/app/soapbox/containers/status_container.js b/app/soapbox/containers/status_container.js
index d84141165f4f2d9202a9832bae93769bce727237..02dc76c21e6badea6002ff3f314af8cf78a67a31 100644
GIT binary patch
delta 112
zcmaE-zsPWdA){DQetvdtVo|mZmx4lR9*nnHm+?6_hZ9t8a-pcaCQK?dMO{-<p&F<h
h1X41K3ld9`Gc*u-C!gd|=YXl6tiUb3S%mi%7XYD}CX4_8

delta 17
ZcmZ2v_)dR=A>(Fm#>d>7Pw?L20sul%2P^;p

diff --git a/app/soapbox/features/bookmarks/index.js b/app/soapbox/features/bookmarks/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..60ef2e0c5597e1b81f93ce41e64ccc0e53fe033d
GIT binary patch
literal 2501
zcmcImZHwDD5dNNDF<S~wz;V8(>!q}%5UvYHcaP&Z%GR+a8+C2TC&}#wlmFh)o2?`*
z+`$#{!S*~entA4#QFz-)W#A)LwSk?IEo90*XRl`5n+B+*5J=`@3Ro&+{qqF-UCHkL
z(4h{Xj^3BXewZ+uw(U)|ZSWlIj$HC+URvif-?y^qTM>d6#j5A4T2h7rh0*kAt<y;Z
zFx+v0x2SdXh&l%@zEBMtVVWG?OVw7!APeTR$~b|hP*c*q!ng6r6DpF#39}sYnu6S!
z%JljJ*O6qZfPN!Vue3uvGz6L42H2sg_iv<pYAf}G%*P>;V=sIhY8aP7ueJebIiFG6
z=(sj80Oc7a^I-<C$BJ?BxP}2ZTSMk~ET%ZQ^{V>D1gZ!Vv(XtG^VxAR9aVKUKfIT=
zznV_8MIn?o;12U8ZkS$sL-B~zkon)4H@Mn$mP3{vpK*h&&OR-2N|);oG9>Im|H}x`
zEBlm#Q9Zg?`%2$Rg=@IF`VX-LJ{y;es~ex)^aP6Fb(oZSd&<OO_Ii@vtZpi;VPp{~
zA_}JACqf%$RJhHM*LD&O!Tp?-U^@t)WN%QdVH~PLZmrfWVMl7t=xwL!)Rl4FRV1*~
zdDn}&;QAx}({q|}8-*h5W#6zrI!67xtCeh;bC-Z~Dt0ZN%8ADoR@@h%?X;!AeDW7C
zugndJbgEMuMdI}*x1>?-mqZF7DK#E2_IvW5jES%=&7Q<@R^M@UD|=z)i_ic+XtZ(y
zn>3sym_65pWn8~<3`XPpClfti&>&I6Y`@Z@Jm>RH;a8iP{$+>mE5RDH^JT|^Drl?c
z4YR}RW%mD6IfSssv0SQGk^WI#@M)Ei|3G^5Ey^q>uI%RDupANv<Pf?|dp{2U54+-v
z>Ns6+R4T247|zX&?S$Q-*wSqj?}`$xFYXV{%FKZtynnJl&-Q2e;xE|)lOi*e<5z@A
z9AMmca6nVQpL-N=AXvp1&;>_D82HAU#&You`i|DN!r}$2ZbF(0O|JyZozeiV{Tu+N
z^viLZW^vn>gJrhZxmz%lHIMg15w3*A5w=zR^u~z0hPO8%GR3}g+}o>c{06jD3F{X_
zIb3-@kBNP3SUHT3Cw8|}e#1jKe2#1&d+=D)%a=oJ%<*&T7usA7;UTq+ou_)E2vWNg
zQS9a5ruB3JQt0LSqdG2DV(O7frX13@6t(4o-OG2f?pyjBL(C-_o^Y$k{`JZ?*1yMn
Hah!bzXhTir

literal 0
HcmV?d00001

diff --git a/app/soapbox/features/compose/components/action_bar.js b/app/soapbox/features/compose/components/action_bar.js
index db17749033164d84009f41f87161f931e0244cdd..411a30f17dc0ca73fbe0e970001684ead09ce254 100644
GIT binary patch
delta 85
zcmbO)e?VbF1rvKxetvdtV$oy+W@&Z^GkY>4vnYoXl(V^j=@0wl3!ExaP?g!mnmP(4
V`Bn<*`Y@5n0z7`3mva4L0RZ{!9oGN=

delta 17
ZcmX@0FkgN{1=HqZOkdbH^Ku)r0suji20{P;

diff --git a/app/soapbox/features/ui/index.js b/app/soapbox/features/ui/index.js
index 11e0669a9a4ee42dadc329c835e4679c8c773bb5..7ca9f788f8c6a17b9d2594e969db6aca3302fc9f 100644
GIT binary patch
delta 55
zcmdlqpK<j9#tqjwIGpnHvvU)RvNvDi*djLhfr1<xL|`(bq6RxuZgQf!`Q|0^d<Fn*
C5ftG7

delta 19
bcmZ3zfN|4&#tqjwHb3E5FShx=yp90?T;B-4

diff --git a/app/soapbox/features/ui/util/async-components.js b/app/soapbox/features/ui/util/async-components.js
index 7d3805ef16a0eac2cae8b573afa24b194b0f3c21..48f36a954c534077f4f22332d1ab92379feebb2f 100644
GIT binary patch
delta 54
xcmX@Cvqg8qO?D2a{QT_P#G>rU7dT91lAxSoB?T>gbv-?OAcBc)KFHq02LLV%6I}oR

delta 12
Tcmdm@dst_~P4>-R99et-B+mri

diff --git a/app/soapbox/reducers/__tests__/status_lists-test.js b/app/soapbox/reducers/__tests__/status_lists-test.js
index b996228a1835b8bb815cf7cbfe092223778184da..27f6ffde17f681879447340c27167a9858990db1 100644
GIT binary patch
delta 20
bcmeyv{E=ltJtId_etvdtVo~;FA;wn#SI`I(

delta 11
Scmey!@`rgtJ>%prjI{tD_ysBe

diff --git a/app/soapbox/reducers/status_lists.js b/app/soapbox/reducers/status_lists.js
index 6c5f33557427ec10bf73aadb7e3477ebe3f193a7..9f8f28deed42368f0e217a9cf3b656c064162f2d 100644
GIT binary patch
delta 379
zcmX>g)*-)vpOM4K-{0HUG01yzG`l2^4wr%gOkkpgEL?J8tQ3M>F9&B&e#;?+s_C>2
zM^b)%c5Y%(_9VvhaxlZ<gF~I2U4w%`7KHl2L?<6+yb4#o*`7(39bs}byAqr;v0iHO
ze0FIAn90TJItuEU#Xk9oDVcfc>ajWsB}JvFn$|$WlM{<m;a-^hnq3}l$Ydc7Be-Rg
zeK`~nGLl?22$|g+S_ql994IozlT$f2AY}h@h)%BJltk#A!-)v9$spO+TvEug(wjxO
Gv>5?&v~|J&

delta 29
lcmeB>KOnY&pK-Df(}Br<m`-k1V>!Y$`906h&9Qvii~y?Q3pW4&


From 23e370a10be82558948300d2bac4fa10cd53c389 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 30 Jul 2020 00:38:40 -0500
Subject: [PATCH 26/79] Bookmarks: don't update constantly, fixes #263

---
 app/soapbox/features/bookmarks/index.js | Bin 2501 -> 2442 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/features/bookmarks/index.js b/app/soapbox/features/bookmarks/index.js
index 60ef2e0c5597e1b81f93ce41e64ccc0e53fe033d..2d1054913da1c9a21336e7e541ab684bcf0eef54 100644
GIT binary patch
delta 145
zcmX>q+$FqWJ0pjVLTW`pVqVJRrHrNunYjh|MI{Q=3Mr{c`K5WusS33UX+`<D3hFue
zDT&1yo3AtOW1h^#Ca4cnprN6uU~8vP&7}YYB^jB;dId%K1;u(PnZ*T(CCM2YP}ASA
jN=fP{7#kSq08P(HO-#wmOSe)eDJlh8p}Dz%&6ODdKO!)#

delta 84
zcmeAYJ}SInJLBYwjLMtEnRYYFB<JTA<maX4mAGW4gchVEmZWMF6s4906y+BbPp)Lm
k;>b;`@Jvy#wVPbU>MKyK0O8hZYFcwCDAaCtWpiZ)03UlCkpKVy


From 7ac31efce789f364337af25435aaeebd5f76158d Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 30 Jul 2020 12:33:41 -0500
Subject: [PATCH 27/79] Markdown: style <code> and <pre> elements

---
 app/styles/components/status.scss | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/app/styles/components/status.scss b/app/styles/components/status.scss
index 7137874def..f79e1cfba8 100644
--- a/app/styles/components/status.scss
+++ b/app/styles/components/status.scss
@@ -31,6 +31,29 @@
   blockquote p {
     font-style: italic;
   }
+
+  code {
+    font-family: 'Roboto Mono', monospace;
+    cursor: text;
+  }
+
+  /* Inline code */
+  p > code {
+    padding: 2px 4px;
+    background-color: var(--background-color);
+    border-radius: 4px;
+  }
+
+  /* Code block */
+  pre {
+    line-height: 1.6em;
+    overflow-x: auto;
+    border-radius: 6px;
+    padding: 8px 12px;
+    margin-bottom: 20px;
+    word-break: break-all;
+    background-color: var(--background-color);
+  }
 }
 
 .status__content--with-action {

From 9d35498bb9de7d78675d0cfa5bd8e64d42b1d1af Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Aug 2020 18:03:37 -0500
Subject: [PATCH 28/79] HoverCard: Fix CSS whitespace issues

---
 app/styles/components/profile_hover_card.scss | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss
index d8c47175d1..1d5e05fd16 100644
--- a/app/styles/components/profile_hover_card.scss
+++ b/app/styles/components/profile_hover_card.scss
@@ -3,6 +3,10 @@
   cursor: pointer;
 }
 
+.display-name .profile-hover-card {
+  white-space: normal;
+}
+
 .profile-hover-card {
   @include standard-panel;
   position: absolute;
@@ -11,6 +15,7 @@
   transition-property: opacity;
   transition-duration: 0.2s;
   transition-delay: 0.7s;
+  width: 265px;
   z-index: 998;
   left: -10px;
   top: 70px;
@@ -38,6 +43,7 @@
 
   .user-panel {
     box-shadow: none;
+    width: auto;
 
     .user-panel-stats-item a strong {
       text-decoration: none;
@@ -48,7 +54,8 @@
     margin: 0 20px 20px;
     display: flex;
 
-    .badge, .relationship-tag {
+    .badge,
+    .relationship-tag {
       padding: 2px 4px;
       margin-right: 5px;
       border-radius: 3px;

From e32bf82b03a7a9dc47d2458b0a35a39cf8cf4d01 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Aug 2020 18:04:49 -0500
Subject: [PATCH 29/79] CSS formatting

---
 app/styles/components/profile_hover_card.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss
index 1d5e05fd16..ab4481bc43 100644
--- a/app/styles/components/profile_hover_card.scss
+++ b/app/styles/components/profile_hover_card.scss
@@ -21,9 +21,9 @@
   top: 70px;
 
   &--visible {
-      opacity: 1;
-      pointer-events: all;
-    }
+    opacity: 1;
+    pointer-events: all;
+  }
 
 
   @media(min-width: 750px) {

From abd13e8fa5b8943c77e3b5c4d902dd8e9b189460 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Aug 2020 18:18:34 -0500
Subject: [PATCH 30/79] Move hovercard into display name for regular status too

---
 app/soapbox/components/status.js | Bin 17698 -> 17704 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js
index 7a2db665c234e4a0954ea5499c3645f80f8ee67e..daeaf930ff6af36a8538c0fc637f89025b9b299a 100644
GIT binary patch
delta 38
tcmZ3~#kiu2al=OY$*1fiCo4M4oV>$9e)4*I>B)B;g@KrT^G63m763|M5MBTP

delta 30
mcmZ3{#ki=8al=OY$wwR{CvUWmoXq1eeezNV+0AzyyjcLvjtsW|


From 6c205deaf012b6d3f6a9e2ccd2b0680157df6852 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Aug 2020 18:31:32 -0500
Subject: [PATCH 31/79] HoverCard: Fix hover flickering issues

---
 app/styles/components/profile_hover_card.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss
index ab4481bc43..985b89ce1c 100644
--- a/app/styles/components/profile_hover_card.scss
+++ b/app/styles/components/profile_hover_card.scss
@@ -8,7 +8,6 @@
 }
 
 .profile-hover-card {
-  @include standard-panel;
   position: absolute;
   pointer-events: none;
   opacity: 0;
@@ -18,7 +17,7 @@
   width: 265px;
   z-index: 998;
   left: -10px;
-  top: 70px;
+  padding-top: 20px;
 
   &--visible {
     opacity: 1;
@@ -31,7 +30,9 @@
   }
 
   .profile-hover-card__container {
+    @include standard-panel;
     position: relative;
+    overflow: hidden;
   }
 
   .profile-hover-card__action-button {

From 1f5898b67d4d9f5095fda8773aeda7234d37a1ea Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Aug 2020 18:39:32 -0500
Subject: [PATCH 32/79] Bring HoverCard out of NavLink

---
 app/soapbox/components/status.js              | Bin 17704 -> 17669 bytes
 .../status/components/detailed_status.js      | Bin 7129 -> 7098 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js
index daeaf930ff6af36a8538c0fc637f89025b9b299a..1ad324f473928b3ee64bbb8b0938ec83d0c32aa4 100644
GIT binary patch
delta 25
hcmZ3{#n{@#xZ#^UlY;)_O%B?Vxg4f%zU$!40sw-@3B3RS

delta 47
zcmZqeVqDS1xZ#`qWCMGV$;uAXCp*})^60x{78m3sR{AC8rcVB0uRZyIqwwal4i+o`
Dv1Jks

diff --git a/app/soapbox/features/status/components/detailed_status.js b/app/soapbox/features/status/components/detailed_status.js
index bd3b0bd6455b587cc20e5240c533b709b56e7ffd..79ad209ceed327feeb538f34f21551693793f2e1 100644
GIT binary patch
delta 23
fcmca<zRP?=tvHi{{$xW5<;lI`lQ)M*v@!z#XT%5x

delta 45
xcmdmGe$#wItvH(<mjVz>o*_P05X7+2cgZX+$Vsg9OUzB3TraM?*;JyH830C?4jKRe


From a7463dd3fc630110ed8f5d089a40d210f1781a86 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Aug 2020 18:53:47 -0500
Subject: [PATCH 33/79] HoverCard: Add floating NavLinks for clickthrough

---
 app/soapbox/components/status.js              | Bin 17669 -> 17815 bytes
 .../status/components/detailed_status.js      | Bin 7098 -> 7267 bytes
 app/styles/basics.scss                        |  11 +++++++++++
 app/styles/components/display-name.scss       |   1 +
 app/styles/components/profile_hover_card.scss |   2 +-
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js
index 1ad324f473928b3ee64bbb8b0938ec83d0c32aa4..641aafd02b67ad4b8baa8e64cd9ce164aac3f1ad 100644
GIT binary patch
delta 39
ucmZqeVw~R1xS`U1@_M@*fwY|b#FEUsblsfHyliy^{mBOQBAd(Y`&a=lz79_S

delta 14
VcmbQ<&Dh$-xS`U1Gq*zzD*!5B1uFmm

diff --git a/app/soapbox/features/status/components/detailed_status.js b/app/soapbox/features/status/components/detailed_status.js
index 79ad209ceed327feeb538f34f21551693793f2e1..3ea96d0d7b476088d68c2140fa87079f557deaed 100644
GIT binary patch
delta 99
zcmdmG{@7wetvH(<mjVz>juvxfEy*m&Nu7K`T*fgmIk`kVR<l+iIVZ8W*e@|R)mA+%
pCqJ<yGcR2?Co?ZwT|pnB5u_OcZ1i0+iwklRD?!RP*Na=T001e)9y0&{

delta 15
WcmaECvCDiztvHi{{$>pcYZd@7o&?kY

diff --git a/app/styles/basics.scss b/app/styles/basics.scss
index 2dafa35a3c..53119ffc48 100644
--- a/app/styles/basics.scss
+++ b/app/styles/basics.scss
@@ -218,3 +218,14 @@ noscript {
     }
   }
 }
+
+.floating-link {
+  width: 100%;
+  height: 100%;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  z-index: 9999;
+}
diff --git a/app/styles/components/display-name.scss b/app/styles/components/display-name.scss
index 2282c6d485..0dd3e1e65f 100644
--- a/app/styles/components/display-name.scss
+++ b/app/styles/components/display-name.scss
@@ -41,6 +41,7 @@ a.account__display-name {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  position: relative;
 }
 
 .display-name__html {
diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss
index 985b89ce1c..eeae9d7c57 100644
--- a/app/styles/components/profile_hover_card.scss
+++ b/app/styles/components/profile_hover_card.scss
@@ -72,7 +72,7 @@
 
 .detailed-status {
   .profile-hover-card {
-    top: -20px;
+    top: 0;
     left: 80px;
   }
 }

From 1266585aef9f0299304bb46a75a8ca57cb0a8eed Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Aug 2020 19:50:17 -0500
Subject: [PATCH 34/79] HoverCard: Reposition "Follow you!" component

---
 .../profile_hover_card_container.js           | Bin 2419 -> 2409 bytes
 app/styles/components/profile_hover_card.scss |  12 +++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/features/profile_hover_card/profile_hover_card_container.js b/app/soapbox/features/profile_hover_card/profile_hover_card_container.js
index a7a33d17e44739553aa12328fca38dcfb9ab90cd..e7e5c4f8c5eb66fdfa7193cedb899bf1f7d0af2b 100644
GIT binary patch
delta 41
xcmew?^ipVpCfj5Y4w=bD97dDVIKnw>^ot7;^X#}LpX89+ti|?%aq=^cUH}=54a)!k

delta 49
zcmaDU^jT<wCfnq<94ec|*^e?#R%er&?965|xs)xEM?t|xzqlYV&yGt$Ve&Pg#9fXa
E0G)yl`Tzg`

diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss
index eeae9d7c57..ebd924fa65 100644
--- a/app/styles/components/profile_hover_card.scss
+++ b/app/styles/components/profile_hover_card.scss
@@ -18,13 +18,13 @@
   z-index: 998;
   left: -10px;
   padding-top: 20px;
+  margin-bottom: 10px;
 
   &--visible {
     opacity: 1;
     pointer-events: all;
   }
 
-
   @media(min-width: 750px) {
     left: -80px;
   }
@@ -51,12 +51,18 @@
     }
   }
 
+  .relationship-tag {
+    position: absolute;
+    top: 10px;
+    left: 10px;
+    z-index: 1;
+  }
+
   .profile-hover-card__badges {
     margin: 0 20px 20px;
     display: flex;
 
-    .badge,
-    .relationship-tag {
+    .badge {
       padding: 2px 4px;
       margin-right: 5px;
       border-radius: 3px;

From 24e7ce6e8362fbf829b1277230e4b7de6ac95538 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Aug 2020 20:44:47 -0500
Subject: [PATCH 35/79] HoverCard: Improve long bio situation

---
 .../profile_hover_card_container.js           | Bin 2409 -> 2675 bytes
 app/styles/components/profile_hover_card.scss |  14 +++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/features/profile_hover_card/profile_hover_card_container.js b/app/soapbox/features/profile_hover_card/profile_hover_card_container.js
index e7e5c4f8c5eb66fdfa7193cedb899bf1f7d0af2b..c74137f49595056c4f11a5d913175415d16a5ad3 100644
GIT binary patch
delta 445
zcmaDU^jTy>JBxgJYKc=~N_uLsf~|svrh=`VLN%8H5G3d46_+SfPu|EPYo3!@qL2hr
z6dh{~R*;#dppjYZn39{Br;(VPoL`z(qNxd0rdLo}oS`xK7rTnCCbDYZ{FKz9#FG3X
zTsmAibhwdpOm5&%<3lra6^EKAR7p{4Noi3Y)K2Tk^(>qCA<j<A&&kOzPfc-}Y|m<{
zgzygB6D1j$#d>hBYfLU=-N_5rRH>k*Hrax0E@SQFh3xv1#o4DyR6}&?<)r4Nmt-i|
zDHs6N0E1!jOE$g97uZD;6cnIJYQcd6vJwPr^iwj+?2yH(p<xBG-7`-kTD>^Gv?w`M
cT}MGZFTW&JJr>AN*Tim-Ag2z{O}3mm0D8HH^Z)<=

delta 207
zcmew?@=|C+JImystgHBPQcD!l@^f<X%TrV0lO}IsGo8%CzKst_tWv>#@_F{TLR<<+
zz)C?~U14$#$I;0Z94eE`IYmXQGm9Nlax?QZ5|fkjOY=%J71Y!eCjVklQLjbO2~_8s
zpORXXSdw3as@9uThXtf|@@h`$$&*;cSimN1V^tGEHo-<eC9}+KaxRDdWGOD4$?jY_
E00)jd+yDRo

diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss
index ebd924fa65..0910061cb5 100644
--- a/app/styles/components/profile_hover_card.scss
+++ b/app/styles/components/profile_hover_card.scss
@@ -14,7 +14,7 @@
   transition-property: opacity;
   transition-duration: 0.2s;
   transition-delay: 0.7s;
-  width: 265px;
+  width: 300px;
   z-index: 998;
   left: -10px;
   padding-top: 20px;
@@ -73,6 +73,18 @@
 
   .profile-hover-card__bio {
     margin: 0 20px 20px;
+    max-height: 4em;
+
+    &::after {
+      content: '';
+      display: block;
+      position: absolute;
+      width: 100%;
+      height: 20px;
+      bottom: 0;
+      left: 0;
+      background: linear-gradient(0deg, var(--foreground-color) 0%, var(--foreground-color), 80%, transparent);
+    }
   }
 }
 

From 2e21c04e28f4384b03200cc1577b5517b683374c Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Aug 2020 20:50:06 -0500
Subject: [PATCH 36/79] Clean up unused UserPanel code

---
 .../features/ui/components/user_panel.js      | Bin 4081 -> 3934 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/features/ui/components/user_panel.js b/app/soapbox/features/ui/components/user_panel.js
index dd7fb0d88bd508dc069154209708c902b898994c..7358306224284fc22fa28a16b6ca52d281b11e11 100644
GIT binary patch
delta 37
tcmew;e@|{hIMd`BrfrjJnGH8@WtL%_Y{S9LtZv6OIgv|gvn=ZsE&u^P3(x=n

delta 187
zcmca7_fdXBIFnLlZb5!gi9&KtVsWuwVs2`&LRwLNu7WyPAP*!kIfQAayMjV-No7u|
zl|n#KenCiOL29vHeo|Iya)}O?f<i49kSH!mEXhn(NJ&jgEX^qaDJxd6Rj3Ba!1Y$w
zPUd7bW!Hh2wb_nYhEb~;VY7yMX>n?iZb4#RYL2>QEku=VHQ3@>JFdy+IF&Ycv0UK-
E05_&V7ytkO


From 690d7154c4418425ea2b388bb50a332261ee9e1c Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Aug 2020 21:05:21 -0500
Subject: [PATCH 37/79] HoverCard: Fix JS console errors

---
 app/soapbox/components/status.js              | Bin 17815 -> 17807 bytes
 .../profile_hover_card_container.js           | Bin 2675 -> 2716 bytes
 .../status/components/detailed_status.js      | Bin 7267 -> 7346 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js
index 641aafd02b67ad4b8baa8e64cd9ce164aac3f1ad..d2aa5c177fba7c16dca60ed51322660f3d152840 100644
GIT binary patch
delta 42
xcmbQ<&Dh_~xM73cWCJ_#$uaiQlh@njOnz#wGMU>!ezJ~(IFLVWvztR8D*#{h54`{Y

delta 34
qcmeD0W}M#5xM73c<dybQCvUJbn*6|S(&Per#mW8llAEm^LRbL|ehx<f

diff --git a/app/soapbox/features/profile_hover_card/profile_hover_card_container.js b/app/soapbox/features/profile_hover_card/profile_hover_card_container.js
index c74137f49595056c4f11a5d913175415d16a5ad3..9ab2c7678cb5d203f0d67e57dfadc507801d22ef 100644
GIT binary patch
delta 60
zcmew?GDma+BP(}yYNf4uVoGjip86!#Abv16H$Nq{D6u5JNPTi3YYq=stRS(ZC_hhq
J^B&giEC6ll6zBi|

delta 20
ccmbOu`dMTHBkN>d*1*Ymtl68Nv2J4l07~2kE&u=k

diff --git a/app/soapbox/features/status/components/detailed_status.js b/app/soapbox/features/status/components/detailed_status.js
index 3ea96d0d7b476088d68c2140fa87079f557deaed..1f1c791dbeb85238f49c93621ec6d639fe70b318 100644
GIT binary patch
delta 96
zcmaECvB`2nhS=mAVj7bViHS{~Aa2TH$EBb!`J|Y=Fpx$ElR3mqq%g#7^iwj+z}mDV
SlqdU(zhnmTH``07umAwGw-)*U

delta 46
zcmV+}0MY-lIpa96Xcm*E7B!Rc7A2FA78aB47BG`B7c>PtFJx(Ulav?tlZ_V@vz!<f
E1hUo<QUCw|


From 29d1debdbfe71ab3e739b4d4ff742a2f18607563 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Aug 2020 21:16:13 -0500
Subject: [PATCH 38/79] Refactor ActionButton

---
 .../features/account/components/header.js     | Bin 15199 -> 13578 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/features/account/components/header.js b/app/soapbox/features/account/components/header.js
index 038a33d6fba00e63cd70adc434640a297dc8a62e..17ebb36b6f9475224f6d9746b13aea36551f15b5 100644
GIT binary patch
delta 124
zcmca#)|IuPli4jZw;;c$M8Pq+Br`wHskEddKTjd8C_h(0y*NLyASu5>KP@$}q_ilt
zSidw=KRF+$JTEn`q*y-@tRp@NtYvZ=v&QBZEXO!E|L3z2U2LVvyg5~8IuEZ6vbmE3
MEL1j&S$Z-701sU+k^lez

delta 1050
zcma)4&1(}u6sHXy@=*v$YHQH+B_Z7e^C1;4F{w6!AYMc)^&&Faog`zYGwJSZY6**Y
z)RQoOgLgFtPyPX(1i`a^fCmvgc+=UBY*tH)x8cq2<GtT|FQ0s!ym=9mpJSDx%?6xO
ze$<935Tgwm(sgb#(VTzC!$hvW8=y3B>Ir~TD1O-`T)FLu25=J}+Sn3U$^T;#{<x&Q
zog+j9VM9RUvB@WhHsKZ}`aTE_I$}DefincWK;LG4%Juyd>OtMr&hGjcxH)C$06Q*o
z_A~Y|ewQ=9*EZZU`S`){7+cMO&GaU*?yJ6ui4AvT0M2^8%c;28`<32mYKX;-E{K8)
zCO@T1@=GC~M)L}Ef!UPGUxji!EXs|I^0OLDJs$uvfNF8R2PIe4OiYn0X^qHOt0^S3
zTCk_m0<|haL5#4<WPt%<0p-ZRMj#1_5Ih~g)WV)g#N&=k=X2$7AKD|=B_xNPLRbFS
z%4I1Z@<!hlf-?;Sek!_C`8IPg8S-n6EM8qJ_|ZDh+P;3$y(l|yO$8efhfdEE1%p_q
zPqCqNJ5Y&Z<8l93_2kG8o9mlV_qxhL^E+uY40UCut)iY_tu2>I%3(E?1gGXKn#{`4
z8o2c;+<*gYS!k#>KEHNoFKYfd`;)AnHi`Uwp_7bEa8^8$<S#FI!DPKt`YV@&ES}H)
zw-U>&oKr*bu6&-!Ew{Git3qyZPqXi(MC?+eD|H~mYDO<}_O0?dm7IncXZCLE;qo6}
CYhiBy


From ccec8698fc315a82de027da15ed09299c9c0bbf6 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Aug 2020 21:29:19 -0500
Subject: [PATCH 39/79] Column border-radius fixes

---
 app/styles/components/columns.scss         | 1 +
 app/styles/components/detailed-status.scss | 1 +
 app/styles/loading.scss                    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/app/styles/components/columns.scss b/app/styles/components/columns.scss
index 7e6bafdc0a..1410831dbb 100644
--- a/app/styles/components/columns.scss
+++ b/app/styles/components/columns.scss
@@ -212,6 +212,7 @@
   font-size: 16px;
   line-height: inherit;
   border: 0;
+  border-radius: 10px 10px 0 0;
   text-align: unset;
   padding: 15px;
   margin: 0;
diff --git a/app/styles/components/detailed-status.scss b/app/styles/components/detailed-status.scss
index 9838278f90..6795bba5eb 100644
--- a/app/styles/components/detailed-status.scss
+++ b/app/styles/components/detailed-status.scss
@@ -62,6 +62,7 @@
   border-bottom: 1px solid var(--brand-color--faint);
   display: flex;
   flex-direction: row;
+  border-radius: 0 0 10px 10px;
 }
 
 .detailed-status__link {
diff --git a/app/styles/loading.scss b/app/styles/loading.scss
index 42a3a0c1f4..88705782ee 100644
--- a/app/styles/loading.scss
+++ b/app/styles/loading.scss
@@ -188,6 +188,7 @@
   align-items: center;
   justify-content: center;
   padding: 20px;
+  border-radius: 0 0 10px 10px;
 
   & > div {
     width: 100%;

From 7fe70a64b59eb6ac8751b450ae443f64281561b4 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Aug 2020 21:45:42 -0500
Subject: [PATCH 40/79] Pleroma relationship fixes

---
 app/soapbox/reducers/relationships.js | Bin 2738 -> 2848 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/reducers/relationships.js b/app/soapbox/reducers/relationships.js
index 8881d59255ca28b1b9f20601563614421b921375..dfc93950b4126b3706ba3d1921380c68e300c44a 100644
GIT binary patch
delta 185
zcmdlax<G70G?R2@Zb5!gi9)qPdTNP6twLH+ey)OgPJT*aamMBdCV8g%<ovwi5{07F
zoWzn$ATuMgK*1KISR*kxIlnZoL`NZ7y&xwQs4r1nM?oD~p?a*2LUpaCHJ5@yW}1Qq
xvXowCih`ONs<Dc;wjkv|)e1m~lG36)g}nU9%UGl*hcF9HE@742{F>!BD*#I$KJown

delta 91
zcmZ1=wn=nDG}GkAOfrk7GBK%SrYUGBCMGB6m*$n|738EA<>w}9Dio!blosVF6qh8H
iq*`-L=44fqMN^|!l$w)Rl9``ZoRL|ex!H&H3M&A)DIjJ5


From 3fd255cc0a44747e32d54214755ce7557e32e29c Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Aug 2020 21:46:56 -0500
Subject: [PATCH 41/79] HoverCard: Style <a> color

---
 app/styles/components/profile_hover_card.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss
index 0910061cb5..2a1c4e14c7 100644
--- a/app/styles/components/profile_hover_card.scss
+++ b/app/styles/components/profile_hover_card.scss
@@ -75,6 +75,10 @@
     margin: 0 20px 20px;
     max-height: 4em;
 
+    a {
+      color: var(--highlight-text-color);
+    }
+
     &::after {
       content: '';
       display: block;

From feec86718d6b116e3be1752c360cd690536bb207 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Aug 2020 22:06:57 -0500
Subject: [PATCH 42/79] Display name fixes

---
 app/styles/components/status.scss | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/styles/components/status.scss b/app/styles/components/status.scss
index c0ada2670e..7885f94c75 100644
--- a/app/styles/components/status.scss
+++ b/app/styles/components/status.scss
@@ -219,7 +219,12 @@
 
 .status__profile,
 .detailed-status__profile {
-  display: inline-block;
+  display: block;
+  max-width: 100%;
+}
+
+.status__profile {
+  padding-right: 25px;
 }
 
 .status-check-box {

From 4197e8e8332c4e9edf5fda9db9c2c529634a21aa Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Aug 2020 22:13:32 -0500
Subject: [PATCH 43/79] HoverCard: Prevent floating avatars from intercepting
 with current card

---
 app/styles/components/profile_hover_card.scss | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss
index 2a1c4e14c7..e113d98280 100644
--- a/app/styles/components/profile_hover_card.scss
+++ b/app/styles/components/profile_hover_card.scss
@@ -98,3 +98,15 @@
     left: 80px;
   }
 }
+
+/* Prevent floating avatars from intercepting with current card */
+.status,
+.detailed-status {
+  .floating-link {
+    display: none;
+  }
+
+  &:hover .floating-link {
+    display: block;
+  }
+}

From e943dc8b4cc549218f5d84aa0312ca64fa4419ba Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Aug 2020 22:19:52 -0500
Subject: [PATCH 44/79] UserPanel: Don't wrap text

---
 app/styles/components/user-panel.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/styles/components/user-panel.scss b/app/styles/components/user-panel.scss
index 44ec3cd9b4..b0c6564557 100644
--- a/app/styles/components/user-panel.scss
+++ b/app/styles/components/user-panel.scss
@@ -9,6 +9,7 @@
   .user-panel__account__username {
     overflow: hidden;
     text-overflow: ellipsis;
+    white-space: nowrap;
   }
 
   &__header {

From e02ff2bed3daeaf71f4aa15184052db9a14d5088 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Aug 2020 23:01:38 -0500
Subject: [PATCH 45/79] HoverCard: Style stats

---
 app/styles/components/profile_hover_card.scss | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss
index e113d98280..54ab23ff2e 100644
--- a/app/styles/components/profile_hover_card.scss
+++ b/app/styles/components/profile_hover_card.scss
@@ -14,7 +14,7 @@
   transition-property: opacity;
   transition-duration: 0.2s;
   transition-delay: 0.7s;
-  width: 300px;
+  width: 320px;
   z-index: 998;
   left: -10px;
   padding-top: 20px;
@@ -49,6 +49,24 @@
     .user-panel-stats-item a strong {
       text-decoration: none;
     }
+
+    &__header {
+      height: 96px;
+    }
+
+    .user-panel-stats-item {
+      margin-right: 10px;
+
+      &__label,
+      &__value {
+        display: inline;
+        font-size: 15px;
+      }
+
+      &__value {
+        margin-right: 5px;
+      }
+    }
   }
 
   .relationship-tag {

From 9a5046179bb583001a2aca380c79e5793194eecc Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Aug 2020 23:10:36 -0500
Subject: [PATCH 46/79] HoverCard: Reposition ActionButton

---
 app/styles/components/profile_hover_card.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss
index 54ab23ff2e..46a55a1e34 100644
--- a/app/styles/components/profile_hover_card.scss
+++ b/app/styles/components/profile_hover_card.scss
@@ -39,7 +39,7 @@
     z-index: 999;
     position: absolute;
     right: 20px;
-    top: 120px;
+    top: 40px;
   }
 
   .user-panel {

From 5081dd73c040cb7610758a48efd3bd8c9239b8d0 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Aug 2020 23:14:31 -0500
Subject: [PATCH 47/79] HoverCard: Reposition badges

---
 app/styles/components/profile_hover_card.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss
index 46a55a1e34..d87a3159c2 100644
--- a/app/styles/components/profile_hover_card.scss
+++ b/app/styles/components/profile_hover_card.scss
@@ -77,8 +77,10 @@
   }
 
   .profile-hover-card__badges {
-    margin: 0 20px 20px;
     display: flex;
+    position: absolute;
+    top: 110px;
+    left: 120px;
 
     .badge {
       padding: 2px 4px;

From 35c9574c2f85440b326a3c433247eac1448b342e Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Aug 2020 23:47:19 -0500
Subject: [PATCH 48/79] HoverCard: Handle delay in JS instead of CSS

---
 app/soapbox/components/status.js              | Bin 17845 -> 17993 bytes
 app/styles/components/profile_hover_card.scss |   1 -
 2 files changed, 1 deletion(-)

diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js
index b7b9a4fb103c1f3d91555b9cd8dd185ab2d5aa5b..42f44d7cc101189f2912ba41248cb5695411a83f 100644
GIT binary patch
delta 158
zcmdnm&3LkhaYGf0LS}A3eo=`+wL(g2QhsS(a;ieDLRwLNu7Y|_eoA6-#^!RCJSpko
zjQsL|qWrYXoK)w;q7(&NxN?oj-l8&-*UF1b_Lk@2&`~fnGBD7zp8QbGhaXjs#^gYG
et;zb*tdeMk=_Mxut<BNUw4NmIz4@U07gYdLyf-TV

delta 46
zcmX@v!??AZaYGf$=D94{Qj^cf^G>dix1MaSAjeixRGO+#JNb~j*5qz^jm_o?LTUh<
Cy%0YD

diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss
index d87a3159c2..5d7f7e8ff6 100644
--- a/app/styles/components/profile_hover_card.scss
+++ b/app/styles/components/profile_hover_card.scss
@@ -13,7 +13,6 @@
   opacity: 0;
   transition-property: opacity;
   transition-duration: 0.2s;
-  transition-delay: 0.7s;
   width: 320px;
   z-index: 998;
   left: -10px;

From eeaf9f0b8e69cc9ea07a0f0bda5c6b9a560633ae Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 3 Aug 2020 00:40:13 -0500
Subject: [PATCH 49/79] HoverCard: Do the JS way on DetailedStatus too

---
 app/soapbox/components/status.js              | Bin 17993 -> 17959 bytes
 .../status/components/detailed_status.js      | Bin 7380 -> 7494 bytes
 app/styles/components/profile_hover_card.scss |   6 +++---
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js
index 42f44d7cc101189f2912ba41248cb5695411a83f..b7f21a2fd59b4412841338bf025dce87d8065cf0 100644
GIT binary patch
delta 14
VcmX@v!??VMaRa}?W<v!DH2^Av1gro6

delta 18
ZcmZ49!+5fXaRa}?<ZgM5&7ulIY5+o(1@8a=

diff --git a/app/soapbox/features/status/components/detailed_status.js b/app/soapbox/features/status/components/detailed_status.js
index 3fb84f8c62cded1a25684126d7a904a9fb598c6f..4da17ba99e89aee979eac5def44b4721b4a7d822 100644
GIT binary patch
delta 169
zcmca&dCY197mGq>Zb5!gi9)qPN@`MmX<l-wLajntQGTw1dQN^yVsXZ1b{0oAwc?EY
z@_?fJw9K4T=ft8E1zWgs4Gm2NTRVknE(HaJ$^W@jC$Hn;;m}bqG%_&Iw4Ut3<-?Dv
nRb#Rpm-yt<T*68v8JWd;Xa?&gCjy<2qoHXHGH>&LuB(Co&PF&1

delta 33
pcmX?Rb;WW67t3Z{7CW}d=eRs3&*0LUtj(=5`5l+W<_hj}f&k1i3%dXS

diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss
index 5d7f7e8ff6..3293eeb8f8 100644
--- a/app/styles/components/profile_hover_card.scss
+++ b/app/styles/components/profile_hover_card.scss
@@ -16,7 +16,7 @@
   width: 320px;
   z-index: 998;
   left: -10px;
-  padding-top: 20px;
+  padding: 20px;
   margin-bottom: 10px;
 
   &--visible {
@@ -25,7 +25,7 @@
   }
 
   @media(min-width: 750px) {
-    left: -80px;
+    left: -100px;
   }
 
   .profile-hover-card__container {
@@ -114,7 +114,7 @@
 .detailed-status {
   .profile-hover-card {
     top: 0;
-    left: 80px;
+    left: 60px;
   }
 }
 

From bdd9204b3c6ba6f67a6196b4d606c99191d572aa Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Tue, 4 Aug 2020 15:21:42 -0500
Subject: [PATCH 50/79] basic filter form component set up

---
 app/soapbox/components/sidebar_menu.js        | Bin 9379 -> 9371 bytes
 .../features/compose/components/action_bar.js | Bin 4160 -> 4157 bytes
 app/soapbox/features/filters/index.js         | Bin 1181 -> 7418 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/components/sidebar_menu.js b/app/soapbox/components/sidebar_menu.js
index f338023715ced119bbb64e9d085f7aa1b04f2a3a..12ae23f5764fb3f6b6c8803271a615391f54c8ff 100644
GIT binary patch
delta 24
gcmZ4NIoorCto&pFY2C?w@&_kR5aZvhq|nF$0B$P?D*ylh

delta 29
lcmbR3x!7}qtUPnIzSiUgqS}+)<&Ur^XzAB(=2n=%0sxd{2`~Tv

diff --git a/app/soapbox/features/compose/components/action_bar.js b/app/soapbox/features/compose/components/action_bar.js
index 411a30f17dc0ca73fbe0e970001684ead09ce254..fa763d806a19edf91a5e94f3b06202267b6b1fe5 100644
GIT binary patch
delta 16
YcmX@0uvcM27SCjU9=*-8d6qH*05y{Z!T<mO

delta 19
bcmdn1a6n;077vrY{^Wz)`kQC)EM*1&N3RCa

diff --git a/app/soapbox/features/filters/index.js b/app/soapbox/features/filters/index.js
index 7ae71daac7dfe6f8558f21d3fc9a989e3c7c83fc..0d603347a467d4e0944526305802fc17373c8967 100644
GIT binary patch
literal 7418
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
ZkUf0qf}DQcq@6rB<E(L^9ohGj{{zw}@O}UQ

delta 89
zcmexmIhS*TCF5jwM#afJOzBLunv=~rd?&YZ{GFW7<tAN}nwOGVq@k%$&7}YY$@zK3
nB?{FFnRz8SlXG}~iGc(`pgJ|Tprq0_wYWGjJ+*f7Z5eq0GOQih


From 3d24cfaf53a64dcd3affb9af5badaff8bb39226b Mon Sep 17 00:00:00 2001
From: crockwave <curtis.rock@wirelessmessaging.com>
Date: Tue, 4 Aug 2020 18:05:16 -0500
Subject: [PATCH 51/79] Store fieldsLimits in instance/pleroma/metadata of the
 Redux store.  Render fields to maxFields value in features/edit_profile,
 using maxFields value

---
 app/soapbox/features/edit_profile/index.js | Bin 8940 -> 8981 bytes
 app/soapbox/reducers/instance.js           | Bin 1125 -> 1193 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/features/edit_profile/index.js b/app/soapbox/features/edit_profile/index.js
index 02972cb6d679b5b6836919446f48508855eb2e56..fce8e33dff5304a43dce9de8c0c4bb8102e9ed11 100644
GIT binary patch
delta 256
zcmaFkI@N8%dZx`EnRYWqC@AD6R=8!R=A;x`DHN9^mZa*Xr<Qo;X+*1M<^lP6$*Jl(
z3hD(psYUs@i6CZfYDr>BVhNa?2G;14nVVTs43>kLr9OEXiwYmyXocd;s?^DsSoDQ8
zAX;<~)@n{>XI0~bE8T3)`kPS}#aRJG`2``B1*ye)d8N5YsYR3Z*mWk)W`8WGqfh{p
bD%L}2uH#t3!Hs12W+g!rUL?a4<a$^D!3<gx

delta 218
zcmbR0_QrL?dL}Dh$B1}0Pgft8U<F$R6Ke&1eT5Kz7k?`S-^A=xg_4ZSVuh5-yu{qh
zWQC+kAU{<hGq1QLF)ulF^Kz!cjFV5W$Z>$o2=<I}o&1GGpDisjH7BKbvKgxy7sBk#
zsjR;lCpWTd*eWPM6j&+b<rn29=44i-x`B0QI2IKpR_dh{<>zWtE99i+rI%y?U4d|3
jt)}MWrR>i)&*fOcvDrt^gqIgtvUakbxcKJ9az!ivQ0z$@

diff --git a/app/soapbox/reducers/instance.js b/app/soapbox/reducers/instance.js
index 98095103147004a55c098a2b2af2de7aa99872ec..549f952073bb73b9bd80fd06f54fab9d65446c47 100644
GIT binary patch
delta 44
pcmaFLv66FxI1`_OLRw~OPD-&)W^QIl@#F|bc^+he%{)wzOaM<d4!i&W

delta 12
TcmZ3<`IKXWIMe26CO;+s9Z>_x


From 69184ef97c9664fb979eba759ad786706d57f42b Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Tue, 4 Aug 2020 21:15:16 -0500
Subject: [PATCH 52/79] add and remove muted words, filters

---
 app/soapbox/actions/filters.js        | Bin 1240 -> 2071 bytes
 app/soapbox/features/filters/index.js | Bin 7418 -> 10860 bytes
 app/soapbox/features/forms/index.js   | Bin 5557 -> 5684 bytes
 app/styles/application.scss           |   1 +
 app/styles/components/filters.scss    |  72 ++++++++++++++++++++++++++
 5 files changed, 73 insertions(+)
 create mode 100644 app/styles/components/filters.scss

diff --git a/app/soapbox/actions/filters.js b/app/soapbox/actions/filters.js
index cff647de3c9d04a742bb47481f159cf95eb63727..3448e391cb865ed3dcf377ed2f659d731edad73f 100644
GIT binary patch
delta 502
zcmah_!AiqG5T!PV_T<5fVqx^Mu?AwHC&7cXD+oofX>UT@cDH09&4%5z4U}HRgP<h`
zzoQ8LhDSa6DW=&}dJx>xn|W{EzL~G>*PWOBIv>SCYM6ow#N;Am8J@vViV+|sNZc2R
zO9q;YNV#Oms`<y>;xsDFzqg=;+qjGU4!-GOuM6jZF0a~M-0^(F%&%dk@p{cB_Pjqd
zPq1027rWLHy*-qyjYc4eVh*q*=8`F&Xa@!&(k#iqBoHC<CqhyOxRh+nq~iUMrO)NZ
z+i3;z7aND7TFn;a`jk`j)?ACu+UI#^mR7C44M4eyi5>*@@6Bw4oNRj@Y9@hD$|yQc
z6YK7<Qprq~2Oi!>`5A$-kZES5Hm6zUR=#%nS+)-hX(N}!+#T25VeY70bdo8nR>LTJ
SR;~7L3S(t*oSC_I>*xo?`k`?E

delta 51
zcmbO(aD#J#)Z`<KViO;*ZOqDG+&qEl4I^t}QDScK<P9txYy}XeHoM8>6RdiZRoNl|
D1M3pr

diff --git a/app/soapbox/features/filters/index.js b/app/soapbox/features/filters/index.js
index 0d603347a467d4e0944526305802fc17373c8967..c1a2a66f9d2d5aa4f09b94f4d724833a2fb3ac1d 100644
GIT binary patch
literal 10860
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

delta 699
zcmah`O=}ZT6lIdA?GQsW-?g^4RG0>1l1XZ5qX`J2C`}jI;!1|snHOj1WZpRQ##BO3
zSFT*>-75uufH?RY1Vu0_w}QA3-AEULxNtIwUn}40-Sf^p_nz~<Y<^#Rc2U4B;pOxu
z-Q|}o+vAvzc=#h?;H&5p|9$LvG~4z#)!-U)GzkVJ5r8@lb8r~V9~j^EqG|jvmB)kP
zaU!o)s|}Dg=q>6<BXWHu1nO1j8djj>hG<P5!!qd18xxo7wU8;-LTt=iU0JSHArO>7
zBezGbK8g>8qRK2DY}|l;Fk*Cc)};zJy3{l*+JFu*T{;?%YjKzXuoyQwhDx}>Ecfqc
z7M~La{{8qz0be9icqcJcnP``wr!$i(y})=0=&o%z)Kv(F0W^W@hFf+y;q(liOfJs<
zrw9AVS$v$_!Q_z~UOoB_*Hf4AQ)(-s%Xm1w5LXnUX{RjOlUgDUbEWe^sRU)<h?`Ub
zjdqA<@-}r{a)UOdbD9Plv<DXqlLt9Nr8S9R9LCv-E(b!@^nOb9T+X^mCnPGi?hqHh
z<}-LVo53rYN4}KZj~tq8?-vT9keC!@+uJq`73T_1@y*Qj-<;yHX(2Ys-Y?I-j>c?<
z+4yaK0dK<6>2CPH|EvPQtaV1THgjmRAI7E=OEc*&aDaR8K-?zkj%O<>({Q+$#kVJt
UnLiMfTK%zs0SZew{9L^E6No?M#Q*>R

diff --git a/app/soapbox/features/forms/index.js b/app/soapbox/features/forms/index.js
index 471a173f8672d1f23ffbcc68dc53c812d25f4f6f..e4f7a955a2b0e3ebca4a6330253ed1f676aef470 100644
GIT binary patch
delta 77
zcmdn0y+vok8D^G@%)FA#r<n5@CmRTvPCmvYFxivUcd{_E#N<R~sm&W$!+0m#3rJ07
Z6ZV8C^%YiP<W>ObvaJT|%@c8F1OWD@7|Q?v

delta 55
zcmV-70LcHeEVV1J%mb5}4hpl}17iV`#sUzNgau8LVhb9Rhz${wtOE+O9tJxNlXDYE
Nv%(V~0kiHDMgcsH6BGad

diff --git a/app/styles/application.scss b/app/styles/application.scss
index b040685c9e..79ba867276 100644
--- a/app/styles/application.scss
+++ b/app/styles/application.scss
@@ -72,3 +72,4 @@
 @import 'components/video-player';
 @import 'components/audio-player';
 @import 'components/profile_hover_card';
+@import 'components/filters';
diff --git a/app/styles/components/filters.scss b/app/styles/components/filters.scss
new file mode 100644
index 0000000000..9b99437f2f
--- /dev/null
+++ b/app/styles/components/filters.scss
@@ -0,0 +1,72 @@
+.filter-settings-panel {
+  h1 {
+    font-size: 18px;
+    line-height: 1.25;
+    color: var(--primary-text-color);
+    font-weight: 400;
+    margin: 20px auto;
+  }
+
+  .item-list article {
+    border-bottom: 1px solid var(--primary-text-color--faint);
+
+    &:last-child {
+      border-bottom: 0;
+    }
+
+  }
+
+  .filter__container {
+    padding: 20px;
+    display: flex;
+    justify-content: space-between;
+    font-size: 14px;
+
+    .filter__phrase, .filter__contexts, .filter__details {
+      padding: 5px 0;
+    }
+
+    span.filter__list-label {
+      padding-right: 5px;
+      color: var(--primary-text-color--faint);
+    }
+
+    span.filter__list-value span {
+      padding-right: 5px;
+      text-transform: capitalize;
+
+      &::after {
+        content: ',';
+      }
+
+      &:last-of-type {
+        &::after {
+          content: '';
+        }
+      }
+    }
+
+    .filter__delete {
+      display: flex;
+      margin: 10px;
+      align-items: baseline;
+      cursor: pointer;
+      height: 20px;
+
+      span.filter__delete-label {
+        color: var(--primary-text-color--faint);
+        font-size: 14px;
+        font-weight: 800;
+      }
+
+      .filter__delete-icon {
+        background: none;
+        color: var(--primary-text-color--faint);
+        padding: 0 5px;
+        margin: 0 auto;
+        font-size: 16px;
+      }
+    }
+
+  }
+}

From ab3f53cb270f991675a1725d9b0ddc6466fb126a Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Tue, 4 Aug 2020 21:57:54 -0500
Subject: [PATCH 53/79] styles on filter form

---
 app/soapbox/features/filters/index.js | Bin 10860 -> 11165 bytes
 app/styles/components/filters.scss    |  27 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/app/soapbox/features/filters/index.js b/app/soapbox/features/filters/index.js
index c1a2a66f9d2d5aa4f09b94f4d724833a2fb3ac1d..60b406a8237ae6d15d778e03de2c8f5d7b638064 100644
GIT binary patch
delta 347
zcmaD8GB<ofsmSCHVuF*q75O<z%JX%T^K;ZEPgE6|+$JJFSx-)N@(B@{$&W;2C;t^u
zm|P&sF<DtuYI2>J_~al_*~$N9MJJzA5faGED<~~dD9<d(h|ft(O3j%pBQ7_&QB-B}
z1tpfr26D=iPl(EZ*_Coili9=+!EALgH8AZfW(=kqpmc$x@Z|sMl9OL+icXG}=byYx
zMsG8tcpW3A6YC^oz)svNp#*l?Qwhb%yi#J5r6d(6`^lJtomV3v2Uc@PQU$E$jifSA
zjU|TsSt*DaU!@>sXh~z5aY-7Y<`+;7WRJcKOpO?ueoAJU9oJ+ZdAZHYWRCFy02^9#
AWB>pF

delta 246
zcmbOm{w8EYsmSE(viy_RizrUsAgw(4tBA~GVNvPH2BLD414I=j>r07FZWonh(YNE`
zn*3VS2&~9OOlI;bd8Ns1Vv3Vji>Xb%DrO8;s3<NsdA_XR<Q@fnprLx34~o|@POg!X
z25VX^sRT5UZSqw~#mNdXB9nQf6oHydff_{MYW7H}0M)Qhekr8{R-*`X5vm$juo-`)
lL1vhu$th2MA_K95PZnZ_E06~2X9l`{a;<{g=IgS@cmYCBPZj_G

diff --git a/app/styles/components/filters.scss b/app/styles/components/filters.scss
index 9b99437f2f..de1e6ee960 100644
--- a/app/styles/components/filters.scss
+++ b/app/styles/components/filters.scss
@@ -13,7 +13,34 @@
     &:last-child {
       border-bottom: 0;
     }
+  }
 
+  .fields-group .two-col {
+    display: flex;
+    align-items: flex-start;
+    width: 100%;
+    justify-content: flex-start;
+    flex-wrap: wrap;
+
+    div.input {
+      width: 45%;
+      margin-right: 20px;
+
+      .label_input {
+        width: 100%;
+      }
+    }
+
+    @media(max-width: 485px){
+      div.input {
+        width: 100%;
+        margin-right: 5px;
+
+        .label_input {
+          width: auto;
+        }
+      }
+    }
   }
 
   .filter__container {

From c9b2b66283a36fe1e1ec9d79f89c2c92858b300a Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Wed, 5 Aug 2020 12:08:52 -0500
Subject: [PATCH 54/79] add verification icon on verified users

---
 app/soapbox/components/display_name.js        | Bin 1459 -> 1507 bytes
 .../ui/components/profile_info_panel.js       | Bin 5853 -> 5913 bytes
 .../features/ui/components/user_panel.js      | Bin 3934 -> 4137 bytes
 app/styles/components/user-panel.scss         |  19 +++++++++++++-----
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/soapbox/components/display_name.js b/app/soapbox/components/display_name.js
index 30dbce9a2f8474ad448900e551260431aaad08e4..f6d3a5d4fed21c7ff8fdf84b1ef8cdc90b83444c 100644
GIT binary patch
delta 121
zcmdnY{g``$Ad`;*5G3d46_+TKr50tTWu~Sm*eWC@C+C;umFT6XmT0IK<fInm=O(Ia
xLbxS~>BT^HW?phmX-aCbhB{22y5?qnCT2zs7=QA77Rk-_%x(yg&GT7A7y+CjC(r-@

delta 74
zcmaFNy_tK1Ak*e}CPqe)M7{LX5)Jjt;`p-EqRh0+)D(5i$>&)lH#ai7F-j#SC+C;u
Nm0(e``8<mVBLI~y7{&kq

diff --git a/app/soapbox/features/ui/components/profile_info_panel.js b/app/soapbox/features/ui/components/profile_info_panel.js
index e26dc01256a6ebb1972dbd5d7a1d3fc360e30713..592d60ee028636fdc5fa4b2bc6acd05e73869806 100644
GIT binary patch
delta 102
zcmcbsJ5z6i9H+Me5G3d46_+TKr50tTWu~Sm*eWC@C+C;umFT6XmT0IK<fInm=O(Ia
mLbxS~>BT^HW?phmX-aCbhB{22`etcPK}HT3ce5MUbRGcrd?H!^

delta 37
tcmbQKcUO0V9Ovd7PCmxTf4I5%HPkbU<I7TuGSf0sQ`9v#H*rnp0RZ!i44wc0

diff --git a/app/soapbox/features/ui/components/user_panel.js b/app/soapbox/features/ui/components/user_panel.js
index 7358306224284fc22fa28a16b6ca52d281b11e11..ed34e51ead43dfe1bf2a6c19451b4d5456b55bff 100644
GIT binary patch
delta 177
zcmca7w^Ct4IFndrZb5!gi9%RvQD$0Za$-qlex6fe%4A(88G$k+vG}CKl+8g*PZ_-w
zfFL<Pued}3BA=R~V5^XroSa{pSE84mTB4y|kds=JpPQ(z3E`F`rWXU*nR&@Mr75Y!
n8tO28n~hn{GAUQXxC&}&3N~R#b^_gzo~od4SG)NwTOkJk1jjz!

delta 22
ecmZ3fa8GVSIMe2NOb-}0pJ6%4wD~l990ve!GzmNa

diff --git a/app/styles/components/user-panel.scss b/app/styles/components/user-panel.scss
index b0c6564557..cb44672304 100644
--- a/app/styles/components/user-panel.scss
+++ b/app/styles/components/user-panel.scss
@@ -4,12 +4,21 @@
   width: 265px;
   flex-direction: column;
 
+  .user-panel__account__name {
+    display: inline;
+  }
+
+  .verified-icon {
+    opacity: 1;
+  }
+
   &,
   .user-panel__account__name,
   .user-panel__account__username {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
+    color: var(--primary-text-color--faint);
   }
 
   &__header {
@@ -49,13 +58,13 @@
   &__meta {
     display: block;
     padding: 6px 20px 17px;
-    opacity: 0.6;
+    // opacity: 0.6;
   }
 
   &__account {
     a {
       text-decoration: none;
-      color: var(--primary-text-color);
+      color: var(--primary-text-color--faint);
     }
 
     &__name {
@@ -63,7 +72,7 @@
       font-size: 20px;
       font-weight: bold;
       line-height: 24px;
-      color: var(--primary-text-color);
+      color: var(--primary-text-color--faint);
     }
 
     &:hover & {
@@ -96,7 +105,7 @@
 
     a {
       text-decoration: none;
-      color: var(--primary-text-color);
+      color: var(--primary-text-color--faint);
 
       &:hover {
         opacity: 0.8;
@@ -106,7 +115,7 @@
     &__value {
       display: block;
       width: 100%;
-      color: var(--primary-text-color);
+      color: var(--primary-text-color--faint);
       font-size: 20px;
       font-weight: 800;
       line-height: 24px;

From f7f0439e729f30bfaf8fd9e23211a5d68f596fba Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Wed, 5 Aug 2020 12:47:45 -0500
Subject: [PATCH 55/79] prevent verified users from updating display name on
 frontend

---
 .../components/profile_preview.js             | Bin 1052 -> 1250 bytes
 app/soapbox/features/edit_profile/index.js    | Bin 8981 -> 9361 bytes
 app/styles/accounts.scss                      |   4 ++++
 app/styles/forms.scss                         |   9 +++++++++
 4 files changed, 13 insertions(+)

diff --git a/app/soapbox/features/edit_profile/components/profile_preview.js b/app/soapbox/features/edit_profile/components/profile_preview.js
index 6b4166d22ddcb42344731e472d349dc319a4d704..faf3c04d3068c021da9486e2cdbde85c1840e5ec 100644
GIT binary patch
delta 219
zcmbQk@rZN6VX@5Ig8ZTqg|O73%(Tqp#FEVXJg3Bzi8E!y%8-QOlM++XQ`N1xxHcY2
zVyfp-KmpZ>$;tVpc_n)3sU;ffDVfCuIf<3=d5O8H>YBB9)fVKW7UkzAs%t{DmL#SZ
t1KF8*$vLGdsl^)V5I3ZzsB0>ysVUe%T`3K7W_qfEz8$I!lO36F0{}wgMF{`^

delta 19
bcmaFFIfrAy;mtgZiA<Agm}Mukv)l#%Na6;r

diff --git a/app/soapbox/features/edit_profile/index.js b/app/soapbox/features/edit_profile/index.js
index fce8e33dff5304a43dce9de8c0c4bb8102e9ed11..5445ff30acb239b5f9c13b7bbaecbead0847ff83 100644
GIT binary patch
delta 301
zcmbR0Hqmp#Yi2G5g|gJ5%(TqZl*#?fvLY}}d`f0<K~7?2d|qPi<o8UX24PTD3Z=!V
zMa2raiIoa@`6UXa1u2OosR|_-shLFzP(2DjJ*k_YF{klz>L?^8C+C;ul}tXsE9#M)
zpI2N0w@<+qCaIU6TB4y|kds=JpPQ(z3E`F`rWXU*nR&@Mr75Y!8tO2oscUYI78GDq
zO3q0vF7^XjWm^rCQczP<PzSmqF)1fCMZI=%gRs-&IYK8z6hKY`3nJ7`u9KADLDo3A
YPf&&vCZIXlK}LSEpOD|?L&CxQ0O1B}KmY&$

delta 54
zcmbQ}In`~$Yv#=bEQ!4Q3bhKh3MCnt#d-xr`31$B&4mOQC-aILPF^j1a<YJo(ByN9
KQk!{2TlfJA_!15P

diff --git a/app/styles/accounts.scss b/app/styles/accounts.scss
index b25f0d4771..000cf75cbb 100644
--- a/app/styles/accounts.scss
+++ b/app/styles/accounts.scss
@@ -92,6 +92,10 @@
         overflow: hidden;
         text-overflow: ellipsis;
       }
+
+      bdi, span.verified-icon {
+        display: inline-block;
+      }
     }
   }
 }
diff --git a/app/styles/forms.scss b/app/styles/forms.scss
index 6cf1f5f0ff..96616c6ffb 100644
--- a/app/styles/forms.scss
+++ b/app/styles/forms.scss
@@ -342,6 +342,15 @@ code {
     }
   }
 
+  input[type=text][disabled],
+  input[type=number][disabled],
+  input[type=email][disabled],
+  input[type=password][disabled],
+  textarea {
+    color: var(--primary-text-color--faint);
+    border-color: var(--primary-text-color--faint);
+  }
+
   .input.field_with_errors {
     label {
       color: lighten($error-red, 12%);

From aec44bfea6fd0fa215c0876602cfdb400cc4436e Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 5 Aug 2020 18:04:32 +0000
Subject: [PATCH 56/79] Verified: Use getIn in display_name.js

---
 app/soapbox/components/display_name.js | Bin 1507 -> 1575 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/components/display_name.js b/app/soapbox/components/display_name.js
index f6d3a5d4fed21c7ff8fdf84b1ef8cdc90b83444c..7ab8b9e6072f12a1d7325bc66186128269b1a336 100644
GIT binary patch
delta 104
zcmaFNy_{#leS^&0g8ZTqg=z(#%;FM-#9{@{+}zTV#H5^5ut2RsT2X$kf_f%QbmN^+
lMs?3TjcE0PoK&DxqPmWPdP!n>v3jfys$LDv&F)Ndm;nZfC6@pI

delta 39
vcmZ3^^O$?W{mnv*L5yM=>IFHeMftgj>Y94#sU;ffC5h?9>YKZn<}d>Q5fu$V


From 39d29f4e25c5f1da7821ea1e0ed86568ca7f9944 Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Wed, 5 Aug 2020 13:20:46 -0500
Subject: [PATCH 57/79] Update account colors to be more silimar to existing
 Soapbox color patterns

---
 app/styles/accounts.scss                  | 4 ++--
 app/styles/components/account-header.scss | 4 ++--
 app/styles/components/columns.scss        | 2 +-
 app/styles/ui.scss                        | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/styles/accounts.scss b/app/styles/accounts.scss
index b25f0d4771..cd0364ea92 100644
--- a/app/styles/accounts.scss
+++ b/app/styles/accounts.scss
@@ -13,7 +13,7 @@
     &:active,
     &:focus {
       .card__bar {
-        background: var(--brand-color--med);
+        background: var(--foreground-color);
       }
     }
   }
@@ -584,7 +584,7 @@ a .account__avatar {
 }
 
 .account__section-headline {
-  background: var(--accent-color--faint);
+  background: var(--foreground-color);
 
   button,
   a {
diff --git a/app/styles/components/account-header.scss b/app/styles/components/account-header.scss
index bfd61aa8ca..930a1fd3f8 100644
--- a/app/styles/components/account-header.scss
+++ b/app/styles/components/account-header.scss
@@ -19,7 +19,7 @@
     overflow: hidden;
     height: 350px;
     position: relative;
-    background: var(--accent-color--med);
+    background: var(--accent-color--faint);
     @media screen and (max-width: 895px) {height: 225px;}
     &--none {height: 125px;}
 
@@ -58,7 +58,7 @@
     min-height: 74px;
     width: 100%;
     position: relative;
-    background: var(--accent-color--med);
+    background: var(--background-color);
     @media (min-width: 895px) {height: 74px;}
   }
 
diff --git a/app/styles/components/columns.scss b/app/styles/components/columns.scss
index 1410831dbb..d8034e4974 100644
--- a/app/styles/components/columns.scss
+++ b/app/styles/components/columns.scss
@@ -205,7 +205,7 @@
 }
 
 .column-back-button {
-  background: var(--accent-color--med);
+  background: var(--accent-color--faint);
   color: var(--highlight-text-color);
   cursor: pointer;
   flex: 0 0 auto;
diff --git a/app/styles/ui.scss b/app/styles/ui.scss
index 7eab8edb9b..a0ad254bfc 100644
--- a/app/styles/ui.scss
+++ b/app/styles/ui.scss
@@ -654,6 +654,7 @@
 
       &::after {
         bottom: -1px;
+        border-color: transparent transparent var(--foreground-color);
       }
     }
   }

From e6ee96101628df96a3532ad3669658c6f33566a0 Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Wed, 5 Aug 2020 14:27:42 -0500
Subject: [PATCH 58/79] Only render a hover profile card in the dom when
 relevant

---
 app/soapbox/components/status.js | Bin 17959 -> 17997 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js
index b7f21a2fd59b4412841338bf025dce87d8065cf0..d94de8fc9d9509f335d617659b0e6bc3f908119d 100644
GIT binary patch
delta 55
zcmZ49!+5rbaf6AYRJB4uQGQxxPO5WaQA${5ab{9Zs)Cvtmx97%6~~&%1)8FawUZAx
LDQ&*v=*<EEF98!_

delta 45
zcmX@x!??VMaf6BD<T%G1DFrn(g@U5|w9K4T=ft9vu*~Ajq@2`R1%12C4;*t@0DRRD
AfB*mh


From 769a5124451cc03231e2bfa4d4977517a3cd6048 Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Wed, 5 Aug 2020 15:53:30 -0500
Subject: [PATCH 59/79] only render emoji selector in the dom when needed

---
 app/soapbox/components/status_action_bar.js   | Bin 15237 -> 15287 bytes
 .../features/status/components/action_bar.js  | Bin 12051 -> 12101 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/components/status_action_bar.js b/app/soapbox/components/status_action_bar.js
index 1ee84ca00a049ff8a0787c842bf1d0a026c376a3..57961714545a914ae11e3f55eee56f3e1e84fa3a 100644
GIT binary patch
delta 31
ncmZoI-(J4qycuKl<ca*EYzk^>TnY-4kD8@2)^3(JPh$Z9xpoRf

delta 16
Xcmdm9-deulyxHWhX3?8t%%fQVNyrDD

diff --git a/app/soapbox/features/status/components/action_bar.js b/app/soapbox/features/status/components/action_bar.js
index c5db0cab59634958d435ea76368df4a6c7ce230c..de3969f2706c1899d6495413e36b23f8d8e4ad99 100644
GIT binary patch
delta 28
kcmbOncQkGTx6WiGX>nFHH7*5($&5OwjJ2Dib#^cT0DNT#6#xJL

delta 16
YcmX>aH#u$tx6Wiko#@Robk;Hf06OaiZ2$lO


From 6e782ca3a072e152a1612d33b94d8af92cf47f8f Mon Sep 17 00:00:00 2001
From: crockwave <curtis.rock@wirelessmessaging.com>
Date: Wed, 5 Aug 2020 19:08:38 -0500
Subject: [PATCH 60/79] Modified Profile bio to use textarea, preserving
 newlines and HTML rendered

---
 app/soapbox/features/edit_profile/index.js | Bin 8981 -> 9269 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/features/edit_profile/index.js b/app/soapbox/features/edit_profile/index.js
index fce8e33dff5304a43dce9de8c0c4bb8102e9ed11..42e18643b02fe70804ddaf18f05c1130ad403abe 100644
GIT binary patch
delta 297
zcmbR0w$)?9Iz|Bnh2YHGf}GTl)QXbCqSVC6YZzZK=_qWTz+}a?`4WdQ3kR111Wab-
zRaby<6l!V|vQsPdih-I+io-KYGBnil@=H=TYw^Z2O*Y_Xv2_F*=A4n3m!7I%s{q7y
z3e{lE$@zK3B?@JUIi+BU;^f4FRE<<UpgHNOC3;|SP3y@Q1w<zQ;S<_i#LvpYhvvct
z;Yostr6u{!`5=dvq}r<Ir=?92(XiGlN-fAqOitC%w@E6BDb|Y7x3|+z&(u*+kI7Tl
ttcANB>LG>lqQnAQ^^C-#6!pmgQfeHaFaSAwvcIs#WPW-6&0Qkhd;k)*TfzVU

delta 83
zcmdn$G1YCuI>yNd7+-AOz+}S4siUBtmtT^q9y@s>pXlaa9I`Bv<$2XNXYj@{ZFUxT
n$2^%^*n4uLNWkO+!a^({m6P+O)hDxx=uFmE;NQGTw3`nA=XM+@


From 56bac95ad4d1038c3fc1f1ecd2443c55113ea12e Mon Sep 17 00:00:00 2001
From: Sean King <seanking2919@protonmail.com>
Date: Thu, 6 Aug 2020 11:54:58 -0600
Subject: [PATCH 61/79] Toggle for all notification sounds

---
 .../components/column_settings.js             | Bin 7258 -> 8539 bytes
 .../components/multi_setting_toggle.js        | Bin 0 -> 1329 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 app/soapbox/features/notifications/components/multi_setting_toggle.js

diff --git a/app/soapbox/features/notifications/components/column_settings.js b/app/soapbox/features/notifications/components/column_settings.js
index c48b72fbf30200f5f4dfab48383c1d71f495d4d3..f53ba70c8d5829d32ca84c5767045991e51ce659 100644
GIT binary patch
delta 594
zcma)3%}N4M6lNxWN~sKsTppzuMbkF@fX$+UXd?yFPDDn%jzibEGWS}<Akn&2++HI{
z>;c-fu1!#{&<g|+U1zMEO>{R0&N<)xe$LD0>(1@0ls4NPVlyapF*7y9m}wbD#4s>|
zrcK(Q<O}WLsM`O$l%mAi##kd=t3i1|POa35MH$dxV}zxkLb<HCEvn=|X%dXdsZz-S
zzmF}-qMXk!pd5_v*r<kyG29vNb_7zXREm)Zh}R@Gq)&7kOu?{P6lKd#oX5yASW8T@
z*$g-W#7lA_=@VBr1xLMw>c^;&DZ2mm1{d<1G_8O8(wGgLOl+)q7V=_H9l3!9YU(14
z5~5T$kg6PF{mc{L$`h;nAn?wg1F@u+<p0vh`F;PL#$Z2qCq;f$@yEn6{|H6-de{hg
zLU}(B4|+#>3a5hZY5CR6($o)%&m~fORCRpe^nh5qE!`5%9M&>ve(c&_zXw>aA*?#$
SBh4ky*x)8~Ef4tQL;MQ{P0fk`

delta 36
scmccZbjxA`KjUT(#wy0mADEvoPR?e#z4;>h7RJr~+^$TUo%ke$0Tzi3lmGw#

diff --git a/app/soapbox/features/notifications/components/multi_setting_toggle.js b/app/soapbox/features/notifications/components/multi_setting_toggle.js
new file mode 100644
index 0000000000000000000000000000000000000000..392369edcb2fc1df84f4008b5faa1d877fb342e5
GIT binary patch
literal 1329
zcmZ`(O^=%}5WVMD%xM8FAw6$G4&AEKs$bD|Z&9>zU<lrVof?xSLj3oRKS<c5<q)tv
z^X9!b<M4Vfm4;_znTA5i8Ukg$gZYHJqm`2Tm(v~_f4rylRGW=U%u`*rnr$n*4z^fR
zJ{(U?@>TAO-0dnH*Pd#-Meq|mT6#GatgSR;6>A#!MxXpAYR$#YXX8<$$Q!34S+xou
zCD9isG<1^*K%<%F8JPM`OiKGe&t74{j}LHWo-|q!aBNQ-SEYG?TZu`{_6cvE@psD=
z=I;_#OqY~&0cA?D(@k{6wpfkBgv`+aN%2@RvBU9c(TeN_gJ)8_D@Ce*6h>sYwi;kW
zV=HCl@W;Dy`-Yiz`<uwUnd0p0HNA^9y)kv*2q}aeXr^|kp^qS4dUFe@AUrSyoI*a#
z>9qh|@+L8TXcF(PH7lu5>~u*n_xF)chjH*wEc_3^nr~vyA<0V2eqkQXtpPp#TE0x-
zi)zu(9hDyORj6Af##M&_NJ!d~xJpY?(1d5ISbRk@h$<ZDo5s-i`4Nj@RI`b}_C5yN
zz8KDSLr?TB5}g8v#B(}Y2Oeg)C9%ifBn7WDmH$XRMkb=<O>z+i(|~NSK6rJZT>va{
zesDMHJF79h#<i5DmSx(V>GeyWP5J)r@jUH#-h($i?Z!G2JfJ$co_YJD{yaEoXO#}E
z?VTG0X9SzDFL?SS|A=#(U-vM(@aQZ@xVwXJ;XX@USD&Tww9J3TzZAZ{+UQ{E0Q$wu
Wu9uOS7xOG;<dCalCy9F8PyPZB3%oG^

literal 0
HcmV?d00001


From a5b69e77a350d6b36f42b48ebc8afb33aae6a8c0 Mon Sep 17 00:00:00 2001
From: crockwave <curtis.rock@wirelessmessaging.com>
Date: Fri, 7 Aug 2020 12:58:59 -0500
Subject: [PATCH 62/79] Added Admin settings opening in new tab

---
 app/soapbox/components/sidebar_menu.js        | Bin 9379 -> 9395 bytes
 .../features/account/components/header.js     | Bin 13578 -> 13592 bytes
 .../features/compose/components/action_bar.js | Bin 4160 -> 4174 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/components/sidebar_menu.js b/app/soapbox/components/sidebar_menu.js
index f338023715ced119bbb64e9d085f7aa1b04f2a3a..e1007f0d9e2e7044e42836a02cbadec9624888a4 100644
GIT binary patch
delta 31
mcmZ4Nx!H3=rUG9{Vo`c(iLH8kQchxC_T)fW{ms)9cv%3#Z3`>_

delta 16
Xcmdn&x!7|<rov=KN!`uM6nI$xH?9SS

diff --git a/app/soapbox/features/account/components/header.js b/app/soapbox/features/account/components/header.js
index 17ebb36b6f9475224f6d9746b13aea36551f15b5..a26ff710f00666904948fc7810c5b4842fd76272 100644
GIT binary patch
delta 27
icmeCmnvu1kSB_6dAuqK&Br(ZKp`@rZb#t#=tr!52`3e{S

delta 12
TcmbP{)s?lOS8nrcxmqy*COidE

diff --git a/app/soapbox/features/compose/components/action_bar.js b/app/soapbox/features/compose/components/action_bar.js
index 411a30f17dc0ca73fbe0e970001684ead09ce254..814123da69ac7d00ced9862c16b616ab6627a741 100644
GIT binary patch
delta 27
jcmX@0a86;vGG0C%g}l`Aki;Y_g_5Gu)XmFyXE6Z)kCh4u

delta 27
hcmX@7a6n<hGF~o)T1{&%1t6%MoWNzg`6F*E699eI2!sFt


From 68f765da28b22106f6ff8b85caa24f86deb9fdca Mon Sep 17 00:00:00 2001
From: marykatefain <mk@marykatefain.com>
Date: Fri, 7 Aug 2020 20:17:13 +0000
Subject: [PATCH 63/79] Multi-Factor Auth with OTP

---
 app/soapbox/actions/auth.js                   | Bin 8838 -> 9434 bytes
 app/soapbox/actions/mfa.js                    | Bin 0 -> 4686 bytes
 app/soapbox/actions/settings.js               | Bin 2844 -> 2865 bytes
 .../__snapshots__/login_form-test.js.snap     |   5 +-
 .../__snapshots__/login_page-test.js.snap     |   4 +-
 .../components/__tests__/login_page-test.js   | Bin 505 -> 1838 bytes
 .../__tests__/otp_auth_form-test.js           | Bin 0 -> 755 bytes
 .../auth_login/components/login_form.js       | Bin 2474 -> 1861 bytes
 .../auth_login/components/login_page.js       | Bin 492 -> 1653 bytes
 .../auth_login/components/otp_auth_form.js    | Bin 0 -> 3032 bytes
 .../public_layout/components/header.js        | Bin 1796 -> 3793 bytes
 app/soapbox/features/security/index.js        | Bin 11398 -> 13582 bytes
 app/soapbox/features/security/mfa_form.js     | Bin 0 -> 11447 bytes
 app/soapbox/features/ui/index.js              | Bin 20523 -> 20602 bytes
 .../features/ui/util/async-components.js      | Bin 5812 -> 5939 bytes
 app/styles/about.scss                         |  43 +++++++++-
 app/styles/application.scss                   |   1 +
 app/styles/components/buttons.scss            |   2 +-
 app/styles/components/mfa_form.scss           |  81 ++++++++++++++++++
 app/styles/components/tabs-bar.scss           |   4 +-
 app/styles/themes.scss                        |   9 ++
 package.json                                  |   1 +
 yarn.lock                                     |  14 +++
 23 files changed, 154 insertions(+), 10 deletions(-)
 create mode 100644 app/soapbox/actions/mfa.js
 create mode 100644 app/soapbox/features/auth_login/components/__tests__/otp_auth_form-test.js
 create mode 100644 app/soapbox/features/auth_login/components/otp_auth_form.js
 create mode 100644 app/soapbox/features/security/mfa_form.js
 create mode 100644 app/styles/components/mfa_form.scss

diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js
index a8d6d5f0fcf54f4a92e90dceb1f39349dc9f1bb4..8beb9c1eb5ed2f34858584de221663b8d48dbca4 100644
GIT binary patch
delta 212
zcmZp3z2&(fh+i_lq#!J{C^M~6BRM}MRYxH=Eit|%KRY#VvLJUmFOa97oROH5lbV;F
zI$4lUZ1O`+Zx^^4D}-_#E(I_EnPQ~?HVY;K(;r__Spbw%F9F)AK6xV0FhL&0$?aS+
zlh^XNPY&Wg&y|^`ppjZslwYJbd7*@`q=K!jt%5qpwxZO+(#)dN6m?C7YM`-`<HW@$
Xr;7+rRuu4MteqSyZnAl{z-vJO@5DuY

delta 32
ocmccR+2*<-h<~!3;Q7e{;+&Ju$Z}6^6tbMWLsED1d!g5Y0MDHan*aa+

diff --git a/app/soapbox/actions/mfa.js b/app/soapbox/actions/mfa.js
new file mode 100644
index 0000000000000000000000000000000000000000..0a8a706ebc1f518fd3e63caecf5bdaaf7785212b
GIT binary patch
literal 4686
zcmb_fQE!_t5Pr|ExVI1~g7-$9)KaoVYn!f+XGDq9q9wq<Xq&41_t^$h8w}WM`jUpT
zzx(d)yW^6a@~prR<p~^$>;!Y$cF33cYBocEm?_TE5<{>Jo<iRXg3aSsKU{l(`z?I-
ze(XFyfNPkKm<iM*lD~6Z&-aIr8nX`4`et)K1Ve4Tz;18c@4Kha-QIbMxQ4A=GK!Nz
zRKr#c93GPbL>Uq<1_^7hP+eP>Mh`;>X2>>)!2{_5D8q2KkL%6zL&#1GT2npmx|Yre
z)K$+%?{do0MJ3(4jem1{@Ac@ao_AeJX9T*c=c9KyUFl+n?x9L!oMb5+5RTt=B`O{c
zk&iG=($~^j!21lKK)5PWu=YurN95EJUJ>?jgwX=7zpx_!+-SW6{+pw#(IIhOtO#z4
zOlFMLLfYg%Yfk5mlOGWoLy;53aaN_cbWVq8zOeBdO05EwIT=RigMlW8CZkKh8P2^l
zdO4!~6^XHiv-c5>Y-$2dvZcw-)ZEVtJEqyNP*G%sF%4E6?xOxYuV&|V(vBA98U3nI
ziRJpxQo(fcm*g1r^fA;&UHMfUqp~A~DOWtlX0Fyzax@ExCUGjB+bI57<!-h|ogfVL
ztQfd_4)HQJjbb8a=Y`P=W6IA++X_BB?I417w0%KYD;SumS}4t=q7}}X^cx6(i&@Oi
zvh96o+KCcZ_~xl*Jtx9-(rrMF$)61q6C%6?0NB+je?gXGGTy6PZZyMQ=)JQq(FrA`
z<<QY<)CWB-yfkdUhYYn-lneGi&%0R%wB?x8f6tMo`dbfN`!vCIRy35~^U9N3ziV2k
zPJ*>nsG<2D1%1VnUn_^CIJGIT=#*VT9+l<qtk_F!X4nDJ3dl<V6u%Xh@@<f3<h4D#
z-8c>9x($}iZUqdOCYAni`t^6RhUo7@66>avE#J@YITE~fBM4QR>;lOHPy6teAwYBa
zi?dpz0VIcl_y;y9!J&q<C2)ONlU18;tsk=HiujD6r5_1e<9v^f2%|AEvsq3=40Nf!
xBA=WnoQdiTbSsg&yly3UZQTlGnAEN0VOqBW^ndDBayYG9!J&q3CGbJr{sZA3%J2XH

literal 0
HcmV?d00001

diff --git a/app/soapbox/actions/settings.js b/app/soapbox/actions/settings.js
index 0c2f35a8b77e391e78e8d456588bd0f44fdee5ee..a482b519cf92fa09ee03750682f6a8fc29dce24d 100644
GIT binary patch
delta 31
mcmbOuwoz=u5+)%9h5V8N*Sy4}oYWL6g|x(+;>`=0syP6!`3m^}

delta 12
TcmdleHb-p35~j^NnJPE{A&~^W

diff --git a/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_form-test.js.snap b/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_form-test.js.snap
index 6c34feba79..646a96d498 100644
--- a/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_form-test.js.snap
+++ b/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_form-test.js.snap
@@ -3,11 +3,8 @@
 exports[`<LoginForm /> renders correctly 1`] = `
 <form
   className="simple_form new_user"
-  onSubmit={[Function]}
 >
-  <fieldset
-    disabled={false}
-  >
+  <fieldset>
     <div
       className="fields-group"
     >
diff --git a/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_page-test.js.snap b/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_page-test.js.snap
index 35adf1d297..69885fe7bc 100644
--- a/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_page-test.js.snap
+++ b/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_page-test.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<LoginPage /> renders correctly 1`] = `
+exports[`<LoginPage /> renders correctly on load 1`] = `
 <form
   className="simple_form new_user"
   onSubmit={[Function]}
@@ -59,4 +59,4 @@ exports[`<LoginPage /> renders correctly 1`] = `
 </form>
 `;
 
-exports[`<LoginPage /> renders correctly 2`] = `null`;
+exports[`<LoginPage /> renders correctly on load 2`] = `null`;
diff --git a/app/soapbox/features/auth_login/components/__tests__/login_page-test.js b/app/soapbox/features/auth_login/components/__tests__/login_page-test.js
index f0e3d7901c1b3b9089de0cf94c8a336b4c29e2fc..27393c6c31271e2f9a2cd735a8455bbdb4be025e 100644
GIT binary patch
literal 1838
zcmb7F$!^;)5WVLs<|Y|%B|AwkN)w<6QXoY()V&3PKuKeZjYKje6~{3A?;UEj+!k;T
zhRES8Z{95CrIOmh4`iu@rIsal+MT_N6W%=C$rTq*Y=!M}5QK#j#foHu+7?nWw0JGa
zOrWq+C}sM(uu>!JT3aKTO5{gq(bzc0LZLSMF7BBEX5h9gE6b7s-MzErosbN|5L$Fw
zh+|``#F@G8SH*jaE*ew(z=jgI6@TibmP=tmR@s~kPBJv9<_Y@Vmw|-v%A0~efy*n{
zo&Y4cqy%qRn)`zgASFMR0J-EZ2O|9a%>3<cGPxih02*zjMWgQ|JCf6fTc4^SGGd85
zYK^HaHXsEQl4T<p0QjNk**_?PU%LkwB~Z&IftBAEj}QLDo$i@U^Mzo_<kI?0^kcJt
z5+m^Dr)TFL0dF(<4>;2n<F@5%cMQIsBi9OhG}#>C@#hmzRZ3Xr=(uvVZWuPO<~E0N
z$zqLf71ubXF$^g-d4#T)eAmNWt?LJ<s~Je~Bn`z4sky@UIenDzCV@s(Z2Z&NY+83m
zYXOik%c8M}=q)(SNzAjTX74jqv=teoI@&>8tIX%5AQ-XjEt)y{c0&@%f$~UgTxlM8
z)J73UyNuSWNV-OjPJ>w_WkQ;3OboXeiK-~3@J`6H_!T#Om@aqMkvmtF7QXAo{^AH3
zvadsgR=%R>vp=7m9b}JMOC5O!w7Y9<*#iJmDYuR=i_@GH1&S5McB9Zlo|RU4e+Sj!
z>p(WcM-`#b6SxN2BCe&|6i6Nzq|(uWNTI#em!aw6f7YQM%ht<r1K!01s7pb?9IAoa
zc3f(n8;|vBt+(yv;X?ICL+p?@`{gkGcA4~^f}Dx0z(tjmG$}OgG!=Wxsx5L8eys^0
zY9ekh@AgE`V83iy?I6v0k<p@hp1mA%b_?g`tzw1WY>7Z7zo>z)rLc?(E>`|_AP&Ga
z04<oD+J9fHv{Z&>it5LVd2n+99yQ6Q8ab_^k#+|$f@kpDg1B@4VII8fY3)~IOsc!N
F-*2e{C-DFP

delta 47
zcmZ3-_mg?Tw#m|rs-l@C8tO%<c`2zy#R|#!MMbH}B{`LocQM{#)R{bmNsFac)0zta
Dq%{zg

diff --git a/app/soapbox/features/auth_login/components/__tests__/otp_auth_form-test.js b/app/soapbox/features/auth_login/components/__tests__/otp_auth_form-test.js
new file mode 100644
index 0000000000000000000000000000000000000000..799a5e8199f201c6e62f30b32165e0a2182aab97
GIT binary patch
literal 755
zcmb7CO;5r=5WVv&=C(_MMf|v+kQkzgM!~2zL&(w&u+r|XyF<h@{CB6c4aJjg(quaC
z&CGkVt21Xk!3(OGVBu{B!WXf)YUvW1kh|H?>dyMCB1BQwlA9^c&K8_LaC3;cns8*f
z)}WydWHw&ElJy9?sytZb=62g93^ZF|>d=Q~iznqk1-Q?$4XJsG#eZF^>m(Pn5)84|
zbClw`DY82h9guAp3?Xj;Xp(HnBs>LT>pjMlem59Q0R~JU2z#A_gJ#(jA#=zUs<dqo
z6HNL*e#6GvZB}z=^W~LeQ!x0w4Y?-)H04$)*!L#8Ml;Ao@9g~IQtT?MJM2_ZUP&yG
zc0~5!buyOqc-%U6C#(4deEYdksVwu6oqsSqvWAp4+AL+Up5oBA!#;@pU6!K`mX3Qy
z@k*x&uk-zM`j`0M8dg0~n|0p0&<B1~sS07NvO*(2ypz-}wGptZiM6Iayn~p$J;P&3
Mm>zrC@tTV72LV^^-T(jq

literal 0
HcmV?d00001

diff --git a/app/soapbox/features/auth_login/components/login_form.js b/app/soapbox/features/auth_login/components/login_form.js
index 1b669063b1d003362d51f4266bcdd2dc4810beaf..0a964f44925eabfa5da498c2a64aa9b0681bd51a 100644
GIT binary patch
delta 54
zcmZ1_e3Wm(@6F+iI*gO2vPetnC}bA<<R_+N=B4W>WF+RL<fI0dCgo<9Oy0l}Hkq4M
Kd$S{JCJO)-wi1^B

delta 693
zcmZ`%%}N|W5XMC>8_2~MsGB`Rdhx2PAgB<Ccn|_Xa;TlD*=d>S9;$0h!m{iu1bmC!
z#AnD`_#i?qcK7V+#-BO#G~Hj-_f!4%<Dc!{|Gt@~bu2K0+D$)Om_x~~fgSI#ow%PP
z%*8nCN7zZVb1-~Dmn3<0M(^Sqx_uaJEWDr)jA1r}@EQNbVPWiaA4;q}?S|9&Ff3D&
zQ^(CQ3I?z$!#;!Y;j)ZLI<{~=xuRTj)OTWq4SAKi0vs{puXNFu>IPe7LW2cd8f~$m
zT`>9@>yEx>sU|yEQCDb-nl8FYV<d9ZHCb6B&x89IPhotE!E<mt2C0nKExXpoJ^(9F
z=ZSl|7QO%B7F;~z*G%>-T9CtG(gIHeDh)!tY{f;EX{pF6wWbbW8O}<cS`J2KvF##g
zn`b(Y!WA()eohs77oOxI4oS^kjVF}$_E!I7`|SeZE<A=MK4lp4p}iR9F_qZWqS9p=
lH<K-hgOAyN=@~2a&E??hR^qw29en!GGe&*-?tWl49|7|6-_ig8

diff --git a/app/soapbox/features/auth_login/components/login_page.js b/app/soapbox/features/auth_login/components/login_page.js
index 2de7daa8f51f1bbd5b0e3cf1a5f67217e092e5f7..934ce12ea7044c35a3d61eb37d7ed318b1f0570a 100644
GIT binary patch
literal 1653
zcmaJ>O;6k~5WVMD%q@<@dhb9`QE4S4DiHKmRh2iM?7B_t)OP4rQT}_!&L<1>wAt~S
zulHs~)s3+p9#Iq?N^5FJZTL<v5;Z(^P#CR|p8GXmV^OxpHS7_kvTxu_>(OqcsTc5V
zUAJEBDtu@yel(OwqkfTpqbA6vA<U+jKueH2vse1FvGrIM-&Vo$qa@RUy7$d>>klt*
z#y39%8Bd@cP=H%K_vwsicILPxI+W3F8(fya9hB&c!xwxPUn8LtV$XS~Mf2o^$FJtW
zn#Ms6F8qc33Rsr_)ObEv_#Qn=$u&D8vvPMvNTv7ZP>RaoS<+_|6OU0fiKS>O4<AN_
z*h!WwDJtO{M5Z3Z9s!RYwRG@~09`^kW5Kp9ys@ka#byvH1aNJGlj$N_{6RT>5L#CF
z)b48KsjpWyzEfJVV5ZUm`jCT~42s+cFUW-j$+E!3kjSEMt%m#EPZ}p4rt*{aR-t1t
zE5Nn2;%|HyTsbw)R0!}*aV=^*1I3?3)#CRox-6MT+Q&?FDTYbVh!W+@a%eZadGibP
zIizV2BUXOWEyHJ;+*R#^+#N{e8bR|x(=l=qxg2<#K&?YNl-rO_e~gt2d_~cagnMDh
z7+ZlkK8rKUUPsC@?hmLLTNMW|Qae@0#u;YW7`D%N5z1z0t+9(FG>Rn*MsCs3!aC%V
z<l`eS&mj$rS^VA78Ib8THG#@F6Apb`0oFxo;{r~!d)ty`E5>8glT7n7ge3@ZgC@i8
zX@=9qnO!E=|2TwVW_;9_H#Yv>3=7AWak8{dv=mdbldy3Dr`=sNePaYdQ!6S~BrI-m
zW`~Z03N>bvj+gV%^(IfZDQvIkJOoN2@MY}9Ykd@FR`YKD?3Xy>z+A=~60hib1M)8N
TxHk36(aO77h9P3yp+5Nsw~Qla

delta 56
zcmey$^M-lCt;vauHj_6pCQWu=m7JW&EIN4utEOyGYDsBPo`Q`}etKq}TYgclg1((K
Mmx4kq7gsG808ph8aR2}S

diff --git a/app/soapbox/features/auth_login/components/otp_auth_form.js b/app/soapbox/features/auth_login/components/otp_auth_form.js
new file mode 100644
index 0000000000000000000000000000000000000000..21655f49298694278d36a84e8ab9ceaa8e54e3ee
GIT binary patch
literal 3032
zcma)8-*4kK41UjF!KbqWG!E`Hiw}3`ZCHWcT3n003`3yAbfV3cJW1{~2=c#=l>9?+
zuG{sYt!0uTzwaYySvT4^_=;lZpftLM#PI*gPcs=_onWVxLVA6U4HgEA_BA$>>Mydo
zQ?9y!U$m)(b69*qYsDUKpukcp>>lkTmL#V!)LmV-PHZcDYz^LON<*Q#$ZjEflSM-|
zi(PLt204Lt&F^Src^odYS~Oezx}^G~R(2^`cZfYobi2bBeAB+h*!qb8s_;%V?FdbO
zLy5vsVs=>)5O(x>G`e{{HfTF28+u+iJ|LSJ0c{=B0Wu5u1hn)t1Fq^;7x*hdwt^GL
zVg*U1_flo0#Hz3v8EkfBu{n@Q;(-@!<vQfa`e)_PfIA?#Z+cM@7}^lW1;QQ`8bPeV
z_6SGa8fXrLJ&2|OvS}>>Kk72PG`Q0*XpY|5CUCwP^Sc*Yto|p#ifz7^;qzr)D<Aqi
zCxr0T%az2$HNnSDn(2J@ag^U|R|#w3!8M<VV3s1_t3y>-ctcvJ8D(xAl}?~D$^g>d
zYf(tGUqLA<i(DJ{N;hbXHUwnCXXoBk?ts}0><&>#*ee)V&-9jiB$M_l{?kfop%Au^
zwh^Sg*tBfb?#i$(#m4EsQLP|~YMr4(eKv#<5RZ<l{w$oJdQ#Tl9P$rcWd=!_3LZi#
z-1DReBhjY5M1W7mh-1btf@@ZbCY2oE51A=ZQ#Z@(MN}>RIrlEaOb5h4sG`EBc3Vrw
zSK|wHZgh80_zC)gZ(yj1x-KVGN}Dl^mP0b$+z~v2NS=d1RA0CubHdP}&jW_w=`aCO
z_K)tG&ok1$O4BGc2$x%QPb`EqT-uZEH2|zZP79y|v9BZTMn^jDEY9<6$Bd?4EF<{W
zw@if=T_Q_Dkj0kKD4{86F)N7Etc#iFklZOELKYsNWZp5%33?>oD8`wV&>U(x`<nXa
zsbiGig`cOExblBLhlWgjOy3fQ`V9>M9NMWTk|+I0<Qq%}&_^@hnO@lg@V!>oEN<`(
z{~IYYPpqHH8-J|u+lGdg;i0+k!=C0>5NCe!b;f!<f9SXcSch4Pj<v*_sOao{Ce)SP
zY=~UQsgN&mCLzXRZ*<!vV{9g8YAXE_!CJ@)bi>O@R6K6Y#-B~R$^Y;^zKP58JK)NY
zOnDN-tC&_s-fax>+mPQzs)Scfv?lW8;rS8nd9Ng}yiA^AE)VZ7&(=#SesVN{Bh=^{
zc_@(+;FGJo*U@qvSYhP&$M22&#8S$bXVEXWv|pXP1aB#>-$L`C@8BDL^J@H|0K8_u
z<Ih7dPkiQA+3_~d6Gs~-xq3$$)ciqHp(7hzme(d)-I6Hx*a=Q6|A7(Ct_v~U8kyWQ
zVeE>X$-#Qr>wTm!9)IxeU39@zynY%j=(}pd;*TjWD@pX%@{8x%4G>_0K0X|MYlyv|
zZ=H!KC-satO>^zO{4O$GZ(HZIf<S6`NFdN?{U%G|X4^Uiok#eyXpF3dIbH<)@5Xzp
c>8Ro0s^iwnaL>riMY%*C^+0&pkKgm`Um5bX0ssI2

literal 0
HcmV?d00001

diff --git a/app/soapbox/features/public_layout/components/header.js b/app/soapbox/features/public_layout/components/header.js
index 9f018cc3cfb80790940115277d8d1e044ad33889..70c20dcaaaa8959688eb477b6c441cfc7c91a4c1 100644
GIT binary patch
literal 3793
zcmd5<OLN;c5WeeI>?x#XEUMF^V!3ggcH$YQ>D0M(IvR*vS*S^X1wh9xNB_OM;0q)b
zcXI1V(qdou_S;=Z7Ns^0en*iyI2c_(WcYjZb|IUi8d9wk((x%&SQ*T!=RxhZC@LrR
zIsRsJ`Q@cVJJOcj@v5YA$LHs4D}y(h;wn_5bXI{q>8#RDX>d}*om7w0Bz5J`tTJ5;
zig)@!s$aAz+61i@<z7Fp4=5b@wrf$j<1S~dbsxvBy<m4ByTR4HbV%-W>nT}V60oTb
zbQ<?lSh}c{let~Dzjh4HZh}q?<nUJYH|s2^N>ZyP-632J2XyK26Mj>_z(ISO6~|vq
z;(vDKH6il-h-p{uJeFh7Zi!FtE9bPD6d(XwlFn}Lm4;+%$nYQ)enM--1KJCa>MtVZ
zt#WyPThHE=BoP@d$c=SSv<9%9c!=u-K$>fd8>m5M8;ElGaCAh6#EYW~wh&eB+MuLy
z!}<}NE*7Wd5JHsqPB{Fc8B$A;EdPY<75E?pMevg30bLwX4VD)aTT*&LrQ^d+*s9n&
zEi$PdHgFKR#WpNH`^IgvgLiF{#>F_1<>K7{(jv`;weS%|h6eE2p~@@_ojdBjdcoK*
zex^#DHZgO<E`cEfuvLkj=&hHyqqNCUs4U0(YF|i47|dkJUaBl+F+m4#;urt~3A5{i
zaDt3trpuC%YeE4Sq{dY6dC%2OcuM`OoRMf_Z_X~RjS(;Ys4-6nhgh<cKV+grfkc+%
zN#qs&xonMm27L}(9GUWk9Rbq}u<ek6pCcRS`z6sn8LlC@AR6%J<n}Q>(HI-uq~RkG
zS=v%in-XnXlsvi(k}d4S$jYK=k}s)nU$w~wg8;N9P~wCkVS6p;W5j-Z#B*QEW#W#g
z;&_x|4|kVi+zym@*}Fb1la$ks(HL#QQW2#O(1;V7r8LPcCK(krX;rsdh>C;Q8T`AF
zv_qnfQ4An7jIrqMxqIRoSk=!Eg_t2VD6x@h$zrD;QEkBcoy6*ofm^ik%$4rGd0qxl
z<fO*}v%$eDMx0b&<LjQ3#(#cj=0`lHn^rfuOdtI$Vb0H~G7UFFqL~IE6cJ6OFigv7
zrq-CyJdN%rdnutF@c?z>XA?|@&I7j<Yx%}y_cY<!CizBw-eq488lO>bZ)p6`5a|fe
z^@i`&b}mxacBSEI@8|ryVS39kSpu32ZR3+}`?Z}b-4wZ0;)%8ab=t2qFt*Xr&&lYj
zr_GFx@a9c_2ymInkv;9d70<GjenOLrm)(x1i=Yi=0;kN$|F-libjYM3@@23}gS^kg
zZB~|(F2`-nI40~+bXzU%He|E)mM7o^yp5csg9uu(ZfnoUkh&+Z@*i^f;}0iT&(aHD
z4m}07b^mo{bGar6LpKw_(7{v0np)Aj@EpKXWvcTk$Ag<z!9O4aAoqsWSp-gRqxD3W
zYSusgCKtb4v!C!5q&#))Q{eY1J%;HOC-OebM_u4|xo9oLo_17pb<H1h`w5V9%5g#|
ztt;Z@xRU3<GyF)JATrfE$}B^*vc*IXpe``znuf|hy#f)Z*1QGbEAB;EuJ%s#c)b_t
zBb5k<*3{edmTF#Dp6k)_G>4)IxS@dkAAxXjw=54u)DGPgqVDOw&e$7n7!ESSe2)5)
zw37Za{jX7CmIh7HGxxQ!@XDq?Ll0^vRdhu_)9^lDiJ_&>LN>v0^z(8}DKvfNw;nB}
G)8b#1!KT>&

delta 67
zcmV-J0KEUv9fS_BoB@+T17DN011^*912L1`2VawX2qO<5eIPv`bZBXFE^u;haC4LP
Z2se}Y3lOu&3O)h>FOzW&FSBh8WC2NN7rOue

diff --git a/app/soapbox/features/security/index.js b/app/soapbox/features/security/index.js
index f69c31f6d1d8c1c0c81251d1c256b74a101a9362..b13305dd1525e7ded96864e239ee92b8f72c4162 100644
GIT binary patch
delta 1494
zcmbtU&2AJ&5S9s1;x+5YGDa8)wpL*^Gh(+F5D>9uO%jJh91IRW2MbxIccy2j?cM1~
zcMtJmjgUBSBbR=KJU}8pfloQ*kT(dgkQYd*XJ+joATCHFjk>C<zOTNj>Q|e;?EDtY
zw7yNX7BPfUjKNWYCIhk8^~E?5F^je84y@m7&iq3{rv2!#VsbsC51H0H9xBMnNJ6^!
zQD1WrtL`|Y=JtuN);Ok-8ur1DXgp+PR2zm&zms8#J<XvChy!`z`s_IXOxeRkJm?`!
z=BJYD39&eTojmPgGDs7++W8)%g@kWX9XXJ-YkAx@rb?6Th{vWmyEu<Q#};klx7I`)
z@?k0&jMI_kov=tlF%62qeQL{spSh0U{-cdbW){=Ih#{x<FxxJj7U73YkwQeDeHZ|F
z+A^j%qy!4MvMAfO+8^f@Yn3CWUihv!AG0!tpPjAQDkDY%CN2I2tB8>Nc~Qwa!&9L0
zkXq)gn1zNrH=zD5%H)fHnbpSf&B|FhZE&nZIa{7pwQP>+Ra@yQO*Qk{=0@Yn7i=$Y
zeZWGBl7bmF+6RBm$(hfwSC5nRkRDvEzgaM^>$7I7_2rS({JzxkeVidJQ`<^6ks?tZ
z>?0_`rU{#xR&tAuxFY!-f-)r(N7Q}apt_z%Y%^WS6ppqs6KKA8YbxC*j?l@SqM^=K
z8_JuE1XNQpt(cTu^}K>W<`EnZL}k!l1(sX0nw1E};67k2n(gUFlY}Ygmvu;yY9`P2
zU<0emT|^9an6It2*@`)AoHt*eYTc;{eRn)gwVi|Gm@!QVR}a`vDVHoLVl6Z-TQFj%
z@!E*{yXJ6y(JN_?0-2y{DDH$Lsft|3ZZ6J;U0cWe3(a{R>rwlt$>#6n%jRYC(kJLQ
zPtTp{?;p7cZn9g|&4Yfw4<Q{X2DkGL*}ehX3iz|t{A_;p9P@|Q+`(*>J@m55ZM@%2
zit9x<8p?;tA5o?5(J|{g`O_3b@$2BDAmV_^i6z%bla8$htoD8L=Jfeb@#tmd>BXgM
z>!mOmbgLM*x|SpKDm>n0y=z%dN8n>AcW|NdIp_E=lw1Bk+V#rv7xe3I(KpSd<(bS}
LZe2VG8&Llb5%cqw

delta 47
zcmV+~0MP%AYKB>`WC4?u0q2vo0xPp812GAc;tmzF5f6g_v#Ai&5tB0xCX=}iF0=0^
F9}Tnk5kCL`

diff --git a/app/soapbox/features/security/mfa_form.js b/app/soapbox/features/security/mfa_form.js
new file mode 100644
index 0000000000000000000000000000000000000000..572579d530ff4180a1f4ea34624db7473834bad8
GIT binary patch
literal 11447
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
YtyNuFE|j;Fd0)fHH_p&`JX9|I8@DBLMgRZ+

literal 0
HcmV?d00001

diff --git a/app/soapbox/features/ui/index.js b/app/soapbox/features/ui/index.js
index 7ca9f788f8c6a17b9d2594e969db6aca3302fc9f..f4a4be41383bb6b2951c8a331026e6aad066b26c 100644
GIT binary patch
delta 54
zcmZ3zfbrJ?#tn6xtO^RgX^ERFI1_j#r%K35B$k$B=;x*-sw*Vt=N9DWrRJ5`R)bWW
I6iu=M029y?g#Z8m

delta 19
bcmeyhfN}K##tn6xn>#t9cs8qx1zQ0CRb2;1

diff --git a/app/soapbox/features/ui/util/async-components.js b/app/soapbox/features/ui/util/async-components.js
index 48f36a954c534077f4f22332d1ab92379feebb2f..e6c468ea0699c8ef50ae81279b9d39a7e4b6b9b6 100644
GIT binary patch
delta 74
zcmdm@yIF6;7O}||f`aV6X^C$6MY)p$I82RFlS_*-ODgqq(-Py;fPzX2TKejGdip?A
Nj4r3HY0Xv31pvLG7>ED>

delta 7
Ocmdn2w?%iu7BK(~#sfV7

diff --git a/app/styles/about.scss b/app/styles/about.scss
index 27a02f0119..77d93917e4 100644
--- a/app/styles/about.scss
+++ b/app/styles/about.scss
@@ -34,6 +34,7 @@ $small-breakpoint: 960px;
     flex-wrap: nowrap;
     padding: 14px 0;
     box-sizing: border-box;
+    position: relative;
 
     @media screen and (max-width: 1024px) {
       padding: 14px 20px;
@@ -1712,7 +1713,40 @@ $small-breakpoint: 960px;
   .header,
   .container {
     position: relative;
-    z-index: 1;
+  }
+
+  .otp-form-overlay__container {
+    z-index: 9998;
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: rgba($base-overlay-background, 0.7);
+
+    .otp-form-overlay__form {
+      @include standard-panel-shadow;
+      border-radius: 10px;
+      z-index: 9999;
+      margin: 0 auto;
+      max-width: 800px;
+      position: relative;
+      padding: 20px;
+      background-color: var(--background-color);
+      display: flex;
+      flex-direction: column;
+
+      .simple_form {
+        padding: 30px 50px 50px;
+      }
+
+      .otp-form-overlay__close {
+        align-self: flex-end;
+      }
+    }
   }
 }
 
@@ -1725,3 +1759,10 @@ $small-breakpoint: 960px;
   bottom: 0;
   right: 0;
 }
+
+h1.otp-login {
+  font-size: 16px;
+  line-height: 24px;
+  font-weight: 800;
+  padding: 10px 0;
+}
diff --git a/app/styles/application.scss b/app/styles/application.scss
index b040685c9e..dee4df0ba6 100644
--- a/app/styles/application.scss
+++ b/app/styles/application.scss
@@ -72,3 +72,4 @@
 @import 'components/video-player';
 @import 'components/audio-player';
 @import 'components/profile_hover_card';
+@import 'components/mfa_form';
diff --git a/app/styles/components/buttons.scss b/app/styles/components/buttons.scss
index fd664d06dc..49070ad6ca 100644
--- a/app/styles/components/buttons.scss
+++ b/app/styles/components/buttons.scss
@@ -102,7 +102,7 @@ button {
     &:focus,
     &:hover {
       border-color: var(--brand-color);
-      color: var(--primary-text-color);
+      color: var(--background-color);
     }
 
     &:disabled {
diff --git a/app/styles/components/mfa_form.scss b/app/styles/components/mfa_form.scss
new file mode 100644
index 0000000000..80e16da1eb
--- /dev/null
+++ b/app/styles/components/mfa_form.scss
@@ -0,0 +1,81 @@
+.security-settings-panel {
+  margin: 20px;
+
+  h1.security-settings-panel__setup-otp {
+    font-size: 20px;
+    line-height: 1.25;
+    color: var(--primary-text-color);
+    font-weight: 600;
+  }
+
+  h2.security-settings-panel__setup-otp {
+      display: block;
+      font-size: 16px;
+      line-height: 1.5;
+      color: var(--primary-text-color--faint);
+      font-weight: 400;
+    }
+
+  div {
+    display: block;
+    margin: 10px 0;
+  }
+
+  .security-warning {
+    color: var(--primary-text-color);
+    padding: 15px 20px;
+    font-size: 14px;
+    background-color: var(--warning-color--faint);
+    margin: 5px 20px;
+    border-radius: 8px;
+    margin: 20px auto;
+  }
+
+  .backup_codes {
+    margin: 20px;
+    font-weight: bold;
+    padding: 15px 20px;
+    font-size: 14px;
+    background-color: var(--brand-color--faint);
+    border-radius: 8px;
+    margin: 20px;
+    text-align: center;
+    position: relative;
+    min-height: 125px;
+
+    .backup_code {
+      margin: 5px auto;
+    }
+
+    .loading-indicator {
+      position: absolute;
+    }
+  }
+
+  .security-settings-panel__setup-otp__buttons {
+    margin: 20px;
+    display: flex;
+    justify-content: space-between;
+
+    .button {
+      min-width: 182px;
+    }
+  }
+
+  div.confirm-key {
+    display: block;
+    font-size: 16px;
+    line-height: 1.5;
+    color: var(--primary-text-color--faint);
+    font-weight: 400;
+    margin: 0 0 20px 20px;
+  }
+}
+
+form.otp-auth {
+  .error-box {
+    width: 100%;
+    text-align: center;
+    color: $error-red;
+  }
+}
diff --git a/app/styles/components/tabs-bar.scss b/app/styles/components/tabs-bar.scss
index 02dac4e2b8..76920534b3 100644
--- a/app/styles/components/tabs-bar.scss
+++ b/app/styles/components/tabs-bar.scss
@@ -255,9 +255,9 @@
     display: block;
     margin-right: 30px;
     border: 0;
-    height: 50px;
+    height: 40px;
     overflow: hidden;
-    padding: 10px 0;
+    padding: 13px 0 0;
     box-sizing: border-box;
     filter: brightness(0%) grayscale(100%) invert(100%);
     & span {display: none !important;}
diff --git a/app/styles/themes.scss b/app/styles/themes.scss
index 1a717e2436..13d952b17a 100644
--- a/app/styles/themes.scss
+++ b/app/styles/themes.scss
@@ -30,12 +30,14 @@ body {
   --accent-color: hsl(var(--accent-color_hsl));
   --primary-text-color: hsl(var(--primary-text-color_hsl));
   --background-color: hsl(var(--background-color_hsl));
+  --warning-color: hsla(var(--warning-color_hsl));
 
   // Meta-variables
   --brand-color_hsl: var(--brand-color_h), var(--brand-color_s), var(--brand-color_l);
   --accent-color_hsl: var(--accent-color_h), var(--accent-color_s), var(--accent-color_l);
   --primary-text-color_hsl: var(--primary-text-color_h), var(--primary-text-color_s), var(--primary-text-color_l);
   --background-color_hsl: var(--background-color_h), var(--background-color_s), var(--background-color_l);
+  --warning-color_hsl: var(--warning-color_h), var(--warning-color_s), var(--warning-color_l);
   --accent-color_h: calc(var(--brand-color_h) - 15);
   --accent-color_s: 86%;
   --accent-color_l: 44%;
@@ -51,6 +53,7 @@ body {
     calc(var(--accent-color_l) + 3%)
   );
   --primary-text-color--faint: hsla(var(--primary-text-color_hsl), 0.6);
+  --warning-color--faint: hsla(var(--warning-color_hsl), 0.5);
 }
 
 body.theme-mode-light {
@@ -69,6 +72,9 @@ body.theme-mode-light {
   --background-color_h: 0;
   --background-color_s: 0%;
   --background-color_l: 94.9%;
+  --warning-color_h: 0;
+  --warning-color_s: 100%;
+  --warning-color_l: 66%;
 
   // Modifiers
   --brand-color--hicontrast: hsl(
@@ -94,6 +100,9 @@ body.theme-mode-dark {
   --background-color_h: 0;
   --background-color_s: 0%;
   --background-color_l: 20%;
+  --warning-color_h: 0;
+  --warning-color_s: 100%;
+  --warning-color_l: 66%;
 
   // Modifiers
   --brand-color--hicontrast: hsl(
diff --git a/package.json b/package.json
index 9682ef3094..ad53a512de 100644
--- a/package.json
+++ b/package.json
@@ -100,6 +100,7 @@
     "postcss-object-fit-images": "^1.1.2",
     "prop-types": "^15.5.10",
     "punycode": "^2.1.0",
+    "qrcode.react": "^1.0.0",
     "rails-ujs": "^5.2.3",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
diff --git a/yarn.lock b/yarn.lock
index c6908bd86a..4968718442 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9320,6 +9320,20 @@ q@^1.1.2:
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
+qr.js@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/qr.js/-/qr.js-0.0.0.tgz#cace86386f59a0db8050fa90d9b6b0e88a1e364f"
+  integrity sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8=
+
+qrcode.react@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/qrcode.react/-/qrcode.react-1.0.0.tgz#7e8889db3b769e555e8eb463d4c6de221c36d5de"
+  integrity sha512-jBXleohRTwvGBe1ngV+62QvEZ/9IZqQivdwzo9pJM4LQMoCM2VnvNBnKdjvGnKyDZ/l0nCDgsPod19RzlPvm/Q==
+  dependencies:
+    loose-envify "^1.4.0"
+    prop-types "^15.6.0"
+    qr.js "0.0.0"
+
 qs@6.7.0:
   version "6.7.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"

From e9d76b62874c60a99f574a1a8b736575da582d3c Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Fri, 7 Aug 2020 17:01:15 -0500
Subject: [PATCH 64/79] Update chained get requests

---
 .../components/profile_preview.js             | Bin 1250 -> 1316 bytes
 app/styles/components/drawer.scss             |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/edit_profile/components/profile_preview.js b/app/soapbox/features/edit_profile/components/profile_preview.js
index faf3c04d3068c021da9486e2cdbde85c1840e5ec..808f18a555669f8650649fdef8f3ab54afee91cc 100644
GIT binary patch
delta 108
zcmaFFxrA#27o$;TZb5!gi9)r4PiAq6LSnIkXKrq3Nn%n?Dp;UaA+0DsS3x}!CaP||
pnVWGXle%Y~MznfCPAX6~QC&wty(BTcSUpw;RlA1f=2OfPi~#%-B*Xv!

delta 42
xcmZ3&^@wu=7b7FrW*f$pOkx`91v#lj`MHVentJJ}B^v4_iRs1an|W9y7y%6<3=aSR

diff --git a/app/styles/components/drawer.scss b/app/styles/components/drawer.scss
index 39e936158b..7dc5a1a10c 100644
--- a/app/styles/components/drawer.scss
+++ b/app/styles/components/drawer.scss
@@ -20,7 +20,7 @@
 .column,
 .drawer {
   flex: 1 1 100%;
-  overflow: visible;
+  overflow: hidden;
 }
 
 .drawer__pager {

From 7931a9a89d25f81aad41631145aa04ea9349d298 Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Fri, 7 Aug 2020 18:10:13 -0500
Subject: [PATCH 65/79] code review

---
 .../features/ui/components/user_panel.js      | Bin 4137 -> 4205 bytes
 app/styles/components/drawer.scss             |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/ui/components/user_panel.js b/app/soapbox/features/ui/components/user_panel.js
index ed34e51ead43dfe1bf2a6c19451b4d5456b55bff..1ba4e3efcab7d9546ad5e3d54532f327094d42d6 100644
GIT binary patch
delta 105
zcmZ3f@K#~NJSP3j+=Bd~5`}67pUmPCg~Vb7&)nS7lEkE(RIos;LRwLNu7Y|dRCMz!
nCKe`j&peH2^@5yKpj4u|j)HngVtTQ9tPZMP4b9D4SW3A8=EEfk

delta 39
vcmaE>uu@^eJf_7LnV7^h)C+P_i}G_5)iw3fQ%f||OA^zI)i?iODdh$LA-4_&

diff --git a/app/styles/components/drawer.scss b/app/styles/components/drawer.scss
index 7dc5a1a10c..39e936158b 100644
--- a/app/styles/components/drawer.scss
+++ b/app/styles/components/drawer.scss
@@ -20,7 +20,7 @@
 .column,
 .drawer {
   flex: 1 1 100%;
-  overflow: hidden;
+  overflow: visible;
 }
 
 .drawer__pager {

From e116745e83939b5a50528a83725ce03611a096e4 Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Fri, 7 Aug 2020 19:28:30 -0500
Subject: [PATCH 66/79] timeline filtering improvements

---
 app/soapbox/actions/settings.js               | Bin 2865 -> 3011 bytes
 app/soapbox/actions/timelines.js              | Bin 7350 -> 7358 bytes
 .../components/column_settings.js             | Bin 874 -> 1455 bytes
 .../components/column_settings.js             | Bin 1313 -> 1178 bytes
 .../components/column_settings.js             | Bin 874 -> 1449 bytes
 .../ui/containers/status_list_container.js    | Bin 2150 -> 2098 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/actions/settings.js b/app/soapbox/actions/settings.js
index a482b519cf92fa09ee03750682f6a8fc29dce24d..3eb6c00e502d281e424562a3d4b6bb871f124ec5 100644
GIT binary patch
delta 28
icmdlec36DFbJod{%&wF3*-9rzut|g1oAcQYu>b&<aS5FO

delta 20
ccmX>szENz$bJoeM?1hsTvPo}dW#7jF08~u}Bme*a

diff --git a/app/soapbox/actions/timelines.js b/app/soapbox/actions/timelines.js
index f1213c30105659e9319a37d8b3d72ac75dd044cb..7ae27b8af0fc87a76c9427cb4e5971ca19b45358 100644
GIT binary patch
delta 48
zcmdmHxzBQgywGGhp?i~m3%#4%FDgBmS>y$nW)<xQ(pM)Zi>;c>Bfe(ycJco#0POq}
A4FCWD

delta 48
zcmdmIxy^EeywGF?p}Uj+3B8^CUPNj#o5%|wy%fw|FS=`Tme|V4BI2tz9}xe?0stA>
B73=^2

diff --git a/app/soapbox/features/community_timeline/components/column_settings.js b/app/soapbox/features/community_timeline/components/column_settings.js
index d46dd017676b9def870ad5a999d1aa1bfe3d536b..6ac69bcf2e3d267d7bbe00a6e83aaff057398af2 100644
GIT binary patch
delta 295
zcmaFGww`-KFOzgZQEFOdg{^vWer|4QUS>&Ud`V_*YEEWes`}&}CKdkTjQsLqbsYuu
zqSU0E{Pf9(m`uYn@^e%5lJj#)bMxYhQ%g!R^U{m;Knmj_ii*`0Qc}|rOLIzmQ;Ule
z(^GBLgMqRNMX3e(#U(&leY;v9=2CzH8~v2bGCQuxE=-<;+{1_Do`Rf8g3c+($xOxL
P9EdD-=WKRiQey-FY&~WU

delta 11
ScmZ3_{fccvFVo~pEO!AOHw7>N

diff --git a/app/soapbox/features/home_timeline/components/column_settings.js b/app/soapbox/features/home_timeline/components/column_settings.js
index d37e70f1c0e1478fb29fa5960e2a2daf0f0960b9..53409b21553c81936590407ae42a0b52c32de436 100644
GIT binary patch
delta 12
TcmZ3;HH&kDAJgWmOg>Bi9ee~Q

delta 78
zcmbQmxsYpv9}`P)L1NzIKqgtv;?(4l%=|ocyUAafwAGRli!+ne6;e{u5=(PRd{c{y
b6Vp>|)tw;1`gS(@V2ugP6E<IBI>8747k?Wj

diff --git a/app/soapbox/features/public_timeline/components/column_settings.js b/app/soapbox/features/public_timeline/components/column_settings.js
index d46dd017676b9def870ad5a999d1aa1bfe3d536b..1d7bd735969af6c93e7f0d4f8104a239b88bdca0 100644
GIT binary patch
delta 289
zcmaFGwvu~8FOx(;QEFOdg{^u)X;MyRa(qc<ZfZ_uUaI=!9wrt3;*9+AVs#w_^`g|I
zoc#33hnP&mGxBp&^^)^*N^|q#i&INVGV{`l^*{>aA&QFC6;e{u5=(PRd{c{y6Vp>|
z)q{bu3Pq^}`NbtbS$(@&Am&nl0vr95%rZN!$u3Nucpbxs<d}k-N`h`F$jMB_;}(c4
McDHPHVNzoR0BuoYHUIzs

delta 11
ScmZ3<{fccvFVo~REO!AN;{_xD

diff --git a/app/soapbox/features/ui/containers/status_list_container.js b/app/soapbox/features/ui/containers/status_list_container.js
index 307dff09d8f84d24178b5577ce2419db4b1c6d36..d014f22eeb3bfbea782bed54f7a6df7ead618a7e 100644
GIT binary patch
delta 12
TcmaDRut{J;Hp}MuEXSDvBP9g*

delta 41
wcmdla@JwJsHVcbFO^w22M;2M(#N_1s(!7%R%oKG^1zTHNh1}H5*(}GI0UKQnIsgCw


From ae608388a0461f1bbd17394e3915ef6e70d42336 Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Fri, 7 Aug 2020 20:47:04 -0500
Subject: [PATCH 67/79] add DM filter option for Home timeline, fixes #254

---
 app/soapbox/actions/settings.js               | Bin 3011 -> 3032 bytes
 .../components/column_settings.js             | Bin 1178 -> 1471 bytes
 .../ui/containers/status_list_container.js    | Bin 2098 -> 2300 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/actions/settings.js b/app/soapbox/actions/settings.js
index 3eb6c00e502d281e424562a3d4b6bb871f124ec5..e9b3a0c8519bce22ca7739f063c34136c46d03fe 100644
GIT binary patch
delta 27
icmX>senWgi6f>WKLP};)YI2E{LRw-@@#bLW0uBI$VhJGt

delta 12
Tcmca1epq}%6!YeM=1dL%A-n`_

diff --git a/app/soapbox/features/home_timeline/components/column_settings.js b/app/soapbox/features/home_timeline/components/column_settings.js
index 53409b21553c81936590407ae42a0b52c32de436..da553e779fd98a18dcbe21072ec42e7ed4cd06a1 100644
GIT binary patch
delta 69
zcmbQmxu1JOJ<H@I<{q|`%%arflF8SY{IwuVb%m7Fw8YY!65rI~;>7e+TlL_K{Bi||
Nq(UxOaB?b(DFA|f8D{_h

delta 11
ScmdnbJ&SWgJ<H@JtkM7)n*;a&

diff --git a/app/soapbox/features/ui/containers/status_list_container.js b/app/soapbox/features/ui/containers/status_list_container.js
index d014f22eeb3bfbea782bed54f7a6df7ead618a7e..f54cd2eee40f4e0609595bfb3f2cf6945aa11325 100644
GIT binary patch
delta 123
zcmdla@JDb%38P46Zb5!gi9)qPdTL2<YDr0EUV8Clenv_5VhCq)0i%yJlAK0yNn%N=
zrXEm8qolGRb@MI8`An0aGOMtqWEQ0+mrUkkagi*`EY3{I%*iaNRM%8cw6#@Ghe)b#
J&Sp8z3;^uAEARjS

delta 42
ycmew(xJh6`3FG87j2@FMnfL^XQ%g!R^U{mebreb}3sPe@^E1t7+U(4_lNkU=kq(Fe


From b3a6c395dffb9147ebe7b9d530bf8d22e1b2914d Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 8 Aug 2020 18:34:35 -0500
Subject: [PATCH 68/79] Revert "Store fieldsLimits in instance/pleroma/metadata
 of the Redux store.  Render fields to maxFields value in
 features/edit_profile, using maxFields value"

This reverts commit 3d24cfaf53a64dcd3affb9af5badaff8bb39226b.
---
 app/soapbox/features/edit_profile/index.js | Bin 9361 -> 9320 bytes
 app/soapbox/reducers/instance.js           | Bin 1193 -> 1125 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/features/edit_profile/index.js b/app/soapbox/features/edit_profile/index.js
index 5445ff30acb239b5f9c13b7bbaecbead0847ff83..d25cc85e3a8c45a9b93bc09ca98066457e2c3bb5 100644
GIT binary patch
delta 217
zcmbQ}`NCtvdL}Dh$B1}0Pgft8U<F$R6Ke&1eT5Kz7k?`S-^A=xg_4ZSVuh5-yu{qh
zWQC+kAU{<hGq1QLF)ulF^KvE+rpdmnavUHtf<2>LCs(rSv!!LG=A;x)-p#7Ug)n>b
zE7sqPli4^lY!wtB3ak|J@{4j4b26(^-M~6D9E*w)EA`Tf@^dw+6>?JZ(n~Ucu0S}i
iR#S7b7RU3=N}S6$HeVLh<l{k>oV-v>bhC^?DGLB@rbjmb

delta 266
zcmaFiG0}6wdZx`EnH-oR6cln3E8H?ub5e?}6pBj{OH%dHQ%gMaG@{ir^ML%k<WzMX
z1@(fQ)S~>{L=ZDKwInemu>{Oc18elj%*`w*2Ft<BQlG5Ns=^01TA?_zDs^%=tG=)X
zM2il>TFuEltZJNarJMJ#{$`X#aaKT4enCiOL29vHUTJPpYSHA)>^hSbI35e?C=>vt
piuDkhnK_qnaKX7cljm~EZayl=%f|y3Q>d+-+#n&o`I~$Z3joUVUCsai

diff --git a/app/soapbox/reducers/instance.js b/app/soapbox/reducers/instance.js
index 549f952073bb73b9bd80fd06f54fab9d65446c47..98095103147004a55c098a2b2af2de7aa99872ec 100644
GIT binary patch
delta 12
TcmZ3<`IKXWIMe26CO;+s9Z>_x

delta 44
pcmaFLv66FxI1`_OLRw~OPD-&)W^QIl@#F|bc^+he%{)wzOaM<d4!i&W


From 9a2fba1ef5a5340ce122ee951e9015d27ac52d1d Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 8 Aug 2020 20:32:39 -0500
Subject: [PATCH 69/79] Revert "Revert "Store fieldsLimits in
 instance/pleroma/metadata of the Redux store.  Render fields to maxFields
 value in features/edit_profile, using maxFields value""

This reverts commit b3a6c395dffb9147ebe7b9d530bf8d22e1b2914d.
---
 app/soapbox/features/edit_profile/index.js | Bin 9320 -> 9361 bytes
 app/soapbox/reducers/instance.js           | Bin 1125 -> 1193 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/features/edit_profile/index.js b/app/soapbox/features/edit_profile/index.js
index d25cc85e3a8c45a9b93bc09ca98066457e2c3bb5..5445ff30acb239b5f9c13b7bbaecbead0847ff83 100644
GIT binary patch
delta 266
zcmaFiG0}6wdZx`EnH-oR6cln3E8H?ub5e?}6pBj{OH%dHQ%gMaG@{ir^ML%k<WzMX
z1@(fQ)S~>{L=ZDKwInemu>{Oc18elj%*`w*2Ft<BQlG5Ns=^01TA?_zDs^%=tG=)X
zM2il>TFuEltZJNarJMJ#{$`X#aaKT4enCiOL29vHUTJPpYSHA)>^hSbI35e?C=>vt
piuDkhnK_qnaKX7cljm~EZayl=%f|y3Q>d+-+#n&o`I~$Z3joUVUCsai

delta 217
zcmbQ}`NCtvdL}Dh$B1}0Pgft8U<F$R6Ke&1eT5Kz7k?`S-^A=xg_4ZSVuh5-yu{qh
zWQC+kAU{<hGq1QLF)ulF^KvE+rpdmnavUHtf<2>LCs(rSv!!LG=A;x)-p#7Ug)n>b
zE7sqPli4^lY!wtB3ak|J@{4j4b26(^-M~6D9E*w)EA`Tf@^dw+6>?JZ(n~Ucu0S}i
iR#S7b7RU3=N}S6$HeVLh<l{k>oV-v>bhC^?DGLB@rbjmb

diff --git a/app/soapbox/reducers/instance.js b/app/soapbox/reducers/instance.js
index 98095103147004a55c098a2b2af2de7aa99872ec..549f952073bb73b9bd80fd06f54fab9d65446c47 100644
GIT binary patch
delta 44
pcmaFLv66FxI1`_OLRw~OPD-&)W^QIl@#F|bc^+he%{)wzOaM<d4!i&W

delta 12
TcmZ3<`IKXWIMe26CO;+s9Z>_x


From 95fb1b7900b77c987df5c66d493f99452a92d408 Mon Sep 17 00:00:00 2001
From: Sean King <seanking2919@protonmail.com>
Date: Sun, 9 Aug 2020 01:40:35 +0000
Subject: [PATCH 70/79] Update index.js

---
 app/soapbox/features/edit_profile/index.js | Bin 9361 -> 9363 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/features/edit_profile/index.js b/app/soapbox/features/edit_profile/index.js
index 5445ff30acb239b5f9c13b7bbaecbead0847ff83..e8dc8b9fb0428a5f3eff0f27000d6af2d813d85a 100644
GIT binary patch
delta 29
kcmbQ}IoWfAF{?m)PG)XqNwK<)f_iRZMSR+3N7ev&0GTEUtpET3

delta 27
icmbR2Ini^2F)N=>W^QIlvAT|edTwHc+h%9h0C@m`wg|5P


From 715779653c0aa8d8418831c33c37f57451c937d5 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 9 Aug 2020 00:29:28 -0500
Subject: [PATCH 71/79] Rearrange home sidebars

---
 .../features/ui/components/features_panel.js  | Bin 0 -> 1892 bytes
 app/soapbox/pages/home_page.js                | Bin 2881 -> 2985 bytes
 app/styles/components/wtf-panel.scss          |   4 ++++
 app/styles/donations.scss                     |   2 +-
 4 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 app/soapbox/features/ui/components/features_panel.js

diff --git a/app/soapbox/features/ui/components/features_panel.js b/app/soapbox/features/ui/components/features_panel.js
new file mode 100644
index 0000000000000000000000000000000000000000..9dbba637d911b861bac932fd2915c1b50aef7c96
GIT binary patch
literal 1892
zcmd5+O>2Wd5WV{==4NuR{(vMsw6su2i?oLxWus%VsJpT|rk0TZ-ti;J(tuEe5>LC#
zoA>5Db!1s-L-39wA;^p_!8h&MUwE=Fy(C%<6{|(H(M_0WE-6%GL&?<(_5f?CayYt7
zfzdUg2~u4$(8Hz^OfeI6L68)}T6ji5wLu#Rg#}<ks8ZVxbr*5r@gxWb&jT=AMl+l9
z4frw0%?f7S1z?%Veb4(QN?iG0lm%5sT(LjhpZ)s*eT{ceam@BeNQH(Q&K;vYfg~&)
z`gX!)7fa{0pUKha@Nv8$<pb%JA6g`mYHLFVWwO9uT+G(J5}B_2+VWto*K6MH1wkeo
zOh08xI|wh%+tC1?Qb`c?T8>553EQz<_%h^d|1F3Ttrc6eBLSe=W1%aY9K!3MbyERs
zw9ZRm^05R?n8^t|oWyP_f<jsvv)|SyTVJ;#H)UJYv<s1c%#m-u&`Cbo`UfVpk@S62
n?wt*Y8S=JIMwdXMx07>-%vtG=Q4Bk=-=)rFzF?xG=N-Kt%E2Xy

literal 0
HcmV?d00001

diff --git a/app/soapbox/pages/home_page.js b/app/soapbox/pages/home_page.js
index eeeafede96e998ab5624b71804e6cef733071d31..81f2c93e3b7bf7170bcefdc2e3a2f6612fcc8bef 100644
GIT binary patch
delta 75
zcmX>owo-gU93#71YGO%gQR>8p>U?PsW^sH$VqR*_<`BjN*2x8&zMJjY*D`Y}DA+)i
W7Ej*8CN+6GTj=Bh4z9@p+=c)bt{N-=

delta 53
zcmZ1}eo$;f9OLFCjA5*k#keCT`*HG4{?Dqm*`0kY^JHFj_Q~~}!a&S5`4=1i<O-nV
H6mC%f-GUI-

diff --git a/app/styles/components/wtf-panel.scss b/app/styles/components/wtf-panel.scss
index 37566af47a..a555e9490f 100644
--- a/app/styles/components/wtf-panel.scss
+++ b/app/styles/components/wtf-panel.scss
@@ -8,6 +8,10 @@
   box-sizing: border-box;
   background: var(--foreground-color);
 
+  &:first-child {
+    margin-top: 0;
+  }
+
   &:not(:last-of-type) {
     margin-bottom: 10px;
   }
diff --git a/app/styles/donations.scss b/app/styles/donations.scss
index b108949c1a..bb4798f1de 100644
--- a/app/styles/donations.scss
+++ b/app/styles/donations.scss
@@ -169,7 +169,7 @@ body.admin {
 }
 
 .funding-panel {
-  margin: 20px 0;
+  margin-top: 15px;
 
   strong {
     font-weight: bold;

From 9c505d0d84e417697776bb82198039d6e5fc0113 Mon Sep 17 00:00:00 2001
From: Sean King <seanking2919@protonmail.com>
Date: Sun, 9 Aug 2020 10:55:39 -0600
Subject: [PATCH 72/79] Fix for Pleroma 2.1 and older versions regarding
 profile metadata

---
 app/soapbox/features/edit_profile/index.js | Bin 9363 -> 9558 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/features/edit_profile/index.js b/app/soapbox/features/edit_profile/index.js
index e8dc8b9fb0428a5f3eff0f27000d6af2d813d85a..35c2024f4204b9759a554656fbedf0f19cd7410e 100644
GIT binary patch
delta 85
zcmbR2dChCX4i>@W{Ji24h1|pnx6IU>lwt+j$-h|wSQPBJ6hI6{g~`8IEJb}Xb2Ced
Z)pZoq;R@AbCvRr)<b?A#d$W4T0{}3)9ozr_

delta 24
gcmccSHQ95+4wlIWSzRU<u$oT}WtG^>$L1jq0DlDtcmMzZ


From 2fff5db5d58789376ed383daee745fbad74e535f Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 9 Aug 2020 13:58:15 -0500
Subject: [PATCH 73/79] Handle `max_fields` fallback differently

---
 app/soapbox/features/edit_profile/index.js | Bin 9558 -> 9366 bytes
 app/soapbox/reducers/instance.js           | Bin 1193 -> 1264 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/features/edit_profile/index.js b/app/soapbox/features/edit_profile/index.js
index 35c2024f4204b9759a554656fbedf0f19cd7410e..cf0e403d09da857fb167f25cc7fc380e0c658363 100644
GIT binary patch
delta 29
lcmccSHO+Iw4wlIWSzRU<u$oT}Wff=9Q83Zm%*W;-4*;ms2`2ym

delta 87
zcmbQ{dChCX4i>@W{Ji24h1|pnx6IU>lwt+j$-i0rSv3{xxfDPwCQXIOzgR3qeKK=1
bON!NX6x88L)ng}bX7S{N^EdmkddLF+Tp%7a

diff --git a/app/soapbox/reducers/instance.js b/app/soapbox/reducers/instance.js
index 549f952073bb73b9bd80fd06f54fab9d65446c47..f2fc6b5ca8f6fda6bc2096f6067e5ddc813498ef 100644
GIT binary patch
delta 95
zcmZ3<`GIqTJk#V?OfmurV33<w5ucWsnv+sIIf7AM9m4d<%*`w*R@YHb2THqvWz}Of
fb+{l}6clPV2Qh77WN}GNEtt&4QU+nvu;>B+m6jaI

delta 32
ocmeysxsr2(JQJ%=W^QK5WG^ON#@NjhnYJ)a_GBrWe3(TS0JGl;!vFvP


From 6f6f91e2f4768d02234ece6edb2fd62e182d4ecc Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 9 Aug 2020 14:32:22 -0500
Subject: [PATCH 74/79] Verified className fix

---
 app/soapbox/features/edit_profile/index.js | Bin 9366 -> 9370 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/features/edit_profile/index.js b/app/soapbox/features/edit_profile/index.js
index cf0e403d09da857fb167f25cc7fc380e0c658363..63946efd1bc6cd967e18e2279977d434ed98bb8b 100644
GIT binary patch
delta 35
rcmbQ{Im>fHg0PUif_h43abi+VYKppom4do@?PNw#r_CFLp9uf}(CG_#

delta 25
gcmbQ`In8rJf-sMonu2;tW^rOtPHM{L0%0vd0B>0cE&u=k


From e97b9d2168530e1dab0b03a8d80fcc543409d381 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 9 Aug 2020 14:37:02 -0500
Subject: [PATCH 75/79] Update columns layout for all pages

---
 .../features/ui/components/features_panel.js  | Bin 1892 -> 1931 bytes
 app/soapbox/features/ui/index.js              | Bin 20602 -> 20613 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/features/ui/components/features_panel.js b/app/soapbox/features/ui/components/features_panel.js
index 9dbba637d911b861bac932fd2915c1b50aef7c96..b77eeb677efbafbb83a47a91bf0e142dfd85d5f5 100644
GIT binary patch
delta 134
zcmaFD*Udj6fY~pxY-4~pBZ!_{$gDGYGGjNGEzcYT7n{S>j3%}bjjuC#0ZS!@*mTwg
Q46&(fy-+cQ$xiG_06mE*y8r+H

delta 78
zcmeC?f5JB*U}La2<K$e%?UVJGgMhTo<P}WKaQ1rURycbHOC_AWm9+uP?q%Bvq!lJ-
HvMT`qF)tcw

diff --git a/app/soapbox/features/ui/index.js b/app/soapbox/features/ui/index.js
index f4a4be41383bb6b2951c8a331026e6aad066b26c..170fb56c7a864166b8df6e4fa35556c9252e68d9 100644
GIT binary patch
delta 119
zcmeyhfU$KU;|5+<eYe!alG38o;()}w)EtGhqWoM1bv^y${M>^4ywtpsV*NCzg7^ZE
zip|WdvfPth1PnQCU^*v%5D=R@OTcZivw+}cTfr8V$qAaulh26Sf#}VmV!e!$mntc5
JUMqgq0ss;MDqa8p

delta 176
zcmZo&$oOjk;|5;V&2Fs1+%n-A`62mk`8hfH<pGI#sW}SSsg<_s2I>m>b~=*-1uPZx
z^%ZQ~i}Fhgf-_T6lM;*2RZU(Z;O$CCkq(yv7}#L9&Jbpu#3sQOmdSHOJvaXqox!+y
It@sTK0AHv$g8%>k


From 504e36c7d86ab9d6227f0a0220e4cdc3405446f6 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 9 Aug 2020 14:43:18 -0500
Subject: [PATCH 76/79] Fix linter

---
 app/soapbox/features/ui/index.js   | Bin 20613 -> 20548 bytes
 app/styles/accounts.scss           |   3 ++-
 app/styles/components/filters.scss |   6 ++++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/features/ui/index.js b/app/soapbox/features/ui/index.js
index 170fb56c7a864166b8df6e4fa35556c9252e68d9..e0cc6c5992623f16242d40800903638748beea3c 100644
GIT binary patch
delta 14
WcmZo&$arJ{<A#|mn{TnK_67hjod#h5

delta 70
zcmX@IfU$KU<A#|m=HVInA^C3kIXU^|0f~93ISOe-`MC<}diu%vxdr)osd**E`sEq<
V@g@23X<$|H1t4Xc`&qVn0|3J68;Jk_

diff --git a/app/styles/accounts.scss b/app/styles/accounts.scss
index e6e6f20ee6..4b09808500 100644
--- a/app/styles/accounts.scss
+++ b/app/styles/accounts.scss
@@ -93,7 +93,8 @@
         text-overflow: ellipsis;
       }
 
-      bdi, span.verified-icon {
+      bdi,
+      span.verified-icon {
         display: inline-block;
       }
     }
diff --git a/app/styles/components/filters.scss b/app/styles/components/filters.scss
index de1e6ee960..769954a4d5 100644
--- a/app/styles/components/filters.scss
+++ b/app/styles/components/filters.scss
@@ -31,7 +31,7 @@
       }
     }
 
-    @media(max-width: 485px){
+    @media(max-width: 485px) {
       div.input {
         width: 100%;
         margin-right: 5px;
@@ -49,7 +49,9 @@
     justify-content: space-between;
     font-size: 14px;
 
-    .filter__phrase, .filter__contexts, .filter__details {
+    .filter__phrase,
+    .filter__contexts,
+    .filter__details {
       padding: 5px 0;
     }
 

From 695a78503d02f164f5bcf2bb35375923d9daa6cb Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 9 Aug 2020 14:55:32 -0500
Subject: [PATCH 77/79] Verified ['pleroma', 'tags'] fix

---
 app/soapbox/features/edit_profile/index.js | Bin 9658 -> 9675 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/features/edit_profile/index.js b/app/soapbox/features/edit_profile/index.js
index 6208f31b3b2d62a65f44fd67aeaec824fee0d979..c84cbed40e91a045529e29de213e7ed9b5dd9080 100644
GIT binary patch
delta 52
zcmdnxecF4&DIs;wJdJ4ef}GT%{M<x!9R>B0#PnkISRDn=+}zTV#H5^5pUmPC4b9CD
Igl-7|00fW|R{#J2

delta 35
rcmX@@y~}&UDIqZp^@5z#qWs)MbxpnW)DjK#lEn04_01oJZV3SZ_g@Wy


From b30dc39f1a7af9cb9dff5389957b7c14e96721a9 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 9 Aug 2020 15:13:36 -0500
Subject: [PATCH 78/79] Bio fixes

---
 app/soapbox/features/edit_profile/index.js | Bin 9675 -> 9668 bytes
 app/styles/forms.scss                      |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/edit_profile/index.js b/app/soapbox/features/edit_profile/index.js
index c84cbed40e91a045529e29de213e7ed9b5dd9080..bcb3d71ea5f6e9f37b246e866f733979300c1dc0 100644
GIT binary patch
delta 222
zcmX@@eZ+f%C8K7wLUBfZxnoXhQHesWLRwLNu7Y}TequpVeuaKwa!F=>Ua@{6NOrRx
zV-@4(4NUvk*mM-slQQ!+=W_C~*z4;nIOpdU0F^3~WTYw-mnP+A78e7x=_!O{WEO)=
zFU?6&C@9KLN=(YBR7gryNXgGj1=1xYsYQB|OL%oBujEzV{E3&FQA<G~C9}97u_QS|
z1MVsfb#<V90Y&*~nK?l76U$Ol6xB61f8&c}+<aExGVA1hV(ycTL?zgZ^2>{DtBp7F
Ii|^qB08M;N-v9sr

delta 201
zcmX@&ecF42CFAB?#(YL59fi%;n2xY*UdYMIGWiRy8V8pG1WcCVQ&)g-6l!V|vQsPd
zic1oUN{YiXOENUn^YTklH{0{^GH$Nr4`Sp9Nv$YxEJ{tBTqP)_P?nfenyO%{kXoFa
zSdglbst44Uo?4;@7T2`qn#?FDJbA8w(B>TiuUO^uic$-55|dLk^lg%gVv4n5^zH5R
l(=&Ax)MN70H773;b7ujYtShTAd7mQxWC01T&CcSDd;m?SJ>>uZ

diff --git a/app/styles/forms.scss b/app/styles/forms.scss
index 96616c6ffb..1ec3ceb7d4 100644
--- a/app/styles/forms.scss
+++ b/app/styles/forms.scss
@@ -346,7 +346,7 @@ code {
   input[type=number][disabled],
   input[type=email][disabled],
   input[type=password][disabled],
-  textarea {
+  textarea[disabled] {
     color: var(--primary-text-color--faint);
     border-color: var(--primary-text-color--faint);
   }

From c91ca7edd65e26dbfeb9d35aaa74fe6d5c8bfab0 Mon Sep 17 00:00:00 2001
From: Sean King <seanking2919@protonmail.com>
Date: Sun, 9 Aug 2020 15:23:27 -0600
Subject: [PATCH 79/79] Fix toggle CSS

---
 app/styles/components/react-toggle.scss | 2 +-
 app/styles/components/theme-toggle.scss | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/styles/components/react-toggle.scss b/app/styles/components/react-toggle.scss
index 699b6e86d3..e2be2ef14b 100644
--- a/app/styles/components/react-toggle.scss
+++ b/app/styles/components/react-toggle.scss
@@ -32,7 +32,7 @@
   height: 24px;
   padding: 0;
   border-radius: 30px;
-  background-color: var(--foreground-color);
+  background-color: hsla(var(--brand-color_h), var(--brand-color_s), var(--brand-color_l), 0.35);
   transition: background-color 0.2s ease;
 }
 
diff --git a/app/styles/components/theme-toggle.scss b/app/styles/components/theme-toggle.scss
index c0cadc68f4..1f2697b89a 100644
--- a/app/styles/components/theme-toggle.scss
+++ b/app/styles/components/theme-toggle.scss
@@ -9,6 +9,10 @@
     .react-toggle {
       vertical-align: middle;
 
+      &-track {
+        background-color: var(--foreground-color);
+      }
+
       &-track-check,
       &-track-x {
         display: flex;