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

Better CSS for redactions
element-hq · Mar 16, 2017 · e3e2e3a · e3e2e3a
2 parents 2efcf70 + 49be954
commit e3e2e3a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
@@ -121,7 +121,7 @@ module.exports = React.createClass({
             );
         }
 
-        if (!eventStatus) { // sent
+        if (!eventStatus && !this.props.mxEvent.isRedacted()) { // sent and not redacted
             redactButton = (
                 <div className="mx_MessageContextMenu_field" onClick={this.onRedactClick}>
                     Redact

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
@@ -130,14 +130,13 @@ limitations under the License.
     color: $event-notsent-color;
 }
 
-.mx_EventTile_redacted {
-    padding-top: 0px;
-}
-
-.mx_EventTile_redacted .mx_EventTile_line,
-.mx_EventTile_redacted:hover .mx_EventTile_line,
-.mx_EventTile_redacted.menu .mx_EventTile_line {
-    background-color: $primary-fg-color;
+.mx_EventTile_redacted .mx_EventTile_line .mx_UnknownBody {
+    display: block;
+    width: 100%;
+    max-width: 300px;
+    height: 24px;
+    border-radius: 4px;
+    background-color: black;
 }
 
 .mx_EventTile_highlight,