PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Adjust edited tooltip to use shared styles

Browse source
This commit is contained in:
J. Ryan Stinnett 2019-05-17 12:19:02 +01:00
parent 059988ff5c
commit 603e6b7055
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
res/css/views/rooms/_EventTile.scss
View file

@ -490,6 +490,11 @@ limitations under the License.
} }
*/ */
.mx_EventTile_editedTooltip {
font-size: 10px;
padding: 5px 6px;
}
/* end of overrides */ /* end of overrides */
.mx_MatrixChat_useCompactLayout { .mx_MatrixChat_useCompactLayout {

7
src/components/views/messages/TextualBody.js
View file

@ -448,14 +448,17 @@ module.exports = React.createClass({
const Tooltip = sdk.getComponent('elements.Tooltip'); const Tooltip = sdk.getComponent('elements.Tooltip');
const editEvent = this.props.mxEvent.replacingEvent(); const editEvent = this.props.mxEvent.replacingEvent();
const date = editEvent && formatDate(editEvent.getDate()); const date = editEvent && formatDate(editEvent.getDate());
editedTooltip = <Tooltip label={_t("Edited at %(date)s.", {date})} />; editedTooltip = <Tooltip
tooltipClassName="mx_EventTile_editedTooltip mx_Tooltip_timeline"
label={_t("Edited at %(date)s.", {date})}
/>;
} }
return ( return (
<div <div
key="editedMarker" className="mx_EventTile_edited" key="editedMarker" className="mx_EventTile_edited"
onMouseEnter={this._onMouseEnterEditedMarker} onMouseEnter={this._onMouseEnterEditedMarker}
onMouseLeave={this._onMouseLeaveEditedMarker} onMouseLeave={this._onMouseLeaveEditedMarker}
>{editedTooltip}<span>{`(${_t("Edited")})`}</span></div> >{editedTooltip}<span>{`(${_t("edited")})`}</span></div>
); );
}, },

2
src/i18n/strings/en_EN.json
View file

@ -918,7 +918,7 @@
"Add an Integration": "Add an Integration", "Add an Integration": "Add an Integration",
"You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?", "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?",
"Edited at %(date)s.": "Edited at %(date)s.", "Edited at %(date)s.": "Edited at %(date)s.",
"Edited": "Edited", "edited": "edited",
"Removed or unknown message type": "Removed or unknown message type", "Removed or unknown message type": "Removed or unknown message type",
"Message removed by %(userId)s": "Message removed by %(userId)s", "Message removed by %(userId)s": "Message removed by %(userId)s",
"Message removed": "Message removed", "Message removed": "Message removed",