gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3453 from vector-im/luke/display-redactions-better 

Better CSS for redactions
This commit is contained in:
David Baker 2017-03-16 17:12:11 +00:00 committed by GitHub
parent 2efcf7023f 49be954d31
commit e3e2e3a56c
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/context_menus/MessageContextMenu.js
View File

@ -121,7 +121,7 @@ module.exports = React.createClass({
); );
} }
if (!eventStatus) { // sent if (!eventStatus && !this.props.mxEvent.isRedacted()) { // sent and not redacted
redactButton = ( redactButton = (
<div className="mx_MessageContextMenu_field" onClick={this.onRedactClick}> <div className="mx_MessageContextMenu_field" onClick={this.onRedactClick}>
Redact Redact

15
src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
View File

@ -130,14 +130,13 @@ limitations under the License.
color: $event-notsent-color; color: $event-notsent-color;
} }
.mx_EventTile_redacted { .mx_EventTile_redacted .mx_EventTile_line .mx_UnknownBody {
padding-top: 0px; display: block;
} width: 100%;
max-width: 300px;
.mx_EventTile_redacted .mx_EventTile_line, height: 24px;
.mx_EventTile_redacted:hover .mx_EventTile_line, border-radius: 4px;
.mx_EventTile_redacted.menu .mx_EventTile_line { background-color: black;
background-color: $primary-fg-color;
} }
.mx_EventTile_highlight, .mx_EventTile_highlight,