monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2447 from ClearlyClaire/glitch-soc/merge-upstream 

Merge upstream changes up to 126cd7705d
This commit is contained in:
Claire 2023-10-21 14:32:30 +02:00 committed by GitHub
parent 1c53aec00e 5d9df170cf
commit 18eacc7a07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
View File

@ -53,20 +53,20 @@ class NavigationPanel extends Component {
const { intl, onOpenSettings } = this.props; const { intl, onOpenSettings } = this.props;
const { signedIn, disabledAccountId } = this.context.identity; const { signedIn, disabledAccountId } = this.context.identity;
return ( let banner = undefined;
<div className='navigation-panel'>
{transientSingleColumn && ( if(transientSingleColumn)
<div className='navigation-panel__logo'> banner = (<div className='switch-to-advanced'>
<div className='switch-to-advanced'>
{intl.formatMessage(messages.openedInClassicInterface)} {intl.formatMessage(messages.openedInClassicInterface)}
{" "} {" "}
<a href={`/deck${location.pathname}`} className='switch-to-advanced__toggle'> <a href={`/deck${location.pathname}`} className='switch-to-advanced__toggle'>
{intl.formatMessage(messages.advancedInterface)} {intl.formatMessage(messages.advancedInterface)}
</a> </a>
</div> </div>);
<hr />
</div> return (
)} <div className='navigation-panel'>
{banner}
{signedIn && ( {signedIn && (
<> <>

1
app/javascript/flavours/glitch/styles/components/single_column.scss
View File

@ -273,6 +273,7 @@
.navigation-panel__sign-in-banner, .navigation-panel__sign-in-banner,
.navigation-panel__logo, .navigation-panel__logo,
.navigation-panel__banner,
.getting-started__trends { .getting-started__trends {
display: none; display: none;
} }

24
app/javascript/mastodon/features/ui/components/navigation_panel.jsx
View File

@ -53,23 +53,29 @@ class NavigationPanel extends Component {
const { intl } = this.props; const { intl } = this.props;
const { signedIn, disabledAccountId } = this.context.identity; const { signedIn, disabledAccountId } = this.context.identity;
return ( let banner = undefined;
<div className='navigation-panel'>
<div className='navigation-panel__logo'>
<Link to='/' className='column-link column-link--logo'><WordmarkLogo /></Link>
{transientSingleColumn ? ( if(transientSingleColumn)
<div className='switch-to-advanced'> banner = (<div className='switch-to-advanced'>
{intl.formatMessage(messages.openedInClassicInterface)} {intl.formatMessage(messages.openedInClassicInterface)}
{" "} {" "}
<a href={`/deck${location.pathname}`} className='switch-to-advanced__toggle'> <a href={`/deck${location.pathname}`} className='switch-to-advanced__toggle'>
{intl.formatMessage(messages.advancedInterface)} {intl.formatMessage(messages.advancedInterface)}
</a> </a>
</div>);
return (
<div className='navigation-panel'>
<div className='navigation-panel__logo'>
<Link to='/' className='column-link column-link--logo'><WordmarkLogo /></Link>
{!banner && <hr />}
</div> </div>
) : (
<hr /> {banner &&
)} <div class='navigation-panel__banner'>
{banner}
</div> </div>
}
{signedIn && ( {signedIn && (
<> <>

1
app/javascript/styles/mastodon/components.scss
View File

@ -2467,6 +2467,7 @@ $ui-header-height: 55px;
.navigation-panel__sign-in-banner, .navigation-panel__sign-in-banner,
.navigation-panel__logo, .navigation-panel__logo,
.navigation-panel__banner,
.getting-started__trends { .getting-started__trends {
display: none; display: none;
} }