From 5d9df170cf7de0492f0f68519e984bc7bee7e852 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 19 Oct 2023 19:36:08 +0200
Subject: [PATCH] [Glitch] Do not display the navigation banner in the logo
container
Port 126cd7705dbeca5712da941a72661e26c189658b to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
.../ui/components/navigation_panel.jsx | 24 +++++++++----------
.../styles/components/single_column.scss | 1 +
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
index 9689f30795..601732b8bb 100644
--- a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
@@ -53,20 +53,20 @@ class NavigationPanel extends Component {
const { intl, onOpenSettings } = this.props;
const { signedIn, disabledAccountId } = this.context.identity;
+ let banner = undefined;
+
+ if(transientSingleColumn)
+ banner = (<div className='switch-to-advanced'>
+ {intl.formatMessage(messages.openedInClassicInterface)}
+ {" "}
+ <a href={`/deck${location.pathname}`} className='switch-to-advanced__toggle'>
+ {intl.formatMessage(messages.advancedInterface)}
+ </a>
+ </div>);
+
return (
<div className='navigation-panel'>
- {transientSingleColumn && (
- <div className='navigation-panel__logo'>
- <div className='switch-to-advanced'>
- {intl.formatMessage(messages.openedInClassicInterface)}
- {" "}
- <a href={`/deck${location.pathname}`} className='switch-to-advanced__toggle'>
- {intl.formatMessage(messages.advancedInterface)}
- </a>
- </div>
- <hr />
- </div>
- )}
+ {banner}
{signedIn && (
<>
diff --git a/app/javascript/flavours/glitch/styles/components/single_column.scss b/app/javascript/flavours/glitch/styles/components/single_column.scss
index 7efcf0c097..df3bcdce22 100644
--- a/app/javascript/flavours/glitch/styles/components/single_column.scss
+++ b/app/javascript/flavours/glitch/styles/components/single_column.scss
@@ -273,6 +273,7 @@
.navigation-panel__sign-in-banner,
.navigation-panel__logo,
+ .navigation-panel__banner,
.getting-started__trends {
display: none;
}