diff --git a/package.json b/package.json index 0a32953ce..91918b1a6 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,7 @@ "build": { "appId": "im.riot.app", "category": "Network", - "electronVersion": "1.4.14", + "electronVersion": "1.6.2", "//asar=false": "https://github.com/electron-userland/electron-builder/issues/675", "asar": false, "dereference": true, 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 index 0926a11a7..b59ac0b9d 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss @@ -133,10 +133,17 @@ limitations under the License. .mx_EventTile_redacted .mx_EventTile_line .mx_UnknownBody { display: block; width: 100%; - max-width: 300px; - height: 24px; - border-radius: 4px; - background-color: black; + height: 73px; + background-image: $event-redacted-img; + background-repeat: no-repeat; +} + +.mx_EventTile.mx_EventTile_redacted .mx_EventTile_line { + /* + Prevent changing colour of the background because + $event-redacted-img matches $primary-bg-color + */ + background-color: initial !important; } .mx_EventTile_highlight, diff --git a/src/skins/vector/css/themes/_base.scss b/src/skins/vector/css/themes/_base.scss index 3a33df95a..e105e7b4d 100644 --- a/src/skins/vector/css/themes/_base.scss +++ b/src/skins/vector/css/themes/_base.scss @@ -93,6 +93,9 @@ $event-encrypting-color: #abddbc; $event-sending-color: #ddd; $event-notsent-color: #f44; +// event redaction +$event-redacted-img: url('../../img/redacted.jpg'); + // event timestamp $event-timestamp-color: #acacac; diff --git a/src/skins/vector/css/themes/_dark.scss b/src/skins/vector/css/themes/_dark.scss index 49aea65ea..6d435fab8 100644 --- a/src/skins/vector/css/themes/_dark.scss +++ b/src/skins/vector/css/themes/_dark.scss @@ -93,6 +93,9 @@ $event-encrypting-color: rgba(171, 221, 188, 0.4); $event-sending-color: #888; $event-notsent-color: #f44; +// event redaction +$event-redacted-img: url('../../img/redacted-dark.jpg'); + // event timestamp $event-timestamp-color: #acacac; diff --git a/src/skins/vector/img/redacted-dark.jpg b/src/skins/vector/img/redacted-dark.jpg new file mode 100644 index 000000000..f0a91cead Binary files /dev/null and b/src/skins/vector/img/redacted-dark.jpg differ diff --git a/src/skins/vector/img/redacted.jpg b/src/skins/vector/img/redacted.jpg new file mode 100644 index 000000000..e19d5cc4a Binary files /dev/null and b/src/skins/vector/img/redacted.jpg differ diff --git a/src/vector/rageshake.js b/src/vector/rageshake.js index 09acca44e..0e5b5dace 100644 --- a/src/vector/rageshake.js +++ b/src/vector/rageshake.js @@ -488,6 +488,7 @@ module.exports = { text: ( userText || "User did not supply any additional text." ), + app: 'riot-web', version: version, user_agent: userAgent, },