From b8b74402c1fc5a39530c6ab51bf8f7fb3c0ce4e8 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Mon, 10 Apr 2017 15:07:43 +0100 Subject: [PATCH 1/3] Add 'app' parameter to rageshake report --- src/vector/rageshake.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vector/rageshake.js b/src/vector/rageshake.js index 09acca44e7..0e5b5dace2 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, }, From 0b1745bceb04dd3b810370f743ca8e74a88c58a3 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Mon, 10 Apr 2017 15:49:40 +0100 Subject: [PATCH 2/3] Redacted events bg: black lozenge -> torn paper --- .../matrix-react-sdk/views/rooms/_EventTile.scss | 15 +++++++++++---- src/skins/vector/css/themes/_base.scss | 3 +++ src/skins/vector/css/themes/_dark.scss | 3 +++ src/skins/vector/img/redacted-dark.jpg | Bin 0 -> 4795 bytes src/skins/vector/img/redacted.jpg | Bin 0 -> 5320 bytes 5 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 src/skins/vector/img/redacted-dark.jpg create mode 100644 src/skins/vector/img/redacted.jpg 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 0926a11a74..b59ac0b9dc 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 3a33df95ad..e105e7b4d5 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 49aea65ea7..6d435fab8a 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 0000000000000000000000000000000000000000..f0a91ceadbe03c72ce5db5058761105eb41e3146 GIT binary patch literal 4795 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≧KKxwk*=(!S}#|B z9{#t$O||vpc@>1MYwv8U1UvDrw(4t>rZAj4w-B<~&tkGJX#T-5(29c-Y2uF-3bAN3 U0MF^)O_$x9{SEwo05#M3ZyBhi_W%F@ literal 0 HcmV?d00001 diff --git a/src/skins/vector/img/redacted.jpg b/src/skins/vector/img/redacted.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e19d5cc4a8ec6cdc48be78b374beaffc9ee483f7 GIT binary patch literal 5320 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 Date: Mon, 10 Apr 2017 16:01:01 +0100 Subject: [PATCH 3/3] Bump electron version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 28cde3895a..f5098f5117 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,