Merge branch 'hendrik-testing' into 'master'

Hendrik testing See merge request !32
2017-01-13 10:53:26 +01:00
parent 7f97d7d35a acb19c2354
commit 661c3c3bce
2 changed files with 3 additions and 11 deletions
--- a/website/styles/adminpanel.css
+++ b/website/styles/adminpanel.css
@@ -1,4 +1,4 @@
-.platform {
+.admin-panel {
    margin: auto;
    min-width: 800px;
 }
@@ -9,13 +9,7 @@
    border-bottom: 4px solid #845663;
 }

-/*.admin-panel input[type="submit"], button {
-    background-color: #845663;
-    color: white;
-    padding: 5px;
-}*/
-
-input[type="radio"], input[type="checkbox"] {
+.admin-panel input[type="radio"], input[type="checkbox"] {
    height: auto;
 }

@@ -45,7 +39,6 @@ input[type="radio"], input[type="checkbox"] {
    margin-right: 100px;
 }

-
 .admin-users {
    margin: 10px;
 }
--- a/website/views/adminpanel.php
+++ b/website/views/adminpanel.php
@@ -2,7 +2,6 @@
 <html>
    <head>
        <meta charset="utf-8">
-        <link rel="stylesheet" type="text/css" href="astyle.css">
        <title>Admin Panel</title>
        <script type="text/javascript">
        function checkAll(allbox) {
@@ -18,7 +17,7 @@
    </head>
    <body>
        <div class="content">
-            <div class="platform">
+            <div class="platform admin-panel">
                <div class="admin-title">
                    <h1>User Management Panel</h1>
                </div> <br>