Merge branch 'soon' into staging

2018-03-14 17:17:00 +01:00
parent d6228a39bd b3429c2d24
commit ab8306f5d4
22 changed files with 556 additions and 297 deletions
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -400,7 +400,7 @@ define([
        });
        show();
        Common.getAttribute(['toolbar', 'userlist-drawer'], function (err, val) {
-            if (val === false || $(window).height() < 800) { return void hide(); }
+            if (val === false || $(window).width() < 800) { return void hide(); }
            show();
        });