Merge branch 'master' into lars-chat

This commit is contained in:
Lars van Hijfte
2017-01-13 12:05:17 +01:00
12 changed files with 379 additions and 246 deletions

View File

@@ -8,7 +8,7 @@ header {
width: 100%;
color: white;
background-color: #845663;
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);
}

View File

@@ -1,6 +1,11 @@
/* Body */
body {
background-color: #B78996;
height: 100%;
background-color: #B78996;
color: #333;
font-family: Arial, sans-serif;
}
/* inlogform */
@@ -17,15 +22,16 @@ form {
h1 {
padding: 16px;
text-align: center;
font-size: 2.2em;
}
/* registreer titel*/
h2 {
padding: 16px;
text-align: left;
font-size: 2.0em;
}
/* text */
label {
display: block;
}
@@ -40,6 +46,8 @@ select {
padding: 12px 20px;
margin: 8px 0;
width: 15%;
font-family: Arial;
font-size: 16px;
}
input[type=text], input[type=password], input[type=email] {
@@ -51,6 +59,8 @@ input[type=text], input[type=password], input[type=email] {
padding: 12px 20px;
margin: 8px 0;
width: 50%;
font-family: Arial;
font-size: 16px;
}
input[type=submit]{
@@ -63,6 +73,8 @@ input[type=submit]{
margin: 8px 0;
padding: 14px 20px;
width: 50%;
font-family: Arial;
font-size: 16px;
}
/* stijl voor alle buttons */
@@ -76,6 +88,8 @@ button {
margin: 8px 0;
padding: 14px 20px;
width: 25%;
font-family: Arial;
font-size: 16px;
}
/* padding voor registreer container */
@@ -149,3 +163,41 @@ button {
from {transform: scale(0)}
to {transform: scale(1)}
}
::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;
}

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;