diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-05-26 02:55:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-26 02:55:37 +0200 |
commit | 0e445ebb1392c8dbce320509d219f16c7c221406 (patch) | |
tree | 80e152870735fbb15656ee5b87fc61a54b4d7564 /app/javascript/mastodon/features/ui/components/notifications_counter_icon.js | |
parent | a472190729782f31731674c626c07af483fe9c7f (diff) |
Improvements to the single column layout (#10835)
* 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
Diffstat (limited to 'app/javascript/mastodon/features/ui/components/notifications_counter_icon.js')
-rw-r--r-- | app/javascript/mastodon/features/ui/components/notifications_counter_icon.js | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js b/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js index 9673c57fe..da553cd9f 100644 --- a/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js +++ b/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js @@ -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); |