Merge branch 'master' into kevin-prototype

This commit is contained in:
K. Nobel
2017-01-13 10:42:39 +01:00
20 changed files with 762 additions and 188 deletions

View File

@@ -0,0 +1,73 @@
.platform {
margin: auto;
min-width: 800px;
}
.admin-title {
margin: 10px;
padding-bottom: 5px;
border-bottom: 4px solid #845663;
}
/*.admin-panel input[type="submit"], button {
background-color: #845663;
color: white;
padding: 5px;
}*/
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 {
display: inline-block;
margin: 10px;
vertical-align: top;
margin-right: 100px;
}
.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

@@ -19,9 +19,7 @@
}
.chat-recent, .chat-history {
border-radius: 20px;
width: 100%;
background-color: white;
}
/* List of chats. */
@@ -47,7 +45,7 @@
.chat-history {
overflow-y: auto;
height: 100%;
padding-bottom: 10px;
padding: 0 0 10px 0;
}
.chat-message {
@@ -80,20 +78,35 @@
/* Chat reply field */
.chat-field {
padding: 15px;
width: 100%;
padding: 15px 0;
display: table;
}
.chat-field input {
border-radius: 8px;
.chat-field form {
width: 100%;
overflow: hidden;
}
.chat-field span {
display: block;
overflow: hidden;
}
.chat-field input[type="text"] {
width: calc(100% - 80px);
width: 100%;
border-top-left-radius: 10px;
border-bottom-left-radius: 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: 60px;
width: auto;
float: right;
background-color: #845663;
color: white;
padding: 5px;
padding: 5px 10px;
border-top-right-radius: 10px;
border-bottom-right-radius: 10px;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}

View File

@@ -26,16 +26,13 @@ header {
}
#header-search input[type="text"] {
padding: 5px 10px;
height: 19px;
border-top-left-radius: 3px;
border-bottom-left-radius: 3px;
}
#header-search input[type="submit"] {
margin: 0 0 0 -4px;
padding: 5px;
#header-search input[type="submit"] {
background: none;
color: white;
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
}

View File

@@ -3,31 +3,45 @@ body {
background-color: #B78996;
}
/* Bordered form */
/* inlogform */
form {
background-color: #a87a87;
border: 5px solid #325da3;
border-radius: 12px;
height: 50%;
margin: auto;
width: 45%;
width: 55%;
}
/* inlog titel */
h1 {
padding: 16px;
text-align: center;
}
/* registreer titel*/
h2 {
padding: 16px;
text-align: left;
}
/* text */
label {
display: block;
}
/* Full-width inputs */
/* 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: 15%;
}
input[type=text], input[type=password], input[type=email] {
border-radius: 12px;
border: 5px solid #ccc;
@@ -51,7 +65,7 @@ input[type=submit]{
width: 50%;
}
/* Set a style for all buttons */
/* stijl voor alle buttons */
button {
background-color: #845663;
border: 2px solid black;
@@ -64,13 +78,14 @@ button {
width: 25%;
}
/* Add padding to containers */
.container {
/* padding voor registreer container */
.login_containerregister {
padding: 16px;
text-align: left;
}
.containercenter {
/* padding voor login_containers */
.login_containerlogin {
padding: 16px;
text-align: center;
}
@@ -97,7 +112,8 @@ button {
border: 5px solid #325da3;
margin: 5px auto; /* 15% from the top and centered */
overflow-y: auto;
width: 50% /* Could be more or less, depending on screen size */
width: 40%; /* Could be more or less, depending on screen size */
height: 80%;
}
/* The Close Button */

View File

@@ -43,6 +43,7 @@ body {
.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);
@@ -65,11 +66,6 @@ body {
border: 0;
}
input[type="text"] {
padding: 5px;
}
/* Move element down (clear), below floating elements */
.clear {
clear: both;
@@ -106,6 +102,10 @@ h5 {
font-size: 1.4em;
}
ul {
list-style-type: none;
}
p {
font-size: 1.2em;
}
@@ -115,6 +115,36 @@ a, a:link, a:visited, a:hover, a:active {
text-decoration: none;
}
button, input, select {
width: auto;
height: 32px;
cursor: pointer;
border: none;
font-family: Arial, sans-serif;
font-size: 16px;
border-radius: 7px;
}
textarea, input, select {
padding: 0 5px;
background: white;
color: #333333;
border: 1px solid #845663;
border-radius: 7px;
font-size: 16px;
}
button, input[type="submit"], input[type="reset"] {
background-color: #845663;
color: white;
padding: 0 10px;
border: none;
}
/* Tables */
table {
border-spacing: 0;
@@ -144,9 +174,9 @@ div[data-title]:hover:after{
-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;
-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;

View File

@@ -0,0 +1,3 @@
.search-form input {
border-bottom: #845663 solid 1px;
}

View File

@@ -0,0 +1,19 @@
.settings input,
.settings textarea{
margin: 5px;
}
.settings label {
width: 125px;
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"],
.settings textarea {
width: 200px;
}