mirrors
/
hometown
mirror of https://github.com/hometown-fork/hometown.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing linter errors

This commit is contained in:
Darius Kazemi 2022-12-30 03:15:27 -08:00
parent e657bdd27a
commit 2634fc5054
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/mastodon/features/ui/components/header.js
View File

@ -2,7 +2,7 @@ import React from 'react';
import Logo from 'mastodon/components/logo'; import Logo from 'mastodon/components/logo';
import { Link, withRouter } from 'react-router-dom'; import { Link, withRouter } from 'react-router-dom';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import { registrationsOpen, me } from 'mastodon/initial_state'; import { registrationsOpen } from 'mastodon/initial_state';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
export default @withRouter export default @withRouter
@ -18,7 +18,6 @@ class Header extends React.PureComponent {
render () { render () {
const { signedIn } = this.context.identity; const { signedIn } = this.context.identity;
const { location } = this.props;
let content; let content;

6
app/javascript/mastodon/features/ui/components/navigation_panel.js
View File

@ -1,9 +1,7 @@
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { defineMessages, injectIntl } from 'react-intl'; import { defineMessages, injectIntl } from 'react-intl';
import { Link } from 'react-router-dom';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import Logo from 'mastodon/components/logo';
import Avatar from 'mastodon/components/avatar'; import Avatar from 'mastodon/components/avatar';
import Permalink from 'mastodon/components/permalink'; import Permalink from 'mastodon/components/permalink';
import { timelinePreview, showTrends, me } from 'mastodon/initial_state'; import { timelinePreview, showTrends, me } from 'mastodon/initial_state';
@ -35,7 +33,7 @@ const messages = defineMessages({
const Account = connect(state => ({ const Account = connect(state => ({
account: state.getIn(['accounts', me]), account: state.getIn(['accounts', me]),
}))(({ account }) => ( }))(({ account }) => (
<Permalink className="column-link column-link--transparent" href={account.get('url')} to={`/@${account.get('acct')}`} title={account.get('acct')}> <Permalink className='column-link column-link--transparent' href={account.get('url')} to={`/@${account.get('acct')}`} title={account.get('acct')}>
<Avatar account={account} size={24} /> <Avatar account={account} size={24} />
</Permalink> </Permalink>
)); ));
@ -62,7 +60,7 @@ class NavigationPanel extends React.Component {
{signedIn && ( {signedIn && (
<React.Fragment> <React.Fragment>
<Account /> <Account />
<ColumnLink id="navigation-panel__publish" transparent to='/publish' icon='pencil' text={intl.formatMessage(messages.publish)} /> <ColumnLink id='navigation-panel__publish' transparent to='/publish' icon='pencil' text={intl.formatMessage(messages.publish)} />
<ColumnLink transparent to='/home' icon='home' text={intl.formatMessage(messages.home)} /> <ColumnLink transparent to='/home' icon='home' text={intl.formatMessage(messages.home)} />
<ColumnLink transparent to='/notifications' icon={<NotificationsCounterIcon className='column-link__icon' />} text={intl.formatMessage(messages.notifications)} /> <ColumnLink transparent to='/notifications' icon={<NotificationsCounterIcon className='column-link__icon' />} text={intl.formatMessage(messages.notifications)} />
<FollowRequestsColumnLink /> <FollowRequestsColumnLink />

2
app/javascript/mastodon/features/ui/index.js
View File

@ -51,12 +51,10 @@ import {
Directory, Directory,
Explore, Explore,
FollowRecommendations, FollowRecommendations,
About,
PrivacyPolicy, PrivacyPolicy,
} from './util/async-components'; } from './util/async-components';
import initialState, { me, owner, singleUserMode, showTrends, trendsAsLanding } from '../../initial_state'; import initialState, { me, owner, singleUserMode, showTrends, trendsAsLanding } from '../../initial_state';
import { closeOnboarding, INTRODUCTION_VERSION } from 'mastodon/actions/onboarding'; import { closeOnboarding, INTRODUCTION_VERSION } from 'mastodon/actions/onboarding';
import Header from './components/header';
// Dummy import, to make sure that <Status /> ends up in the application bundle. // Dummy import, to make sure that <Status /> ends up in the application bundle.
// Without this it ends up in ~8 very commonly used bundles. // Without this it ends up in ~8 very commonly used bundles.

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

@ -2295,7 +2295,7 @@ a.account__display-name {
} }
} }
$ui-header-height: 0px; $ui-header-height: 0;
.ui__header { .ui__header {
display: none; display: none;
@ -8783,7 +8783,7 @@ div.status__content--with-spoiler {
i { i {
background-color: darken($ui-highlight-color, 2%); background-color: darken($ui-highlight-color, 2%);
padding: 8px 6px 8px 6px; padding: 8px 6px;
border-radius: 4px; border-radius: 4px;
color: $primary-text-color; color: $primary-text-color;
} }