From 55062c7ec547636270f318740fa7427475818c18 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 28 Nov 2016 16:37:43 +0000 Subject: [PATCH 1/2] Update to electron 1.4.8 Which uses a new enough build of chromium that it accepts our SSL certs. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fde6fbaa04..c672af5cdc 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "build": { "appId": "im.riot.app", "category": "Network", - "electronVersion": "1.4.2", + "electronVersion": "1.4.8", "//asar=false": "https://github.com/electron-userland/electron-builder/issues/675", "asar": false, "dereference": true, From f20219754523080b187c7e577ac8bd592ad7f754 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Tue, 29 Nov 2016 18:49:23 +0000 Subject: [PATCH 2/2] CSS updates for s/block/blacklist for e2e CSS for https://github.com/matrix-org/matrix-react-sdk/pull/574 --- .../views/rooms/MemberDeviceInfo.css | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberDeviceInfo.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberDeviceInfo.css index 44cba9d157..53379ac4ce 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberDeviceInfo.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberDeviceInfo.css @@ -44,14 +44,23 @@ limitations under the License. border-bottom: 1px solid rgba(0,0,0,0.1); } -.mx_MemberDeviceInfo_block, -.mx_MemberDeviceInfo_unblock { +.mx_MemberDeviceInfo_blacklist, +.mx_MemberDeviceInfo_unblacklist { float: right; } +/* "Unblacklist" is too long for a regular button: make it wider and + reduce the padding. */ +.mx_EncryptedEventDialog .mx_MemberDeviceInfo_blacklist, +.mx_EncryptedEventDialog .mx_MemberDeviceInfo_unblacklist { + width: 8em; + padding-left: 1em; + padding-right: 1em; +} + .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_verified, .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_unverified, -.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blocked { +.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blacklisted { float: right; padding-left: 1em; } @@ -64,6 +73,6 @@ limitations under the License. color: #e8bf37; } -.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blocked { +.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blacklisted { color: #ba6363; }