Marijn button #99

Merged
11166932 merged 152 commits from marijn-button into master 2017-01-23 13:25:08 +01:00
5 changed files with 19 additions and 12 deletions
Showing only changes of commit 1ec8de71f0 - Show all commits

View File

@@ -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);

View File

@@ -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);
}

View File

@@ -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.");

View File

@@ -36,7 +36,7 @@
?>
</ul>
</nav>
<div class="chat-right right">
<div class="chat-right">
<div id="chat-history" class="chat-history platform">
</div>
<form id="lastIDForm">

View File

@@ -1,5 +1,5 @@
<nav class="menu">
<section id="friends-menu-section">
<section id="friends-menu-section platform">
<h4>
Vrienden
</h4>