From 126cd7705dbeca5712da941a72661e26c189658b Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 19 Oct 2023 19:36:08 +0200
Subject: [PATCH] Do not display the navigation banner in the logo container
(#27476)
---
.../ui/components/navigation_panel.jsx | 30 +++++++++++--------
.../styles/mastodon/components.scss | 1 +
2 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
index 22eee79c0..b16eb5e17 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
@@ -53,24 +53,30 @@ class NavigationPanel extends Component {
const { intl } = 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'>
<div className='navigation-panel__logo'>
<Link to='/' className='column-link column-link--logo'><WordmarkLogo /></Link>
-
- {transientSingleColumn ? (
- <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 />
- )}
+ {!banner && <hr />}
</div>
+ {banner &&
+ <div class='navigation-panel__banner'>
+ {banner}
+ </div>
+ }
+
{signedIn && (
<>
<ColumnLink transparent to='/home' icon='home' text={intl.formatMessage(messages.home)} />
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index f0380de5b..993343b43 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2467,6 +2467,7 @@ $ui-header-height: 55px;
.navigation-panel__sign-in-banner,
.navigation-panel__logo,
+ .navigation-panel__banner,
.getting-started__trends {
display: none;
}