From 6f4aeac0ba0f52c1f61c4f338ad3454e3498c81c Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Jun 2021 11:35:27 -0500 Subject: [PATCH 1/5] Upgrade ForkAwesome to latest git commit on master --- package.json | 2 +- yarn.lock | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b1ddba8d01..81b255c42c 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "file-loader": "^6.0.0", "fontsource-montserrat": "^3.0.9", "fontsource-roboto": "^3.0.3", - "fork-awesome": "^1.1.7", + "fork-awesome": "https://github.com/ForkAwesome/Fork-Awesome#964d92e199856be623ccf4c31ffd27603ecb2944", "html-webpack-harddisk-plugin": "^1.0.1", "html-webpack-plugin": "^4.3.0", "http-link-header": "^1.0.2", diff --git a/yarn.lock b/yarn.lock index f993be66e5..f5642708af 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5480,10 +5480,9 @@ forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= -fork-awesome@^1.1.7: - version "1.1.7" - resolved "https://registry.yarnpkg.com/fork-awesome/-/fork-awesome-1.1.7.tgz#1427da1cac3d1713046ee88427e5fcecb9501d21" - integrity sha512-IHI7XCSXrKfUIWslse8c/PaaVDT1oBaYge+ju40ihL2ooiQeBpTr4wvIXhgTd2NuhntlvX+M5jYHAPTzNlmv0g== +"fork-awesome@https://github.com/ForkAwesome/Fork-Awesome#964d92e199856be623ccf4c31ffd27603ecb2944": + version "1.2.0" + resolved "https://github.com/ForkAwesome/Fork-Awesome#964d92e199856be623ccf4c31ffd27603ecb2944" form-data@~2.3.2: version "2.3.3" From e74ee136ee6126127463216a8b4aab7dbae03c56 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Jun 2021 11:35:53 -0500 Subject: [PATCH 2/5] Subscriptions: use ringing bell for subscribed --- .../ui/components/subscription_button.js | Bin 2158 -> 2161 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/ui/components/subscription_button.js b/app/soapbox/features/ui/components/subscription_button.js index 31a02a61d6b0efe9074a753f3d09e72dd4f37a5e..fccc3fce4f0b3866b1124266bd5f8d4066f4bb9b 100644 GIT binary patch delta 31 lcmaDS@KIpHcXmPDqRhN>AW~PbQczDy&B>X}#*x9u1pvZr3RM6A delta 27 icmew;@J?XEcXobt1uF&hq|}@o-Qt|Y;*7~092o$QkO_AH From dd9b876f9c2d5d8da9533b7c1a57e7113caac985 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Jun 2021 11:38:06 -0500 Subject: [PATCH 3/5] Subscriptions: hide bell when screen is too narrow --- app/styles/components/account-header.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/styles/components/account-header.scss b/app/styles/components/account-header.scss index 02a09f6414..ec0b6f2e4a 100644 --- a/app/styles/components/account-header.scss +++ b/app/styles/components/account-header.scss @@ -168,6 +168,10 @@ background: $error-red; color: #fff; } + + @media (max-width: 430px) { + display: none; + } } .button-active { From fd0380bc8286c1805965311d4e9115259c57995d Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Jun 2021 11:52:12 -0500 Subject: [PATCH 4/5] Subscriptions: add subscription option to account dropdown --- .../features/account/components/header.js | Bin 15992 -> 16586 bytes .../account_timeline/components/header.js | Bin 3740 -> 3902 bytes .../containers/header_container.js | Bin 6411 -> 6679 bytes .../ui/components/subscription_button.js | Bin 2161 -> 2190 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/account/components/header.js b/app/soapbox/features/account/components/header.js index 242ac231144b1a63220a2b8c90bf7583937d3862..fa9708bdbde6844ea58d55e9d378425acdce7777 100644 GIT binary patch delta 267 zcmexSbE=VX0}sE7fTt^LbXC>ij{(TVsdhRX@@s J8>PQ10RT8&W6b~n delta 22 ecmX@r$oQjX0}ub^JN%P*Cht<$+bl1)S_uGi>CLiGB-YmzK$fk{~JS0Co fJtx(+x+EjBST7?nFC`}xS$c8+ugKy#`4av+)SC7@yRHz0T0s<+S#RZ8a$r&0*CQf$XR-BwJD8UK010=F} IKfezr095%ikN^Mx delta 17 YcmbPk(rvUsjd61z<6^$eR|T9n0XZ}U`2YX_ diff --git a/app/soapbox/features/ui/components/subscription_button.js b/app/soapbox/features/ui/components/subscription_button.js index fccc3fce4f0b3866b1124266bd5f8d4066f4bb9b..053ed0f52d93a91df17306e500b466be6c7b0e23 100644 GIT binary patch delta 73 zcmew;&?mUThDjtSpOlMgEXnPQj From cffe1b7ff5f04779ca441d7c065161ef59f31c2f Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Jun 2021 12:11:53 -0500 Subject: [PATCH 5/5] Switch to my build of ForkAwesome with fixed bell-ringing icons --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 81b255c42c..8f64a14754 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "file-loader": "^6.0.0", "fontsource-montserrat": "^3.0.9", "fontsource-roboto": "^3.0.3", - "fork-awesome": "https://github.com/ForkAwesome/Fork-Awesome#964d92e199856be623ccf4c31ffd27603ecb2944", + "fork-awesome": "https://github.com/alexgleason/Fork-Awesome#c23fd34246a9f33c4bf24ea095a4cf26e7abe265", "html-webpack-harddisk-plugin": "^1.0.1", "html-webpack-plugin": "^4.3.0", "http-link-header": "^1.0.2", diff --git a/yarn.lock b/yarn.lock index f5642708af..60526857c0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5480,9 +5480,9 @@ forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= -"fork-awesome@https://github.com/ForkAwesome/Fork-Awesome#964d92e199856be623ccf4c31ffd27603ecb2944": +"fork-awesome@https://github.com/alexgleason/Fork-Awesome#c23fd34246a9f33c4bf24ea095a4cf26e7abe265": version "1.2.0" - resolved "https://github.com/ForkAwesome/Fork-Awesome#964d92e199856be623ccf4c31ffd27603ecb2944" + resolved "https://github.com/alexgleason/Fork-Awesome#c23fd34246a9f33c4bf24ea095a4cf26e7abe265" form-data@~2.3.2: version "2.3.3"