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

Merge commit '9d9836706e' into kb_migration

Browse source
This commit is contained in:
KMY 2023-06-07 11:45:47 +09:00
commit 47e09c39d5
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/features/list_timeline/index.jsx
View file

@ -235,7 +235,7 @@ class ListTimeline extends PureComponent {
{ antennas.map(antenna => ( { antennas.map(antenna => (
<li key={antenna.get('id')} className='column-settings__row__antenna'> <li key={antenna.get('id')} className='column-settings__row__antenna'>
<button type='button' className='text-btn column-header__setting-btn' data-id={antenna.get('id')} onClick={this.handleEditAntennaClick}> <button type='button' className='text-btn column-header__setting-btn' data-id={antenna.get('id')} onClick={this.handleEditAntennaClick}>
{antenna.get('title')}{antenna.get('stl') && ' [STL]'} <Icon id='pencil' /> {antenna.get('title')}{antenna.get('stl') && ' [STL]'}
</button> </button>
</li> </li>
))} ))}

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

@ -73,12 +73,12 @@ class NavigationPanel extends Component {
<> <>
<ColumnLink transparent to='/public/local' icon='users' text={intl.formatMessage(messages.local)} /> <ColumnLink transparent to='/public/local' icon='users' text={intl.formatMessage(messages.local)} />
<ColumnLink transparent exact to='/public' icon='globe' text={intl.formatMessage(messages.federated)} /> <ColumnLink transparent exact to='/public' icon='globe' text={intl.formatMessage(messages.federated)} />
<ColumnLink transparent to='/lists' icon='list-ul' text={intl.formatMessage(messages.lists)} />
</> </>
)} )}
{signedIn && ( {signedIn && (
<> <>
<ColumnLink transparent to='/lists' icon='list-ul' text={intl.formatMessage(messages.lists)} />
<ListPanel /> <ListPanel />
<hr /> <hr />
</> </>