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

Merge branch 'marijn-csscleanup' into 'master'

Browse Source 
Marijn csscleanup

See merge request !39
This commit was merged in pull request #43.
This commit is contained in:
Marijn Jansen
2017-01-13 12:04:36 +01:00
parent f9fc79ad31 9db7c6776c
commit faddbf0939
9 changed files with 228 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
website/admin.php
View File

@@ -1,21 +1,24 @@
<!DOCTYPE html>
<html>
<?php
include("views/head.php");
?>
<body>
<?php
/*
<head>
<?php include("views/head.php"); ?>
<style>
@import url("styles/adminpanel.css");
</style>
</head>
<body>
<?php
/*
* This view adds the main layout over the screen.
* Header and menu.
*/
include("views/main.php");
include("views/main.php");
/* Add your view files here. */
include("views/adminpanel.php");
/* Add your view files here. */
include("views/adminpanel.php");
/* This adds the footer. */
include("views/footer.php");
?>
</body>
/* This adds the footer. */
include("views/footer.php");
?>
</body>
</html>

29
website/chat.php
View File

@@ -1,21 +1,24 @@
<!DOCTYPE html>
<html>
<?php
include("views/head.php");
?>
<body>
<?php
/*
<head>
<?php include("views/head.php"); ?>
<style>
@import url("styles/chat.css");
</style>
</head>
<body>
<?php
/*
* This view adds the main layout over the screen.
* Header, menu, footer.
*/
include("views/main.php");
include("views/main.php");
/* Add your view files here. */
include("views/chat-view.php");
/* Add your view files here. */
include("views/chat-view.php");
/* This adds the footer. */
include("views/footer.php");
?>
</body>
/* This adds the footer. */
include("views/footer.php");
?>
</body>
</html>

29
website/group.php
View File

@@ -1,21 +1,24 @@
<!DOCTYPE html>
<html>
<?php
include("views/head.php");
?>
<body>
<?php
/*
<head>
<?php include("views/head.php"); ?>
<style>
@import url("styles/profile.css");
</style>
</head>
<body>
<?php
/*
* This view adds the main layout over the screen.
* Header, menu, footer.
*/
include("views/main.php");
include("views/main.php");
/* Add your view files here. */
include("views/group.php");
/* Add your view files here. */
include("views/group.php");
/* This adds the footer. */
include("views/footer.php");
?>
</body>
/* This adds the footer. */
include("views/footer.php");
?>
</body>
</html>

29
website/profile.php
View File

@@ -1,21 +1,24 @@
<!DOCTYPE html>
<html>
<?php
include("views/head.php");
?>
<body>
<?php
/*
<head>
<?php include("views/head.php"); ?>
<style>
@import url("styles/profile.css");
</style>
</head>
<body>
<?php
/*
* This view adds the main layout over the screen.
* Header, menu, footer.
*/
include("views/main.php");
include("views/main.php");
/* Add your view files here. */
include("views/profile.php");
/* Add your view files here. */
include("views/profile.php");
/* This adds the footer. */
include("views/footer.php");
?>
</body>
/* This adds the footer. */
include("views/footer.php");
?>
</body>
</html>

29
website/search.php
View File

@@ -1,21 +1,24 @@
<!DOCTYPE html>
<html>
<?php
include("views/head.php");
?>
<body>
<?php
/*
<head>
<?php include("views/head.php"); ?>
<style>
@import url("styles/search.css");
</style>
</head>
<body>
<?php
/*
* This view adds the main layout over the screen.
* Header and menu.
*/
include("views/main.php");
include("views/main.php");
/* Add your view files here. */
include("views/search-view.php");
/* Add your view files here. */
include("views/search-view.php");
/* This adds the footer. */
include("views/footer.php");
?>
</body>
/* This adds the footer. */
include("views/footer.php");
?>
</body>
</html>

27
website/settings.php
View File

@@ -1,19 +1,24 @@
<!DOCTYPE html>
<html>
<?php include("views/head.php"); ?>
<body>
<?php
/*
<head>
<?php include("views/head.php"); ?>
<style>
@import url("styles/settings.css");
</style>
</head>
<body>
<?php
/*
* This view adds the main layout over the screen.
* Header and menu.
*/
include("views/main.php");
include("views/main.php");
/* Add your view files here. */
include("views/settings-view.php");
/* Add your view files here. */
include("views/settings-view.php");
/* This adds the footer. */
include("views/footer.php");
?>
</body>
/* This adds the footer. */
include("views/footer.php");
?>
</body>
</html>

156
website/styles/main.css
View File

