mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2025-01-04 07:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/main' into develop

Browse source
This commit is contained in:
Jeremy Kescher 2022-08-30 17:42:17 +02:00
commit 2759512a2a
No known key found for this signature in database
GPG key ID: 48DFE4BB15BA5940
2 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/javascript/flavours/glitch/features/local_settings/navigation/index.js
View file

@ -61,34 +61,27 @@ class LocalSettingsNavigation extends React.PureComponent {
active={index === 3}
index={3}
onNavigate={onNavigate}
icon='filter'
title={intl.formatMessage(messages.filters)}
icon='angle-double-up'
title={intl.formatMessage(messages.collapsed)}
/>
<LocalSettingsNavigationItem
active={index === 4}
index={4}
onNavigate={onNavigate}
icon='angle-double-up'
title={intl.formatMessage(messages.collapsed)}
/>
<LocalSettingsNavigationItem
active={index === 5}
index={5}
onNavigate={onNavigate}
icon='image'
title={intl.formatMessage(messages.media)}
/>
<LocalSettingsNavigationItem
active={index === 6}
active={index === 5}
href={ preferencesLink }
index={6}
index={5}
icon='cog'
title={intl.formatMessage(messages.preferences)}
/>
<LocalSettingsNavigationItem
active={index === 7}
active={index === 6}
className='close'
index={7}
index={6}
onNavigate={onClose}
icon='times'
title={intl.formatMessage(messages.close)}

2
app/javascript/flavours/glitch/util/icons.js
View file

@ -1,3 +1,5 @@
import React from 'react';
// Copied from emoji-mart for consistency with emoji picker and since
// they don't export the icons in the package
export const loupeIcon = (