From 9b666115408b1c81dc958b25573c8ff1f2f35ad3 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 28 Jul 2020 10:50:51 -0500 Subject: [PATCH 1/8] 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$#+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 Date: Tue, 28 Jul 2020 10:52:29 -0500 Subject: [PATCH 2/8] 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}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;sLaYNoHB9x~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 Date: Tue, 28 Jul 2020 10:57:20 -0500 Subject: [PATCH 3/8] 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 Date: Tue, 28 Jul 2020 12:23:15 -0500 Subject: [PATCH 4/8] 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|0KckVwiXpskz(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`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>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 Date: Tue, 28 Jul 2020 13:24:31 -0500 Subject: [PATCH 5/8] 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`kOc8iB(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-;=(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{ Date: Tue, 28 Jul 2020 13:36:10 -0500 Subject: [PATCH 6/8] 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@bFXGYwg0nmiktUZE@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 delta 16 Ycmdm+z9)UdM~TUwCG Date: Tue, 28 Jul 2020 13:53:01 -0500 Subject: [PATCH 7/8] 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$|IWRv Date: Tue, 28 Jul 2020 14:13:29 -0500 Subject: [PATCH 8/8] 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{&B3}ym&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*2ly$&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;