diff --git a/website/public/js/header.js b/website/public/js/header.js index 093cc91..a0052c3 100644 --- a/website/public/js/header.js +++ b/website/public/js/header.js @@ -1,12 +1,4 @@ $(document).ready(function() { - // Hide notification center. - $("#profile-menu-popup").hide(); - - // $("#own-profile-picture").click(function() { - // $("#profile-menu-popup").toggle(); - // $("#profile-hello-popup").toggle(); - // }); - $("#own-profile-picture").click(function() { if($("#notification-center").css('right') == "-256px") { $(".content").animate({ diff --git a/website/public/styles/chat.css b/website/public/styles/chat.css index f6060dd..c7d0235 100644 --- a/website/public/styles/chat.css +++ b/website/public/styles/chat.css @@ -25,6 +25,7 @@ /* Chat history. */ .chat-history { overflow-y: auto; + overflow-x: hidden; height: 100%; padding: 10px; } @@ -46,14 +47,15 @@ .chat-message-self { float: right; margin-right: 10px; - background-color: darkgreen; + background-color: #FBC02D; color: white; } .chat-message-other { float: left; margin-left: 10px; - background-color: aquamarine; + background-color: #4CAF50; + color: white; } /* Chat reply field */ @@ -91,6 +93,6 @@ } .active-friend-chat { - background: aquamarine; - color: #333; + background: #4CAF50; + color: white; } \ No newline at end of file