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;
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;
}