Merge pull request #4159 from mstriemer/mark-as-read-button
Include a mark as read X under the scroll to unread button
This commit is contained in:
commit
fcc28c4d4d
3 changed files with 20 additions and 0 deletions
res/css/views/rooms
src
|
@ -56,3 +56,17 @@ limitations under the License.
|
|||
mask-position: 9px 13px;
|
||||
background: $roomtile-name-color;
|
||||
}
|
||||
|
||||
.mx_TopUnreadMessagesBar_markAsRead {
|
||||
display: block;
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
background-image: url('$(res)/img/cancel.svg');
|
||||
background-position: center;
|
||||
background-size: 10px;
|
||||
background-repeat: no-repeat;
|
||||
background-color: $primary-bg-color;
|
||||
border: 1.3px solid $roomtile-name-color;
|
||||
border-radius: 99px;
|
||||
margin: 5px auto;
|
||||
}
|
||||
|
|
|
@ -27,6 +27,7 @@ export default createReactClass({
|
|||
|
||||
propTypes: {
|
||||
onScrollUpClick: PropTypes.func,
|
||||
onCloseClick: PropTypes.func,
|
||||
},
|
||||
|
||||
render: function() {
|
||||
|
@ -36,6 +37,10 @@ export default createReactClass({
|
|||
title={_t('Jump to first unread message.')}
|
||||
onClick={this.props.onScrollUpClick}>
|
||||
</AccessibleButton>
|
||||
<AccessibleButton className="mx_TopUnreadMessagesBar_markAsRead"
|
||||
title={_t('Mark all as read')}
|
||||
onClick={this.props.onCloseClick}>
|
||||
</AccessibleButton>
|
||||
</div>
|
||||
);
|
||||
},
|
||||
|
|
|
@ -1140,6 +1140,7 @@
|
|||
"Revoke invite": "Revoke invite",
|
||||
"Invited by %(sender)s": "Invited by %(sender)s",
|
||||
"Jump to first unread message.": "Jump to first unread message.",
|
||||
"Mark all as read": "Mark all as read",
|
||||
"Error updating main address": "Error updating main address",
|
||||
"There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.",
|
||||
"Error creating alias": "Error creating alias",
|
||||
|
|
Loading…
Reference in a new issue