MyHyvesBookPlus/WebDB
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Kevin prototype #35

Merged
11319801 merged 42 commits from kevin-prototype into master 2017-01-13 10:47:48 +01:00
Conversation 2 Commits 42 Files Changed 20 -10
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 58779a3d4d - Show all commits

10
website/styles/adminpanel.css
View File

@@ -6,18 +6,12 @@
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
} }
<<<<<<< Updated upstream
=======
.admin-title { .admin-title {
margin: 10px; margin: 10px;
/*color: #845663;*/
/*color: white;*/
/*text-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);*/
padding-bottom: 5px; padding-bottom: 5px;
border-bottom: 4px solid #845663; border-bottom: 4px solid #845663;
} }
>>>>>>> Stashed changes
.admin-panel input[type="submit"], button { .admin-panel input[type="submit"], button {
background-color: #845663; background-color: #845663;
color: white; color: white;
@@ -78,7 +72,3 @@
.usertable tr:hover { .usertable tr:hover {
background-color: #f5f5f5; background-color: #f5f5f5;
} }
/*div {
border: 1px solid black;
}*/