@@ -1,64 +1,10 @@
/*-----------------------------------------------------------------------------
Default Stylesheet
last update: 10-01-2017
last update: 13-01-2017
Website: myhyvesbookplus.tk
-----------------------------------------------------------------------------*/
.profile-picture {
border-radius: 50%;
height: 42px;
width: 42px;
object-fit: cover;
vertical-align: middle;
}
.group-picture {
border-radius: 5px;
height: 42px;
width: 42px;
object-fit: cover;
vertical-align: middle;
}
html {
height: 100%;
}
body {
height: 100%;
background-color: #B78996;
color: #333;
font-family: Arial, sans-serif;
}
.content {
padding: 20px;
margin-top: 80px;
margin-left: 256px;
min-height: 100%;
}
.platform {
padding: 20px;
margin-bottom: 10px;
border-radius: 10px;
background-color: #FFFFFF;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}
::selection {
background: #845663;
color: white;
}
::-moz-selection {
background: #845663;
color: white;
}
/* Remove padding and margin */
* {
margin: 0;
@@ -66,19 +12,15 @@ body {
border: 0;
}
/* Move element down (clear), below floating elements */
.clear {
clear: both;
html {
height: 100%;
}
/* Float element to the left side of its containing block */
.right {
float: right;
}
/* Float element to the left side of its containing block */
.left {
float: left;
body {
height: 100%;
background-color: #B78996;
color: #333;
font-family: Arial, sans-serif;
}
/* Font sizes */
@@ -110,23 +52,81 @@ p {
font-size: 1.2em;
}
/* Selection colors */
::selection {
background: #845663;
color: white;
}
::-moz-selection {
background: #845663;
color: white;
}
/* All content underneath the menu */
.content {
padding: 20px;
margin-top: 80px;
margin-left: 256px;
min-height: 100%;
}
/* White boxes (squares) */
.platform {
padding: 20px;
margin-bottom: 10px;
border-radius: 10px;
background-color: #FFFFFF;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}
.profile-picture, .group-picture {
height: 42px;
width: 42px;
object-fit: cover;
vertical-align: middle;
}
.profile-picture {
border-radius: 50%;
}
.group-picture {
border-radius: 5px;
}
/* Move element down (clear), below floating elements */
.clear {
clear: both;
}
/* Float element to the left side of its containing block */
.right {
float: right;
}
/* Float element to the left side of its containing block */
.left {
float: left;
}
/* All links */
a, a:link, a:visited, a:hover, a:active {
color: inherit;
text-decoration: none;
}
/* All buttons, inputfields/selectfields. */
button, input, select {
width: auto;
height: 32px;
cursor: pointer;
border: none;
font-family: Arial, sans-serif;
font-size: 16px;
border-radius: 7px;
}
/* All textinput and sections */
textarea, input, select {
padding: 0 5px;
background: white;
@@ -134,11 +134,12 @@ textarea, input, select {
border: 1px solid #845663;
border-radius: 7px;
font-size: 16px;
}
button, input[type="submit"], input[type="reset"] {
/* All buttons */
button,
input[type="submit"],
input[type="reset"] {
background-color: #845663;
color: white;
padding: 0 10px;
@@ -157,12 +158,17 @@ td {
}
/* Custom title box, appears instantaneously */
a[data-title]:hover, img[data-title]:hover, span[data-title]:hover, div[data-title]:hover {
a[data-title]:hover,
img[data-title]:hover,
span[data-title]:hover,
div[data-title]:hover {
position: relative;
}
a[data-title]:hover:after, img[data-title]:hover:after, span[data-title]:hover:after,
div[data-title]:hover:after{
a[data-title]:hover:after,
img[data-title]:hover:after,
span[data-title]:hover:after,
div[data-title]:hover:after {
content: attr(data-title);
padding: 4px 4px;
color: #FFFFFF;

29
website/template.php
View File

@@ -1,21 +1,24 @@
<!DOCTYPE html>
<html>
<?php
include("views/head.php");
?>
<body>
<?php
/*
<head>
<?php include("views/head.php"); ?>
<style>
/*Insert own stylesheet here ;)*/
</style>
</head>
<body>
<?php
/*
* This view adds the main layout over the screen.
* Header and menu.
*/
include("views/main.php");
include("views/main.php");
/* Add your view files here. */
include("views/homepage.php");
/* Add your view files here. */
include("views/homepage.php");
/* This adds the footer. */
include("views/footer.php");
?>
</body>
/* This adds the footer. */
include("views/footer.php");
?>
</body>
</html>

23
website/views/head.php
View File

@@ -1,21 +1,14 @@
<head>
<meta charset="utf-8">
<title>MyHyvesbook+</title>
<!-- Add your javascript files here. -->
<script src="js/jquery.js"></script>
<script src="js/header.js"></script>
<script src="js/menu.js"></script>
<style>
<meta charset="utf-8">
<title>MyHyvesbook+</title>
<!-- Add your javascript files here. -->
<script src="js/jquery.js"></script>
<script src="js/header.js"></script>
<script src="js/menu.js"></script>
<style>
/* Add your css files here. */
@import url("styles/main.css");
@import url("styles/profile.css");
@import url("styles/font-awesome.css");
@import url("styles/header.css");
@import url("styles/menu.css");
@import url("styles/footer.css");
@import url("styles/search.css");
@import url("styles/adminpanel.css");
@import url("styles/chat.css");
@import url("styles/settings.css");
</style>
</head>
</style>