Merge branch 'master' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into marijn-chat

This commit is contained in:
Marijn Jansen
2017-01-11 15:26:46 +01:00
6 changed files with 203 additions and 0 deletions

View File

@@ -35,6 +35,7 @@ body {
}
.content {
padding: 20px;
margin-top: 80px;
margin-left: 256px;
min-height: 100%;
@@ -117,3 +118,26 @@ td {
text-align: left;
font-weight: normal;
}
/* Custom title box, appears instantaneously */
a:hover {
position: relative;
}
a[data-title]:hover:after {
content: attr(data-title);
padding: 4px 4px;
color: #FFFFFF;
position: absolute;
left: 0;
top: 100%;
z-index: 20;
white-space: nowrap;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
-moz-box-shadow: 0px 0px 4px #222;
-webkit-box-shadow: 0px 0px 4px #222;
box-shadow: 0px 0px 4px #222;
background-color: #333;
}

View File

@@ -0,0 +1,62 @@
.profile-box, .item-box, .post-box {
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}
.profile-box {
min-height: 150px;
padding: 25px;
background-color: #FFFFFF;
}
.profile-box .profile-picture {
width: 150px;
height: 150px;
margin: 0 20px 20px 0;
}
.profile-box .profile-username {
padding-top: 50px;
}
.item-box {
width: calc(50% - 60px);
margin: 20px 0 0 0;
padding: 25px;
background-color: #FFFFFF;
}
.posts {
background-color: red;
margin-top: 20px;
}
.post-box {
float: left;
width: 250px;
margin: 20px 20px 0 0;
padding: 25px;
background-color: #FFFFFF;
}
.post-box img {
width: 250px;
}
.post-box .post-date {
float: right;
color: #aaaaaa;
font-size: 0.8em;
}
.friend-request {
float: right;
padding: 10px;
border-radius: 3px;
background-color: #845663;
color: #FFFFFF;
transition-duration: 250ms;
}
.friend-request:hover {
background-color: #B78996;
}