From 2d3784eb889ac3979ddde3b05400fd00b07b5d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Thu, 6 Jan 2022 17:45:10 +0100 Subject: [PATCH] =?UTF-8?q?Minor=20changes,=20port=20'Generalize=20?= =?UTF-8?q?=E2=80=9Cpress=20back=20to=20close=20modal=E2=80=9D=20to=20any?= =?UTF-8?q?=20modal=20and=20to=20public=20pages'=20from=20Mastodon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- app/soapbox/components/modal_root.js | Bin 4835 -> 5870 bytes .../components/status_reply_mentions.js | Bin 3300 -> 3283 bytes app/soapbox/containers/soapbox.js | Bin 6780 -> 6746 bytes .../components/status_interaction_bar.js | Bin 5475 -> 5610 bytes .../features/ui/components/media_modal.js | Bin 9575 -> 9023 bytes .../features/ui/components/video_modal.js | Bin 2131 -> 1520 bytes app/styles/components/emoji-reacts.scss | 4 ++++ app/styles/components/reply-mentions.scss | 4 ++++ package.json | 1 + yarn.lock | 2 +- 10 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/soapbox/components/modal_root.js b/app/soapbox/components/modal_root.js index a8e8fe746005de203b1038e30c6c51268f6075cc..1ee69a7de3a57b531f54d3126fa2731fe647da74 100644 GIT binary patch delta 1008 zcmb7CJxc>I7)JaUM62Q^DsMq;3Yu9er_wqoBCX(}pc2oVEnbr&$)Tl|g5WOPzi^YT z{u>837iYm-a;L3U(A$zc?>%4d^Wy8u{qce;C{eU1_?4t$yCxME4QPQUcpY+8dw$%1 z8=3*&tVEbg{Q^`34-OgumDmfJ+u0m`A2|Y08jh0@aO~0LOwntF1rHS!u+i`KbEW|O z)Szf}>}75g%x5@GtAw5VbdR4CzZ_78Ipal-!gJr zqx#To+2)mcj)fS4Za;0kB`F{&zWZ6frd*auuYpw11gUgVdcBhE_{@U4B#ywQ7c*Mm z(vqFPl9S+!Uz^6`$PeR8`nK^+RmyO|i^RR`7G-V!*nwzja=IN5Rb`}3m;Wv}YZc$z p{GvGf55Z-f9}YrUMPEXifH5{4T2yZuh5ku^tyh=bIhnW{`~V{WPYeJ6 delta 37 vcmV+=0NVfVE#oDSU9pYl1hbL_`395f4C1rw4Iu%OE)Rc`(GRDyaT9$5Tn7-` diff --git a/app/soapbox/components/status_reply_mentions.js b/app/soapbox/components/status_reply_mentions.js index 1bb43562d42e32bf0775e2e613fc8b73c8750e31..7dd68e942e4a409ce23ef54f419ea52bacc06cb9 100644 GIT binary patch delta 65 zcmaDNd0BG98g8}Xg2X(9lFEWqTlJ*Ul9K#9b%mn*93ZctD782>uOzV~6DT(M8n-&5 R-DEzVi7X%ulNa!~002137yJMK delta 82 ycmcaC`9yNV8g8vbE(J7@QIwiytFEk$E;0EMx4IyjpdHubU)&QJ6DRlcxBvj}vJu(< diff --git a/app/soapbox/containers/soapbox.js b/app/soapbox/containers/soapbox.js index a4e48c5871325827e2c426d6dc7b747e5ccd2030..9eb9640e6077708f5546c9aedda5313e070a963e 100644 GIT binary patch delta 165 zcmexka?51HG}g^uS+s9gD{AEACnuI<=I7}Zmn4>? z+UphPCl(~-SNP_qB<6UhRw}5eDG*YkXltv0X1Ki`OcT&VtOjdZb15inp2`213jj{d BJz4+& delta 197 zcmca*^2cPuG}f5p{Ji24g@U5gvdq+S-_(@M#Nd*|l2ip-1$AUW-~5!s9Cd3h6y;%= zDXIDB%E5vV<(nt7T5>YRPrl73>ywk8oLG{XpQl$0HeS)z7K^27Y6`g3A#9ucP*P%Z IH~)Dq0F~@W?EnA( diff --git a/app/soapbox/features/status/components/status_interaction_bar.js b/app/soapbox/features/status/components/status_interaction_bar.js index e7f2b0f058aaf5a7e57fa8d64228b794eff85ad4..16648a5323bd4a78d8890e0307134b61bfb3f8c2 100644 GIT binary patch delta 224 zcmaE?^-6og4Gz}gg2X(o$?tjeCQEY)>y%U$q}r+{m6nv`=c#ikz(G-d4p6+HD782> zuOzV~6C^wNf{@B&56<^2AR{(gaLr=^vnIdc@zld*j)DSKlg#Za!)$9AP#EE6Ge# z&?w2sEY^b>pa;>T2{l0hWH8VrKouqVMU@J+lh1O=)LV0b^(w%G^$JRhGc=%T^m6i( z6H7Al^YjW5OEU5jb5nItJfaEL4Ys#5F9&FLYMuwo2DqURaSaVk1zS6~a}*RxGA8fk zkzi3!sMVaT!yz$w35UNYabCe@p9aD?prDw1j!Q-r?tx-Rz}woQdI0R0$tSp!#MASg W5|gt*W`Kel=p-;*yZIA`uM`02DU~n) diff --git a/app/soapbox/features/ui/components/video_modal.js b/app/soapbox/features/ui/components/video_modal.js index 20bedb48a99ace5a27d1988a33b091b7deaed978..086d843b917e3577ffed7e6a24e4f43b27a9f5f2 100644 GIT binary patch delta 17 ZcmcaC@PT`SGUMh@Mp4Givsrd90{}W>1>XPw delta 600 zcmaixJx;_h5QVi%w=`5x&=?^>R$95D0)+x7XjVevuMUnOhQwpV6CgsX9D<7=ZObia zIRr;wY@9&QB2rixJM`ZhxhEC+p)$Y*QHO8 CEW&~S diff --git a/app/styles/components/emoji-reacts.scss b/app/styles/components/emoji-reacts.scss index 9af8b33ca3..353ab043ea 100644 --- a/app/styles/components/emoji-reacts.scss +++ b/app/styles/components/emoji-reacts.scss @@ -19,6 +19,10 @@ + .emoji-react { margin-right: -8px; } + + &[type='button'] { + cursor: pointer; + } } .emoji-react--reblogs, diff --git a/app/styles/components/reply-mentions.scss b/app/styles/components/reply-mentions.scss index 4448520263..9eebb19d0e 100644 --- a/app/styles/components/reply-mentions.scss +++ b/app/styles/components/reply-mentions.scss @@ -20,5 +20,9 @@ .reply-mentions { display: block; margin: 4px 0 0 0; + + span { + cursor: pointer; + } } } diff --git a/package.json b/package.json index 3c3ce850d2..cfc61ef3b6 100644 --- a/package.json +++ b/package.json @@ -85,6 +85,7 @@ "escape-html": "^1.0.3", "exif-js": "^2.3.0", "feather-icons": "^4.28.0", + "history": "^4.10.1", "html-webpack-harddisk-plugin": "^2.0.0", "html-webpack-plugin": "^5.3.2", "http-link-header": "^1.0.2", diff --git a/yarn.lock b/yarn.lock index d867807f62..c9338896cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4588,7 +4588,7 @@ hex-color-regex@^1.1.0: resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== -history@^4.7.2: +history@^4.10.1, history@^4.7.2: version "4.10.1" resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3" integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==