Merge branch 'joey-testing' into 'master'

Joey testing

See merge request !164
This commit was merged in pull request #168.
This commit is contained in:
Lars van Hijfte
2017-02-01 12:29:29 +01:00
84 changed files with 11172 additions and 88 deletions

View File

@@ -10,6 +10,19 @@ a.button {
}
a.fbButton {
background-color: #3B5998;
border-radius: 5px;
color: black;
cursor: pointer;
padding: 8px 20px;
font-family: Arial;
font-size: 22px;
color: white;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}
/* Body */
body {
height: 100%;
@@ -28,7 +41,7 @@ body {
form {
/*background-color: #a87a87;*/
border-radius: 12px;
height: 85%;
height: 80%;
margin: auto;
width: 600px;
overflow-y: auto;
@@ -154,7 +167,7 @@ ul {
display: none; /* Hidden by default */
position: fixed; /* Stay in place */
z-index: 1; /* Sit on top */
padding-top: 30px; /* Location of the box */
padding-top: 75px; /* Location of the box */
left: 0;
top: 0;
width: 100%; /* Full width */
@@ -216,6 +229,7 @@ ul {
}
.modal-footer {
padding: 2px 8px;
background-color: #FBC02D;
color: black;
}