Merge branch 'master' into hendrik-testing

This commit is contained in:
Hendrik
2017-01-17 10:58:17 +01:00
57 changed files with 966 additions and 694 deletions

View File

@@ -0,0 +1,67 @@
.admin-panel {
margin: auto;
/*min-width: 800px;*/
}
.admin-title {
margin: 10px;
padding-bottom: 5px;
border-bottom: 4px solid #845663;
}
.admin-panel input[type="radio"], input[type="checkbox"] {
height: auto;
}
.admin-actions {
display: inline-block;
padding: 8px;
vertical-align: top;
border-radius: 10px;
border: 4px solid #845663;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}
.admin-searchbar {
display: inline-block;
margin: 10px;
vertical-align: top;
}
.admin-searchinput {
margin-bottom: 10px;
}
.admin-filter, .admin-filtertype {
display: inline-block;
margin: 10px;
vertical-align: top;
margin-left: 20px;
margin-right: 20px;
}
.admin-users {
margin: 10px;
}
.usertable {
width: 100%;
}
.usertable .table-checkbox {width: 20px}
.usertable .table-username {width: 150px}
.usertable .table-status {width: 100px}
.usertable .table-action {width: 200px}
.usertable th, td {
border-bottom: 1px solid #ddd;
padding: 3px;
}
.usertable tr {
text-align: left;
}
.usertable tr:hover {
background-color: #f5f5f5;
}

View File

@@ -0,0 +1,91 @@
/* Overall chat-screen */
.chat {
position: fixed;
top: 80px;
left: 256px;
padding: 15px 0;
width: calc(100% - 256px);
height: calc(100% - 120px);
display: inline-flex;
}
.chat-left {
width: 256px;
height: calc(100% - 100px);
margin: 0 10px;
overflow-y: auto;
}
.chat-right {
width: calc(100% - 256px - 40px);
height: calc(100% - 80px);
margin-right: 10px;
}
/* Chat history. */
.chat-history {
overflow-y: auto;
height: 100%;
padding: 10px;
}
/* Chat-message takes the whole width of the chat area */
.chat-message {
width: 100%;
min-height: 40px;
padding-top: 10px;
clear: both;
}
.chat-message-self, .chat-message-other {
border-radius: 20px;
padding: 10px;
max-width: 45%;
}
.chat-message-self {
float: right;
margin-right: 10px;
background-color: darkgreen;
color: white;
}
.chat-message-other {
float: left;
margin-left: 10px;
background-color: aquamarine;
}
/* Chat reply field */
.chat-field {
width: 100%;
display: table;
}
.chat-field form {
width: 100%;
overflow: hidden;
}
.chat-field span {
display: block;
overflow: hidden;
}
.chat-field input[type="text"] {
width: 100%;
border: none;
border-radius: 10px 0 0 10px;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}
.chat-field input[type="submit"] {
width: auto;
float: right;
background-color: #845663;
color: white;
padding: 5px 10px;
border-radius: 0 10px 10px 0;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,13 @@
footer {
width: calc(100% - 256px);
margin-left: 256px;
background-color: rgba(0,0,0,0.4);
}
footer p {
padding: 5px;
font-size: 14px;
color: #dddddd;
}

View File

@@ -0,0 +1,64 @@
header {
position: fixed;
z-index: 99;
top: 0;
left: 0;
height: 80px;
width: 100%;
color: white;
background-color: rgba(132,86,99, 0.98);
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}
#header-logo, #header-logo img {
height: 80px;
vertical-align: middle;
line-height: 80px;
padding-left: 5px;
}
#header-search {
padding-left: 48px;
}
#header-search input {
border: none;
}
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 {
cursor: pointer;
}
#profile-menu-popup {
padding: 5px;
background: white;
color: #666;
border-radius: 3px;
}

View File

