Merge branch 'hendrik-testing' into 'master'

Hendrik testing

See merge request !32
This commit was merged in pull request #36.
This commit is contained in:
Marijn Jansen
2017-01-13 10:53:26 +01:00
2 changed files with 3 additions and 11 deletions

View File

@@ -1,4 +1,4 @@
.platform { .admin-panel {
margin: auto; margin: auto;
min-width: 800px; min-width: 800px;
} }
@@ -9,13 +9,7 @@
border-bottom: 4px solid #845663; border-bottom: 4px solid #845663;
} }
/*.admin-panel input[type="submit"], button { .admin-panel input[type="radio"], input[type="checkbox"] {
background-color: #845663;
color: white;
padding: 5px;
}*/
input[type="radio"], input[type="checkbox"] {
height: auto; height: auto;
} }
@@ -45,7 +39,6 @@ input[type="radio"], input[type="checkbox"] {
margin-right: 100px; margin-right: 100px;
} }
.admin-users { .admin-users {
margin: 10px; margin: 10px;
} }

View File

@@ -2,7 +2,6 @@
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<link rel="stylesheet" type="text/css" href="astyle.css">
<title>Admin Panel</title> <title>Admin Panel</title>
<script type="text/javascript"> <script type="text/javascript">
function checkAll(allbox) { function checkAll(allbox) {
@@ -18,7 +17,7 @@
</head> </head>
<body> <body>
<div class="content"> <div class="content">
<div class="platform"> <div class="platform admin-panel">
<div class="admin-title"> <div class="admin-title">
<h1>User Management Panel</h1> <h1>User Management Panel</h1>
</div> <br> </div> <br>