MyHyvesBookPlus/WebDB
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into joey-testing

Browse Source
This commit is contained in:
Joey Lai
2017-01-20 16:24:59 +01:00
parent e456591db6 9edf065c81
commit e33210ce5e
15 changed files with 232 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
website/public/js/header.js
View File

@@ -1,7 +1,27 @@
$(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() {
$("#profile-menu-popup").toggle();
$("#profile-hello-popup").toggle();
if($("#notification-center").css('right') == "-256px") {
// $(".content").animate({
// marginRight: "256px"
// }, 500);
$("#notification-center").animate({
right: "0px"
}, 500);
} else {
// $(".content").animate({
// marginRight: "0px"
// }, 500);
$("#notification-center").animate({
right: "-256px"
}, 500);
}
});
});

6
website/public/search.php
View File

@@ -1,7 +1,11 @@
<!DOCTYPE html>
<html>
<head>
<?php include("../views/head.php"); ?>
<?php
include_once("../queries/user.php");
include_once("../queries/group_page.php");
include("../views/head.php");
?>
<style>
@import url("styles/search.css");
</style>

2
website/public/settings.php
View File

@@ -29,7 +29,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
break;
case "picture":
updateProfilePicture();
$result = $notImplemented;
$result = new settingsMessage("happy", "Deze melding doet nog niks nuttigs.");
break;
}
}

22
website/public/styles/header.css
View File

@@ -33,32 +33,12 @@ header {
header div {
display: inline-block;
}
#open-chat {
font-size: 32px;
line-height: 80px;
margin-right: 50px;
}
.profile-menu {
font-size: 21px;
}
.profile-menu img {
padding: 8px;
height: 64px;
width: 64px;
}
#own-profile-picture, #profile-menu-popup span {
#own-profile-picture {
cursor: pointer;
}
#profile-menu-popup {
padding: 5px;
background: white;
color: #666;
border-radius: 3px;
}

17
website/public/styles/menu.css
View File

@@ -42,4 +42,21 @@
height: 100%;
padding: 0;
text-align: left;
}
#notification-center {
left: auto;
width: 256px;
right: -256px;
}
#quick-links {
text-align: center;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}
#quick-links i {
color: #845663;
font-size: 42px;
padding: 7px;
}

38
website/public/styles/profile.css
View File

@@ -10,9 +10,12 @@
margin: 0 20px 20px 0;
}
.profile-box .profile-username {
.profile-box h1.profile-username {
padding-top: 50px;
}
.profile-box h5.profile-username {
padding-top: 0;
}
div.posts {
padding-top: 20px;
@@ -37,23 +40,18 @@ div.posts .post p.subscript {
font-size: 8pt;
}
/*.posts {*/
/*z-index: -1;*/
/*margin-right: 0;*/
/*width: calc(100% + 15px);*/
/*}*/
div.posts .post form input, div.posts .post form textarea {
width: calc(100% - 15px);
}
/*.post-box {*/
/*display: inline-flex;*/
/*margin: 20px 15px 0 0;*/
/*padding: 25px;*/
/*background-color: #FFFFFF;*/
/*}*/
div.posts .post form input[type="submit"] {
width: 100%;
}
/*!* fullscreen *!*/
/*.post-box {*/
/*width: calc(25% - 69px);*/
/*}*/
div.posts .post form textarea.newpost {
margin: 15px 0 15px 0;
height: 100px;
}
@media only screen and (max-width: 1500px) {
.post-box {
@@ -68,14 +66,6 @@ div.posts .post p.subscript {
}
}
.post {
width: 100%;
}
.post img {
width: 100%;
}
.post .post-date {
float: right;
color: #aaaaaa;

5
website/public/styles/search.css
View File

@@ -9,4 +9,9 @@
#search-friends-output {
margin-right: 10px;
}
.searchleft, .searchright {
display: inline-block;
vertical-align: top;
}