From ae5e4c05f66acf9659a4263476863c917d4f7c74 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 30 Nov 2022 21:45:31 -0600 Subject: [PATCH 1/4] ColumnHeader: remove `transparent` prop, pass className from Column instead --- app/soapbox/components/ui/column/column.tsx | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/soapbox/components/ui/column/column.tsx b/app/soapbox/components/ui/column/column.tsx index 62aede9b2..f25990c2f 100644 --- a/app/soapbox/components/ui/column/column.tsx +++ b/app/soapbox/components/ui/column/column.tsx @@ -7,10 +7,10 @@ import { useSoapboxConfig } from 'soapbox/hooks'; import { Card, CardBody, CardHeader, CardTitle } from '../card/card'; -type IColumnHeader = Pick; +type IColumnHeader = Pick; /** Contains the column title with optional back button. */ -const ColumnHeader: React.FC = ({ label, backHref, transparent }) => { +const ColumnHeader: React.FC = ({ label, backHref, className }) => { const history = useHistory(); const handleBackClick = () => { @@ -27,10 +27,7 @@ const ColumnHeader: React.FC = ({ label, backHref, transparent }) }; return ( - + ); @@ -72,7 +69,11 @@ const Column: React.FC = React.forwardRef((props, ref: React.ForwardedR {withHeader && ( - + )} From 69d64c11b438fa1c2d391c8cacb246fa7eb1a0ee Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 30 Nov 2022 21:45:49 -0600 Subject: [PATCH 2/4] Fix spacing of ColumnHeader on Local/Federated timelines --- app/soapbox/features/community-timeline/index.tsx | 2 +- app/soapbox/features/public-timeline/index.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/soapbox/features/community-timeline/index.tsx b/app/soapbox/features/community-timeline/index.tsx index a49093dc6..a5c2a17fa 100644 --- a/app/soapbox/features/community-timeline/index.tsx +++ b/app/soapbox/features/community-timeline/index.tsx @@ -40,7 +40,7 @@ const CommunityTimeline = () => { }, [onlyMedia]); return ( - + { }, [onlyMedia]); return ( - + {showExplanationBox &&
From e0b41badd3e34ee024dc7a3f873000b9bbe3d2a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Thu, 1 Dec 2022 13:17:46 +0000 Subject: [PATCH 3/4] Use monospace font for code, pre --- app/soapbox/components/markup.css | 3 ++- app/styles/forms.scss | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/soapbox/components/markup.css b/app/soapbox/components/markup.css index c10d4084d..09669fbd7 100644 --- a/app/soapbox/components/markup.css +++ b/app/soapbox/components/markup.css @@ -35,7 +35,8 @@ @apply py-1 pl-4 mb-4 border-l-4 border-solid border-gray-400 text-gray-500 dark:text-gray-400; } -[data-markup] code { +[data-markup] code, +[data-markup] pre { @apply cursor-text font-mono; } diff --git a/app/styles/forms.scss b/app/styles/forms.scss index fc4b6a257..a23bfcfad 100644 --- a/app/styles/forms.scss +++ b/app/styles/forms.scss @@ -24,11 +24,6 @@ select { $no-columns-breakpoint: 600px; -code { - font-family: var(--font-monospace), monospace; - font-weight: 400; -} - .form-container { max-width: 400px; padding: 20px; From 91752685d368cff73f627f15daab0a79404d6500 Mon Sep 17 00:00:00 2001 From: Mohamed H <933509-Kentoseth@users.noreply.gitlab.com> Date: Fri, 2 Dec 2022 00:33:54 +0000 Subject: [PATCH 4/4] These instructions are outdated with a 1.3.0 install. There is a bug in the current static dir that prevents the soapbox frontend from displaying, hence step 3. --- docs/administration/install-yunohost.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/docs/administration/install-yunohost.md b/docs/administration/install-yunohost.md index af99231b4..156547d9e 100644 --- a/docs/administration/install-yunohost.md +++ b/docs/administration/install-yunohost.md @@ -7,7 +7,7 @@ If you want to install Soapbox to a Pleroma instance installed using [YunoHost]( First, download the latest build of Soapbox from GitLab. ```sh -curl -L https://gitlab.com/soapbox-pub/soapbox/-/jobs/artifacts/v1.3.0/download?job=build-production -o soapbox-fe.zip +curl -L https://gitlab.com/soapbox-pub/soapbox/-/jobs/artifacts/develop/download?job=build-production -o soapbox-fe.zip ``` ## 2. Unzip the build @@ -18,6 +18,18 @@ Then, unzip the build to the Pleroma directory under YunoHost's directory: busybox unzip soapbox-fe.zip -o -d /home/yunohost.app/pleroma/ ``` +## 3. Change YunoHost Admin Static directory + +(A bug documented in the YunoHost deployment about this issue is [here](https://github.com/YunoHost-Apps/pleroma_ynh/issues/215)) + +Go to: + +> Admin Panel > Settings > Instance + +Look for the "Static dir" entry and set it to: + +> /home/yunohost.app/pleroma/static + **That's it! 🎉 Soapbox is installed.** The change will take effect immediately, just refresh your browser tab. It's not necessary to restart the Pleroma service. ---