Merge branch 'circle-admin' into circle-wip-merge

This commit is contained in:
Jean-Baptiste Pasquier
2019-10-29 14:43:37 +01:00
7 changed files with 83 additions and 11 deletions

View File

@ -273,4 +273,5 @@ sib-delete {
// Other base components
@import 'form';
@import 'header';
@import 'menu-left';
@import 'menu-left';
@import 'user-avatar';

View File

@ -0,0 +1,29 @@
.project-profile-user-avatar {
align-self: center;
grid-column: 1 / span 1;
grid-row: 1 / span 2;
display: inline;
* {
height: 100%;
width: 100%;
}
div {
background-color: $color-0-0-100;
border-radius: 50%;
height: 7vh;
overflow: hidden;
position: relative;
width: 7vh;
img {
height: 100%;
left: 0;
object-fit: cover;
position: absolute;
top: 0;
width: 100%;
}
}
}

View File

@ -1,2 +1,3 @@
@import 'circle-profile';
@import 'circle-edit';
@import 'circle-edit';
@import 'circle-admin';

View File

@ -0,0 +1,3 @@
.circle-admin-join-button select[name='user'] {
display: none;
}

View File

@ -231,13 +231,4 @@
}
}
}
.project-profile-user-avatar {
display: inline;
* {
height: 100%;
width: 100%;
}
}
}