mirror of
https://github.com/vector-im/element-web.git
synced 2024-11-16 05:04:57 +08:00
Highlight "Jump to Bottom" badge when appropriate
This resolves https://github.com/vector-im/riot-web/issues/13135 Signed-off-by: Mike Pennisi <mike@mikepennisi.com>
This commit is contained in:
parent
a475887c3e
commit
d237d02c03
@ -41,6 +41,11 @@ limitations under the License.
|
|||||||
// with text-align in parent
|
// with text-align in parent
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
padding: 0 4px;
|
padding: 0 4px;
|
||||||
|
color: $roomtile-badge-fg-color;
|
||||||
|
background-color: $roomtile-name-color;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_JumpToBottomButton_highlight .mx_JumpToBottomButton_badge {
|
||||||
color: $secondary-accent-color;
|
color: $secondary-accent-color;
|
||||||
background-color: $warning-color;
|
background-color: $warning-color;
|
||||||
}
|
}
|
||||||
|
@ -2044,6 +2044,7 @@ export default createReactClass({
|
|||||||
if (!this.state.atEndOfLiveTimeline && !this.state.searchResults) {
|
if (!this.state.atEndOfLiveTimeline && !this.state.searchResults) {
|
||||||
const JumpToBottomButton = sdk.getComponent('rooms.JumpToBottomButton');
|
const JumpToBottomButton = sdk.getComponent('rooms.JumpToBottomButton');
|
||||||
jumpToBottom = (<JumpToBottomButton
|
jumpToBottom = (<JumpToBottomButton
|
||||||
|
highlight={this.state.room.getUnreadNotificationCount('highlight') > 0}
|
||||||
numUnreadMessages={this.state.numUnreadMessages}
|
numUnreadMessages={this.state.numUnreadMessages}
|
||||||
onScrollToBottomClick={this.jumpToLiveTimeline}
|
onScrollToBottomClick={this.jumpToLiveTimeline}
|
||||||
/>);
|
/>);
|
||||||
|
@ -16,13 +16,18 @@ limitations under the License.
|
|||||||
|
|
||||||
import { _t } from '../../../languageHandler';
|
import { _t } from '../../../languageHandler';
|
||||||
import AccessibleButton from '../elements/AccessibleButton';
|
import AccessibleButton from '../elements/AccessibleButton';
|
||||||
|
import classNames from 'classnames';
|
||||||
|
|
||||||
export default (props) => {
|
export default (props) => {
|
||||||
|
const className = classNames({
|
||||||
|
'mx_JumpToBottomButton': true,
|
||||||
|
'mx_JumpToBottomButton_highlight': props.highlight,
|
||||||
|
});
|
||||||
let badge;
|
let badge;
|
||||||
if (props.numUnreadMessages) {
|
if (props.numUnreadMessages) {
|
||||||
badge = (<div className="mx_JumpToBottomButton_badge">{props.numUnreadMessages}</div>);
|
badge = (<div className="mx_JumpToBottomButton_badge">{props.numUnreadMessages}</div>);
|
||||||
}
|
}
|
||||||
return (<div className="mx_JumpToBottomButton">
|
return (<div className={className}>
|
||||||
<AccessibleButton className="mx_JumpToBottomButton_scrollDown"
|
<AccessibleButton className="mx_JumpToBottomButton_scrollDown"
|
||||||
title={_t("Scroll to most recent messages")}
|
title={_t("Scroll to most recent messages")}
|
||||||
onClick={props.onScrollToBottomClick}>
|
onClick={props.onScrollToBottomClick}>
|
||||||
|
Loading…
Reference in New Issue
Block a user