fef/nyastodon
1
1
Fork 0
forked from mirrors/catstodon
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/main'

Browse source 
# Conflicts:
#	app/javascript/flavours/glitch/features/ui/components/link_footer.js
#	app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js
This commit is contained in:
Jeremy Kescher 2022-11-01 10:23:35 +01:00
commit 22427cd43c
No known key found for this signature in database
GPG key ID: 48DFE4BB15BA5940
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/flavours/glitch/features/ui/components/navigation_panel.js
View file

@ -86,7 +86,7 @@ class NavigationPanel extends React.Component {
<hr />
{!!preferencesLink && <ColumnLink transparent href={preferencesLink} icon='cog' text={intl.formatMessage(messages.preferences)} />}
<ColumnLink transparent href='#' onClick={onOpenSettings} icon='cogs' text={intl.formatMessage(messages.app_settings)} />
<ColumnLink transparent onClick={onOpenSettings} icon='cogs' text={intl.formatMessage(messages.app_settings)} />
</React.Fragment>
)}

2
app/javascript/flavours/glitch/styles/components/status.scss
View file

@ -134,7 +134,7 @@
}
ul, ol {
margin-left: 1em;
margin-left: 2em;
p {
margin: 0;