Merge branch 'lars-algemeen' into lars-chat

2017-01-23 17:22:38 +01:00
parent 7eec0cfa2a 8c4c4a59fd
commit d7e84ee138
11 changed files with 114 additions and 104 deletions
--- a/website/public/js/header.js
+++ b/website/public/js/header.js
@@ -5,14 +5,14 @@ $(document).ready(function() {
                marginRight: "256px"
            }, 500);
            $(".chat-right").animate({
-                width: "100%"
+                width: "calc(100% - 512px - 40px)"
            }, 500);
            $("#notification-center").animate({
                right: "0px"
            }, 500);
        } else {
            $(".chat-right").animate({
-                width: "100%"
+                width: "calc(100% - 256px - 40px)"
            }, 500);
            $(".content").animate({
                marginRight: "0px"
@@ -22,4 +22,6 @@ $(document).ready(function() {
            }, 500);
        }
    });
+
+    $("#own-profile-picture").click();
 });