mirror of
https://github.com/vector-im/element-web.git
synced 2024-09-09 22:55:12 +00:00
Merge pull request #556 from vector-im/notif_sync
Use unread count for room highlight state
This commit is contained in:
commit
2d917910da
2 changed files with 1 additions and 5 deletions
|
@ -255,7 +255,7 @@ var RoomSubList = React.createClass({
|
|||
collapsed={ self.props.collapsed || false}
|
||||
selected={ selected }
|
||||
unread={ self.props.activityMap[room.roomId] === 1 }
|
||||
highlight={ self.props.activityMap[room.roomId] === 2 }
|
||||
highlight={ room.getUnreadNotificationCount('highlight') > 0 || self.props.label === 'Invites' }
|
||||
isInvite={ self.props.label === 'Invites' }
|
||||
incomingCall={ self.props.incomingCall && (self.props.incomingCall.roomId === room.roomId) ? self.props.incomingCall : null } />
|
||||
);
|
||||
|
|
|
@ -13,10 +13,6 @@
|
|||
<link rel="apple-touch-icon" sizes="144x144" href="vector-icons/apple-touch-icon-144x144.png">
|
||||
<link rel="apple-touch-icon" sizes="152x152" href="vector-icons/apple-touch-icon-152x152.png">
|
||||
<link rel="apple-touch-icon" sizes="180x180" href="vector-icons/apple-touch-icon-180x180.png">
|
||||
<link rel="icon" type="image/png" href="vector-icons/favicon-32x32.png" sizes="32x32">
|
||||
<link rel="icon" type="image/png" href="vector-icons/android-chrome-192x192.png" sizes="192x192">
|
||||
<link rel="icon" type="image/png" href="vector-icons/favicon-96x96.png" sizes="96x96">
|
||||
<link rel="icon" type="image/png" href="vector-icons/favicon-16x16.png" sizes="16x16">
|
||||
<link rel="manifest" href="vector-icons/manifest.json">
|
||||
<link rel="shortcut icon" href="vector-icons/favicon.ico">
|
||||
<meta name="apple-mobile-web-app-title" content="Vector">
|
||||
|
|
Loading…
Reference in a new issue