gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge commit 'dee69e4f83' into kb_migration

Browse source
This commit is contained in:
KMY 2023-05-27 12:51:27 +09:00
commit f010acbde2
18 changed files with 286 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/javascript/mastodon/features/ui/components/navigation_panel.jsx
View file

@ -61,7 +61,10 @@ class NavigationPanel extends Component {
</div>
{signedIn && (
<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='/home' icon='home' text={intl.formatMessage(messages.home)} />
</>
)}
{!signedIn && explorer}
@ -82,7 +85,6 @@ class NavigationPanel extends Component {
{signedIn && (
<>
<ColumnLink transparent to='/notifications' icon={<NotificationsCounterIcon className='column-link__icon' />} text={intl.formatMessage(messages.notifications)} />
<FollowRequestsColumnLink />
<ColumnLink transparent to='/conversations' icon='at' text={intl.formatMessage(messages.direct)} />
</>

2
app/javascript/mastodon/features/ui/components/sign_in_banner.jsx
View file

@ -17,7 +17,7 @@ const SignInBanner = () => {
let signupButton;
const signupUrl = useAppSelector((state) => state.getIn(['server', 'server', 'registrations', 'url'], '/auth/sign_up'));
const signupUrl = useAppSelector((state) => state.getIn(['server', 'server', 'registrations', 'url'], '/auth/sign_up') || '/auth/sign_up');
if (registrationsOpen) {
signupButton = (