From 5977859dd98960189e65f34abc2832d281ec48de Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 8 Feb 2019 15:43:17 +0000 Subject: [PATCH 1/2] Call isGuest correctly --- src/components/structures/MatrixChat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index 5b01912bb7..1453007b18 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -1193,7 +1193,7 @@ export default React.createClass({ room_id: localStorage.getItem('mx_last_room_id'), }); } else { - if (MatrixClientPeg.get().isGuest) { + if (MatrixClientPeg.get().isGuest()) { dis.dispatch({action: 'view_welcome_page'}); } else { dis.dispatch({action: 'view_home_page'}); From 84082ebb34789c411900df4063e284cb49241432 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 10 Feb 2019 22:35:28 +0000 Subject: [PATCH 2/2] fix horizontal CSS scrollbars on webkit --- res/css/structures/_AutoHideScrollbar.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/res/css/structures/_AutoHideScrollbar.scss b/res/css/structures/_AutoHideScrollbar.scss index cb0d6f7f09..0e1faf727d 100644 --- a/res/css/structures/_AutoHideScrollbar.scss +++ b/res/css/structures/_AutoHideScrollbar.scss @@ -74,6 +74,7 @@ body.mx_scrollbar_nooverlay { // or fallback for webkit browsers ::-webkit-scrollbar { width: 6px; + height: 6px; background-color: $scrollbar-track-color; }