@@ -0,0 +1,208 @@
::selection {
background: #845663;
color: white;
}
::-moz-selection {
background: #845663;
color: white;
}
a, a:link, a:visited, a:hover, a:active {
color: inherit;
text-decoration: none;
}
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;
position: absolute;
left: 0;
top: 100%;
z-index: 20;
white-space: nowrap;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
-moz-box-shadow: 0px 0px 4px #222;
-webkit-box-shadow: 0px 0px 4px #222;
box-shadow: 0px 0px 4px #222;
background-color: #333;
font-size: 15px;
line-height: normal;
font-family: Arial, sans-serif;
}
/* Add Zoom Animation */
.animate {
animation: animatezoom 0.6s
-webkit-animation: animatezoom 0.6s;
}
/* Body */
body {
height: 100%;
background-color: #B78996;
color: #333;
font-family: Arial, sans-serif;
}
/* stijl voor alle buttons */
button {
background-color: #845663;
border: 2px solid black;
border-radius: 12px;
color: white;
cursor: pointer;
height: 50%;
margin: 8px 0;
padding: 14px 20px;
width: 25%;
font-family: Arial;
font-size: 16px;
}
/* The Close Button */
.close {
/* Position it in the top right corner outside of the modal */
color: white;
font-size: 100px;
font-weight: bold;
position: absolute;
right: 25px;
top: 0;
}
/* Close button on hover */
.close:hover,
.close:focus {
color: red;
cursor: pointer;
}
/* inlogform */
form {
background-color: #a87a87;
border: 5px solid #325da3;
border-radius: 12px;
height: 50%;
margin: auto;
width: 55%;
}
/* inlog titel */
h1 {
padding: 16px;
text-align: center;
font-size: 2.2em;
}
/* registreer titel*/
h2 {
padding: 16px;
text-align: left;
font-size: 2.0em;
}
input[type=text], input[type=password], input[type=email], input[type="date"] {
border-radius: 12px;
border: 5px solid #ccc;
box-sizing: border-box;
display: inline-block;
height: 50%;
padding: 12px 20px;
margin: 8px 0;
width: 50%;
font-family: Arial;
font-size: 16px;
}
input[type=submit] {
background-color: #845663;
border: 2px solid black;
border-radius: 12px;
color: white;
cursor: pointer;
height: 50%;
margin: 8px 0;
padding: 14px 20px;
width: 50%;
font-family: Arial;
font-size: 16px;
}
label {
display: block;
}
/* padding voor registreer container */
.login_containerregister {
padding: 16px;
text-align: left;
}
/* padding voor login_containers */
.login_containerlogin {
padding: 16px;
text-align: center;
}
/* The Modal (background) */
.modal {
background-color: rgb(0,0,0); /* Fallback color */
background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
display: none; /* Hidden by default */
height: 100%;
left: 0;
margin: auto;
overflow: auto; /* Enable scroll if needed */
padding-top: 60px;
position: fixed; /* Stay in place */
top: 0;
width: 100%; /* Full width */
z-index: 1; /* Sit on top */
}
/* Modal Content/Box */
.modal-content {
background-color: #B78996;
border: 5px solid #325da3;
margin: 5px auto; /* 15% from the top and centered */
overflow-y: auto;
width: 40%; /* Could be more or less, depending on screen size */
height: 80%;
}
@keyframes animatezoom {
from {transform: scale(0)}
to {transform: scale(1)}
}
/* datepicker */
select {
border-radius: 12px;
border: 5px solid #ccc;
box-sizing: border-box;
display: inline-block;
height: 50%;
padding: 12px 20px;
margin: 8px 0;
width: 18%;
font-family: Arial;
font-size: 16px;
}
@-webkit-keyframes animatezoom {
from {-webkit-transform: scale(0)}
to {-webkit-transform: scale(1)}
}
ul {
font-family: Arial;
font-size: 16px;
}

View File

