Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Improvements to the single column layout (#10835)

Browse source 
* Improvements to the single column layout

- Add follows and followers link to the right panel
- Increase margins around separators in right panel
- Add follow requests link with counter when account is locked to right panel

* Redirect from getting started to home when navigation panel is visible
This commit is contained in:
Eugen Rochko 2019-05-26 02:55:37 +02:00 • committed by GitHub
parent a472190729
commit 0e445ebb13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 85 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/javascript/mastodon/features/ui/components/notifications_counter_icon.js
View file

@ -1,24 +1,9 @@
import React from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import Icon from 'mastodon/components/icon';
import IconWithBadge from 'mastodon/components/icon_with_badge';
const mapStateToProps = state => ({
count: state.getIn(['notifications', 'unread']),
id: 'bell',
});
const formatNumber = num => num > 99 ? '99+' : num;
const NotificationsCounterIcon = ({ count, className }) => (
<i className='icon-with-badge'>
<Icon id='bell' fixedWidth className={className} />
{count > 0 && <i className='icon-with-badge__badge'>{formatNumber(count)}</i>}
</i>
);
NotificationsCounterIcon.propTypes = {
count: PropTypes.number.isRequired,
className: PropTypes.string,
};
export default connect(mapStateToProps)(NotificationsCounterIcon);
export default connect(mapStateToProps)(IconWithBadge);