From 2634fc5054f6dffa5d63cfde6d3defd79aaf9ba7 Mon Sep 17 00:00:00 2001 From: Darius Kazemi Date: Fri, 30 Dec 2022 03:15:27 -0800 Subject: [PATCH] Fixing linter errors --- app/javascript/mastodon/features/ui/components/header.js | 3 +-- .../mastodon/features/ui/components/navigation_panel.js | 6 ++---- app/javascript/mastodon/features/ui/index.js | 2 -- app/javascript/styles/mastodon/components.scss | 4 ++-- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/app/javascript/mastodon/features/ui/components/header.js b/app/javascript/mastodon/features/ui/components/header.js index fb4c9bd78..246ac1e6c 100644 --- a/app/javascript/mastodon/features/ui/components/header.js +++ b/app/javascript/mastodon/features/ui/components/header.js @@ -2,7 +2,7 @@ import React from 'react'; import Logo from 'mastodon/components/logo'; import { Link, withRouter } from 'react-router-dom'; import { FormattedMessage } from 'react-intl'; -import { registrationsOpen, me } from 'mastodon/initial_state'; +import { registrationsOpen } from 'mastodon/initial_state'; import PropTypes from 'prop-types'; export default @withRouter @@ -18,7 +18,6 @@ class Header extends React.PureComponent { render () { const { signedIn } = this.context.identity; - const { location } = this.props; let content; diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.js b/app/javascript/mastodon/features/ui/components/navigation_panel.js index 681490b69..8f7cf8814 100644 --- a/app/javascript/mastodon/features/ui/components/navigation_panel.js +++ b/app/javascript/mastodon/features/ui/components/navigation_panel.js @@ -1,9 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { defineMessages, injectIntl } from 'react-intl'; -import { Link } from 'react-router-dom'; import { connect } from 'react-redux'; -import Logo from 'mastodon/components/logo'; import Avatar from 'mastodon/components/avatar'; import Permalink from 'mastodon/components/permalink'; import { timelinePreview, showTrends, me } from 'mastodon/initial_state'; @@ -35,7 +33,7 @@ const messages = defineMessages({ const Account = connect(state => ({ account: state.getIn(['accounts', me]), }))(({ account }) => ( - + )); @@ -62,7 +60,7 @@ class NavigationPanel extends React.Component { {signedIn && ( - + } text={intl.formatMessage(messages.notifications)} /> diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js index b17223289..83e7a89ac 100644 --- a/app/javascript/mastodon/features/ui/index.js +++ b/app/javascript/mastodon/features/ui/index.js @@ -51,12 +51,10 @@ import { Directory, Explore, FollowRecommendations, - About, PrivacyPolicy, } from './util/async-components'; import initialState, { me, owner, singleUserMode, showTrends, trendsAsLanding } from '../../initial_state'; import { closeOnboarding, INTRODUCTION_VERSION } from 'mastodon/actions/onboarding'; -import Header from './components/header'; // Dummy import, to make sure that ends up in the application bundle. // Without this it ends up in ~8 very commonly used bundles. diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 568dd09d1..8d4d88501 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -2295,7 +2295,7 @@ a.account__display-name { } } -$ui-header-height: 0px; +$ui-header-height: 0; .ui__header { display: none; @@ -8783,7 +8783,7 @@ div.status__content--with-spoiler { i { background-color: darken($ui-highlight-color, 2%); - padding: 8px 6px 8px 6px; + padding: 8px 6px; border-radius: 4px; color: $primary-text-color; }