@@ -0,0 +1,210 @@
/*-----------------------------------------------------------------------------
Default Stylesheet
last update: 13-01-2017
Website: myhyvesbookplus.tk
-----------------------------------------------------------------------------*/
/* Remove padding and margin */
* {
margin: 0;
padding: 0;
border: 0;
}
html {
height: 100%;
}
body {
height: 100%;
background-color: #B78996;
color: #333;
font-family: Arial, sans-serif;
}
/* Font sizes */
h1 {
font-size: 2.2em;
}
h2 {
font-size: 2.0em;
}
h3 {
font-size: 1.8em;
}
h4 {
font-size: 1.6em;
}
h5 {
font-size: 1.4em;
}
ul {
list-style-type: none;
}
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;
}
.item-box, .item-box-full-width {
margin: 20px 0 0 0;
padding: 25px;
background-color: #FFFFFF;
}
.item-box {
width: calc(50% - 60px);
}
@media only screen and (max-width: 900px) {
.item-box {
width: calc(100% - 50px);
}
}
.item-box-full-width {
width: calc(100% - 50px);
}
/* 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-size: 16px;
border-radius: 7px;
}
/* All textinput and sections */
textarea, input, select {
padding: 0 5px;
background: white;
color: #333333;
border: 1px solid #845663;
border-radius: 7px;
font-size: 16px;
}
/* All buttons */
button,
input[type="submit"],
input[type="reset"] {
background-color: #845663;
color: white;
padding: 0 10px;
border: none;
}
/* Tables */
table {
border-spacing: 0;
border-collapse: collapse;
}
td {
text-align: left;
font-weight: normal;
}
/* Custom title box, appears instantaneously */
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 {
content: attr(data-title);
padding: 4px 4px;
color: #FFFFFF;
position: absolute;
left: 0;
top: 100%;
z-index: 20;
white-space: nowrap;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
-moz-box-shadow: 0 0 4px #222;
-webkit-box-shadow: 0 0 4px #222;
box-shadow: 0 0 4px #222;
background-color: #333;
font-size: 15px;
line-height: normal;
font-family: Arial, sans-serif;
}

View File

@@ -0,0 +1,27 @@
.menu {
position: fixed;
z-index: 50;
left: 0;
top: 80px;
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);
}
.menu h4 {
padding: 10px;
}
.nav-list li {
padding: 5px 20px;
}
.more-item {
padding: 5px 20px;
color: #666;
font-size: 14px;
cursor: pointer;
}

View File

@@ -0,0 +1,73 @@
.profile-box {
min-height: 150px;
padding: 25px;
background-color: #FFFFFF;
}
.profile-box .profile-picture, .profile-box .group-picture {
width: 150px;
height: 150px;
margin: 0 20px 20px 0;
}
.profile-box .profile-username {
padding-top: 50px;
}
.posts {
z-index: -1;
margin-right: 0;
width: calc(100% + 15px);
}
.post-box {
display: inline-flex;
margin: 20px 15px 0 0;
padding: 25px;
background-color: #FFFFFF;
}
/* fullscreen */
.post-box {
width: calc(25% - 69px);
}
@media only screen and (max-width: 1500px) {
.post-box {
width: calc(50% - 68px);
}
}
/* mobile */
@media only screen and (max-width: 1000px) {
.post-box {
width: calc(100% - 65px);
}
}
.post {
width: 100%;
}
.post img {
width: 100%;
}
.post .post-date {
float: right;
color: #aaaaaa;
font-size: 0.8em;
}
.profile-button {
float: right;
padding: 10px;
border-radius: 5px;
background-color: #845663;
color: #FFFFFF;
transition-duration: 250ms;
}
.profile-button:hover {
background-color: #B78996;
}

View File

@@ -0,0 +1,12 @@
.search-output {
width: calc(50% - 48px);
display: inline-flex;
}
.search-output:nth-child(n) {
display: inline-block;
}
#search-friends-output {
margin-right: 10px;
}

View File

@@ -0,0 +1,34 @@
.settings .item-box {
display: inline-flex;
}
.settings-password {
margin-right: 15px;
}
.settings li {
margin: 5px;
}
.settings textarea {
resize: none;
}
.settings label {
width: 175px;
display: inline-block;
text-align: right;
}
/* All the fields for typing things. */
.settings input[type="password"],
.settings input[type="text"],
.settings input[type="date"],
.settings input[type="email"] {
width: 200px;
}
.settings textarea {
width: calc(100% - 350px);
}