Merge branch 'hendrik-testing' into 'master'

Hendrik testing

See merge request !30
This commit was merged in pull request #34.
This commit is contained in:
Marijn Jansen
2017-01-13 10:38:54 +01:00
2 changed files with 29 additions and 17 deletions

View File

@@ -1,15 +1,31 @@
.admin-panel {
.platform {
margin: auto;
background-color: white;
border-radius: 10px;
padding: 15px;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
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;
margin: 10px;
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 {
@@ -19,8 +35,6 @@
}
.admin-searchinput {
border: 2px solid #B78996;
border-radius: 2px;
margin-bottom: 10px;
}
@@ -57,7 +71,3 @@
.usertable tr:hover {
background-color: #f5f5f5;
}
/*div {
border: 1px solid black;
}*/

View File

@@ -18,10 +18,13 @@
</head>
<body>
<div class="content">
<div class="admin-panel">
<form action="index.html" method="post">
<div class="platform">
<div class="admin-title">
<h1>User Management Panel</h1>
</div> <br>
<form action="admin.php" method="post">
<div class="admin-options">
<form action="index.html" method="post">
<form action="admin.php" method="post">
<div class="admin-searchbar">
<h2>Search</h2>
<input type="text" name="search" class="admin-searchinput"> <br>
@@ -35,7 +38,7 @@
</div>
</form>
<div class="admin-actions">
<h2>Actions: </h2>
<h2>Batch Actions: </h2>
<input type="radio" name="actions" value="mute"> Mute <br>
<input type="radio" name="actions" value="ban"> Ban <br>
<input type="radio" name="actions" value="unban"> Unban <br> <br>
@@ -87,7 +90,6 @@
</form>
</td>
</tr>
</table>
</div>
</form>