From 1ec8de71f0d95df69a63ea79035aa962c5792521 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Mon, 23 Jan 2017 13:17:01 +0100 Subject: [PATCH] Changed menu view --- website/public/js/header.js | 18 ++++++++++++------ website/public/styles/menu.css | 6 ++++-- website/queries/settings.php | 3 +-- website/views/chat-view.php | 2 +- website/views/menu.php | 2 +- 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/website/public/js/header.js b/website/public/js/header.js index ceb6086..093cc91 100644 --- a/website/public/js/header.js +++ b/website/public/js/header.js @@ -9,16 +9,22 @@ $(document).ready(function() { $("#own-profile-picture").click(function() { if($("#notification-center").css('right') == "-256px") { - // $(".content").animate({ - // marginRight: "256px" - // }, 500); + $(".content").animate({ + marginRight: "256px" + }, 500); + $(".chat-right").animate({ + width: "100%" + }, 500); $("#notification-center").animate({ right: "0px" }, 500); } else { - // $(".content").animate({ - // marginRight: "0px" - // }, 500); + $(".chat-right").animate({ + width: "100%" + }, 500); + $(".content").animate({ + marginRight: "0px" + }, 500); $("#notification-center").animate({ right: "-256px" }, 500); diff --git a/website/public/styles/menu.css b/website/public/styles/menu.css index 69aa8a9..215b073 100644 --- a/website/public/styles/menu.css +++ b/website/public/styles/menu.css @@ -8,11 +8,13 @@ height: calc(100% - 80px); width: 256px; - background-color: white; - box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); + background-color: #EEE; + /*box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);*/ } .menu section { + margin: 0 5px 10px 5px; + background-color: white; box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); } diff --git a/website/queries/settings.php b/website/queries/settings.php index f4c7011..543adb9 100644 --- a/website/queries/settings.php +++ b/website/queries/settings.php @@ -90,10 +90,9 @@ function updateSettings() { $stmt->bindValue(":fname", test_input($_POST["fname"])); $stmt->bindValue(":lname", test_input($_POST["lname"])); $stmt->bindValue(":location", test_input($_POST["location"])); - $stmt->bindValue(":bday", $_POST["bday"]); + $stmt->bindValue(":bday", test_input($_POST["bday"])); $stmt->bindValue(":bio", test_input($_POST["bio"])); $stmt->bindValue(":userID", $_SESSION["userID"]); - $stmt->execute(); return new settingsMessage("happy", "Instellingen zijn opgeslagen."); diff --git a/website/views/chat-view.php b/website/views/chat-view.php index 09b52ca..549a5ff 100644 --- a/website/views/chat-view.php +++ b/website/views/chat-view.php @@ -36,7 +36,7 @@ ?> -
+
diff --git a/website/views/menu.php b/website/views/menu.php index a150848..b7651bd 100644 --- a/website/views/menu.php +++ b/website/views/menu.php @@ -1,5 +1,5 @@