imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2019-02-11 10:26:04 +00:00
commit 2f8bc270d3
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
res/css/structures/_AutoHideScrollbar.scss
View file

@ -74,6 +74,7 @@ body.mx_scrollbar_nooverlay {
// or fallback for webkit browsers // or fallback for webkit browsers
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 6px; width: 6px;
height: 6px;
background-color: $scrollbar-track-color; background-color: $scrollbar-track-color;
} }

2
src/components/structures/MatrixChat.js
View file

@ -1193,7 +1193,7 @@ export default React.createClass({
room_id: localStorage.getItem('mx_last_room_id'), room_id: localStorage.getItem('mx_last_room_id'),
}); });
} else { } else {
if (MatrixClientPeg.get().isGuest) { if (MatrixClientPeg.get().isGuest()) {
dis.dispatch({action: 'view_welcome_page'}); dis.dispatch({action: 'view_welcome_page'});
} else { } else {
dis.dispatch({action: 'view_home_page'}); dis.dispatch({action: 'view_home_page'});