AkkomaGang/masto-fe
2
2
Fork 1
Code Issues 3 Pull requests Projects Releases Wiki Activity

Fix "Getting Started" column

Browse source
This commit is contained in:
KokaKiwi 2019-07-03 10:37:39 +02:00 committed by Haelwenn (lanodan) Monnier
parent 392f656e8e
commit 06792a7134
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/flavours/glitch/features/getting_started/index.js
View file

@ -177,12 +177,12 @@ const NAVIGATION_PANEL_BREAKPOINT = 600 + (285 * 2) + (10 * 2);
</div>,
]);
const instance_panel = (customPanelEnabled ? <div className='getting-started getting-started__panel scrollable' dangerouslySetInnerHTML={{__html: customPanel}} /> : null);
const instance_panel = (customPanelEnabled ? <div className='getting-started getting-started__panel' dangerouslySetInnerHTML={{__html: customPanel}} /> : null);
return (
<Column bindToDocument={!multiColumn} name='getting-started' icon='asterisk' heading={intl.formatMessage(messages.heading)} label={intl.formatMessage(messages.menu)} hideHeadingOnMobile>
<div className='scrollable optionally-scrollable'>
<div className='getting-started__wrapper scrollable'>
<div className='getting-started__wrapper'>
{!multiColumn && <NavigationBar account={myAccount} />}
{multiColumn && <ColumnSubheading text={intl.formatMessage(messages.navigation_subheading)} />}
{navItems}

9
app/javascript/flavours/glitch/features/ui/components/link_footer.js
View file

@ -1,14 +1,9 @@
import { connect } from 'react-redux';
import React from 'react';
import PropTypes from 'prop-types';
import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
import { FormattedMessage, injectIntl } from 'react-intl';
import { Link } from 'react-router-dom';
const messages = defineMessages({
logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
});
export default @injectIntl
@connect(null, mapDispatchToProps)
class LinkFooter extends React.PureComponent {
@ -19,7 +14,7 @@ class LinkFooter extends React.PureComponent {
render () {
return (
<div className='getting-started__footer scrollable'>
<div className='getting-started__footer'>
<p>
<FormattedMessage
id='getting_started.mastofe_notice'