From c879f82b48ba8c40e2351eff07c840c0f0826621 Mon Sep 17 00:00:00 2001 From: Justin Date: Tue, 10 May 2022 15:50:35 -0400 Subject: [PATCH 1/4] Remove beta page --- app/soapbox/actions/beta.js | Bin 758 -> 0 bytes app/soapbox/containers/soapbox.tsx | 1 - app/soapbox/features/beta/index.js | Bin 3072 -> 0 bytes app/soapbox/features/public_layout/index.js | Bin 2174 -> 2067 bytes .../normalizers/soapbox/soapbox_config.ts | 1 - app/styles/about.scss | 152 ------------------ 6 files changed, 154 deletions(-) delete mode 100644 app/soapbox/actions/beta.js delete mode 100644 app/soapbox/features/beta/index.js diff --git a/app/soapbox/actions/beta.js b/app/soapbox/actions/beta.js deleted file mode 100644 index 21f4013b4cdc61ba0b48f3d03aa79539e408a3c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 758 zcmb7BO>crQ7{2o>o`VUH5V&jHq6D`kJGh}|>99x>Xi2G=3+aDfE3&yo_ray1&)etg zWpyK@LWfon#qzjflq+ZyQq*w6Fd_|eCyql8$GKeaR$-B>;`_}!S3@7L}hQ;jR5$3z#!9r&liapO26C4Fqc{!(wEXj^~ZMEOo z*NkuJ!3|J}oK)0D=Kzwbz2xw=tZj&S6ktbHY8o^6^yWAM44~IRy)|@vt)>80Y7l_- zCq@D2t1VbXIjN~}l8rh$s7GCI1-Hn;;YVi}!*z97s=CU0hLg+lO@_v&mqpBMjqsdC zFD7j?>IM~^`JpN)_l)N)QDh8DXDofD`a`bMhQ8(s2CClMM~7CRztVn~+cG^WrI7zp av>W{{*Ru?50;-ha7025_&z^eXXy+YaO6!^c diff --git a/app/soapbox/containers/soapbox.tsx b/app/soapbox/containers/soapbox.tsx index a3aa26a6ab..10e9d5559d 100644 --- a/app/soapbox/containers/soapbox.tsx +++ b/app/soapbox/containers/soapbox.tsx @@ -183,7 +183,6 @@ const SoapboxMount = () => { {!me && } - {(features.accountCreation && instance.registrations) && ( diff --git a/app/soapbox/features/beta/index.js b/app/soapbox/features/beta/index.js deleted file mode 100644 index aaba33fc56313766b7bdf5f56fc9db03e38f8396..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3072 zcmbVO+iu%N5PjEIOb{R>0f}sZJjtS))`ktIEgnjjKzaKQaYxvdB^NSWAN-k&E zmGF>NhnQ96L6egag#3$F`lHm%5`Jy_J=2=kms}}!&*2bVl>ETbNrf6oY-@I`}hF7J1WGh?qEgKr0WPk`l#sybNmJ3-mL(Nrc z6LE3880l8qrMFBUT-+x|H%V^$%1?-rt8yv?R-v02`IQ_}^`KN%%X7}Scbpgm0cT+padQ;$| z1fzQv^l3Te$I?+Bx~o5>CXXv!eA;L2+!2a~fzvXj=ej7@oi zsriB%iej0`quS7qrzii48sFs>5Ye*$OkWYvp!IW0fQFdXfhopwfXoE7|J^9O&|-Lm z)VvSf=&Sf$yYGc^7!KAUZJh7fY;IjSxu)GlevTGe+3-9CdeFDU*qhkn04B z$?2Fta+pF4&GZT*HX{Cs4;bw5%rBGI3AFN}5!Kgn^qa>DmCj_#4s!>vr->FVT6WaeR zcWZo_G{uM#w=k2j3wOlkBwccFoH9V>hl^fMa&3yKjGF@6%?gJr-Gu469(oxRpnjZ` zrC$-58n1o4ZwJ+UyXJTqmc0LPbNQ(pN4UMELv!sm6D<*3X6{yVn8?JvHX98OnKLve S9-ce=(OmOgi-arM+2U{Sb+?=V diff --git a/app/soapbox/features/public_layout/index.js b/app/soapbox/features/public_layout/index.js index 30c206838c9aa872fd36267dcbb02b201149851c..99d7f48e3f84251a343c4672e1a3025eb6dee5bb 100644 GIT binary patch delta 17 Ycmew-Fj-(jB-7?frY+2yE7;hW06uC3+W-In delta 73 zcmbO%@K0bvB$Jp^YDr>1VtT4VT2X$kg1VlbeiBe*vp>^5W*HDm->NvLG~HfZAvr&{ XAU`iPuf(<*q-XL(R{hPqY-~&bo{Jb_ diff --git a/app/soapbox/normalizers/soapbox/soapbox_config.ts b/app/soapbox/normalizers/soapbox/soapbox_config.ts index cab8dc44c5..f1fed529ba 100644 --- a/app/soapbox/normalizers/soapbox/soapbox_config.ts +++ b/app/soapbox/normalizers/soapbox/soapbox_config.ts @@ -110,7 +110,6 @@ export const SoapboxConfigRecord = ImmutableRecord({ limit: 1, }), aboutPages: ImmutableMap(), - betaPages: ImmutableMap(), mobilePages: ImmutableMap(), authenticatedProfile: true, singleUserMode: false, diff --git a/app/styles/about.scss b/app/styles/about.scss index b1041d7d4d..5e2753feb4 100644 --- a/app/styles/about.scss +++ b/app/styles/about.scss @@ -234,158 +234,6 @@ $fluid-breakpoint: $maximum-width + 20px; } } - .beta-page { - .app-cta { - display: flex; - align-items: center; - margin: 40px auto; - - @media screen and (max-width: 768px) { - flex-direction: column; - } - - .copy { - flex: 2; - background: white; - border: 1px solid #eee; - padding: 80px; - border-radius: 10px; - - @media screen and (max-width: 768px) { - padding: 60px 20px 20px 20px; - order: 1; - text-align: center; - } - } - - .icon { - border-radius: 10px; - transform: scale(1.25); - display: flex; - align-items: center; - justify-content: center; - flex: 1; - padding: 40px; - background: linear-gradient(to bottom, $color-4-light, $color-4); - box-shadow: 0 0 20px 10px rgba(0, 0, 0, 0.1); - - @media screen and (max-width: 768px) { - order: 0; - transform: scale(0.75); - margin-bottom: -60px; - } - - img { - border-radius: 16px; - box-shadow: 0 0 20px 10px rgba(0, 0, 0, 0.1); - } - } - - h1 { - margin: 0 0 20px 0; - font-size: 80px; - line-height: 90px; - font-weight: 600; - background: -webkit-linear-gradient(135deg, $color-9, $color-4-light, $color-2-light); - -webkit-background-clip: text; - -webkit-text-fill-color: transparent; - - @media screen and (max-width: 767px) { - margin-bottom: 30px; - text-align: center; - font-size: 50px; - line-height: 55px; - } - } - } - } - - .beta-header { - width: 100%; - display: flex; - flex-direction: column; - align-items: center; - - .hand-wave { - display: flex; - align-items: center; - justify-content: center; - width: 200px; - height: 200px; - background: white; - border-radius: 50%; - margin-bottom: 20px; - - @media screen and (max-width: $fluid-breakpoint) { - width: 120px; - height: 120px; - } - - img { - animation: 1s ease-in wave; - max-width: 140px; - - @media screen and (max-width: $fluid-breakpoint) { - width: 80px; - height: 80px; - } - } - } - - .message { - margin: 40px 0; - padding: 20px; - width: 100%; - background: lighten($color-4-light, 30%); - border-radius: 10px; - - p { - color: $color-4; - text-align: center; - font-size: 20px; - font-weight: 500; - } - - span { - font-style: italic; - font-weight: 600; - } - } - - .group { - display: flex; - align-items: center; - - @media screen and (max-width: $fluid-breakpoint) { - display: block; - } - - .logo { - padding: 0 40px; - border-right: 10px solid transparentize($color-3, 0.9); - - @media screen and (max-width: $fluid-breakpoint) { - border-right: none; - } - } - - .text { - padding: 0 40px; - font-weight: 600; - font-size: 80px; - font-style: italic; - color: $color-4-dark; - - @media screen and (max-width: $fluid-breakpoint) { - padding: 0; - font-weight: 600; - font-size: 40px; - text-align: center; - } - } - } - } - .faq { margin-bottom: 80px; From 23e20568e1e36e4e7b4a36180fcb99dcd23a190e Mon Sep 17 00:00:00 2001 From: Justin Date: Tue, 10 May 2022 15:51:36 -0400 Subject: [PATCH 2/4] Add Dark Mode support to landing page header --- .../features/public_layout/components/header.tsx | 11 ++++++++--- .../features/public_layout/components/sonar.tsx | 8 ++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/soapbox/features/public_layout/components/header.tsx b/app/soapbox/features/public_layout/components/header.tsx index 79253194e3..03b33b0c4b 100644 --- a/app/soapbox/features/public_layout/components/header.tsx +++ b/app/soapbox/features/public_layout/components/header.tsx @@ -1,3 +1,4 @@ +import classNames from 'classnames'; import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; import { useDispatch } from 'react-redux'; @@ -27,10 +28,10 @@ const Header = () => { const dispatch = useDispatch(); const intl = useIntl(); - const { logo } = useSoapboxConfig(); + const { logo, logoDarkMode } = useSoapboxConfig(); const features = useFeatures(); const instance = useAppSelector((state) => state.instance); - const isOpen = instance.get('registrations', false) === true; + const isOpen = instance.get('registrations', false) === true; const pepeOpen = useAppSelector(state => state.verification.getIn(['instance', 'registrations'], false) === true); const [isLoading, setLoading] = React.useState(false); @@ -76,7 +77,11 @@ const Header = () => { - Logo + Logo + {logoDarkMode && ( + Logo + )} + {intl.formatMessage(messages.home)} diff --git a/app/soapbox/features/public_layout/components/sonar.tsx b/app/soapbox/features/public_layout/components/sonar.tsx index f6a8ce21e9..10ae9f2934 100644 --- a/app/soapbox/features/public_layout/components/sonar.tsx +++ b/app/soapbox/features/public_layout/components/sonar.tsx @@ -3,10 +3,10 @@ import React from 'react'; const Sonar = () => (
-
-
-
-
+
+
+
+
From 3e2058a4b10a7087b41de01c0dab43a8457736c8 Mon Sep 17 00:00:00 2001 From: Justin Date: Tue, 10 May 2022 15:51:58 -0400 Subject: [PATCH 3/4] Add custom HTML to Tailwind Purge config --- tailwind.config.js | Bin 2254 -> 2285 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tailwind.config.js b/tailwind.config.js index 0aa665e2e89377dd3456d75e0a202c9db6b190f3..7ac10feee9b991e78314d37e30a381acd1e7ddef 100644 GIT binary patch delta 41 wcmX>n_*QU2g`AFpx}JV=X>mz@u6|}-aY Date: Tue, 10 May 2022 15:52:12 -0400 Subject: [PATCH 4/4] Add dark mode support to landing page --- app/soapbox/components/landing-gradient.tsx | 2 +- .../components/ui/checkbox/checkbox.tsx | 2 +- app/soapbox/features/landing_page/index.tsx | 3 ++- app/soapbox/features/public_layout/index.js | Bin 2067 -> 1984 bytes 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/soapbox/components/landing-gradient.tsx b/app/soapbox/components/landing-gradient.tsx index 53e500d285..28be27373f 100644 --- a/app/soapbox/components/landing-gradient.tsx +++ b/app/soapbox/components/landing-gradient.tsx @@ -2,7 +2,7 @@ import React from 'react'; /** Fullscreen gradient used as a backdrop to public pages. */ const LandingGradient: React.FC = () => ( -
+
); export default LandingGradient; diff --git a/app/soapbox/components/ui/checkbox/checkbox.tsx b/app/soapbox/components/ui/checkbox/checkbox.tsx index dc7a4e3700..3199d4a337 100644 --- a/app/soapbox/components/ui/checkbox/checkbox.tsx +++ b/app/soapbox/components/ui/checkbox/checkbox.tsx @@ -9,7 +9,7 @@ const Checkbox = React.forwardRef((props, ref) => { {...props} ref={ref} type='checkbox' - className='focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded' + className='dark:bg-slate-800 dark:border-gray-600 focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded' /> ); }); diff --git a/app/soapbox/features/landing_page/index.tsx b/app/soapbox/features/landing_page/index.tsx index 4d408666d9..586f198e23 100644 --- a/app/soapbox/features/landing_page/index.tsx +++ b/app/soapbox/features/landing_page/index.tsx @@ -68,13 +68,14 @@ const LandingPage = () => { return (
-
+

{instance.title}

+ {instance.description} diff --git a/app/soapbox/features/public_layout/index.js b/app/soapbox/features/public_layout/index.js index 99d7f48e3f84251a343c4672e1a3025eb6dee5bb..a7cb641eb4b87f6ba07cfb9d175ebdcb19d8f903 100644 GIT binary patch delta 56 zcmbO%aDacqe-`ed)SSeU%(7H23u!>BsWz_}J-e5K_oB3onHnGV&*?BkD Iu}x(J051U&djJ3c delta 93 zcmX@WKUrYIe-_Dt(xjZsWZj&^%KXxj`1q3i0(Cns1t6HbkVT3wIX|x?F*7f<2rM|6 mi&cHHKC3eji%o80H3!odfixSN1iONQjebgI*=7N@4U7Puvm65e