autonomic-cooperative/hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'staging' into circle-perf-fix

Browse Source
This commit is contained in:
Jean-Baptiste Pasquier 2020-01-24 17:58:43 +01:00
commit e4d9fae0f3
No known key found for this signature in database
GPG Key ID: F2702E6D22ED4D62
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/styles/components/tags.scss
View File

@ -15,5 +15,6 @@
font-size: 1.4rem; font-size: 1.4rem;
font-weight: 400; font-weight: 400;
margin-left: 0.6rem; margin-left: 0.6rem;
margin-top: -2px;
padding: 0.3rem 0.98rem; padding: 0.3rem 0.98rem;
} }

4
src/styles/layout/project-profile/project-profile.scss
View File

@ -107,6 +107,10 @@
@extend %tag-role; @extend %tag-role;
} }
} }
.tag-admin:not(:empty) {
@extend %tag-admin;
}
} }
>[name='sub'] { >[name='sub'] {

9
src/templates/hd-project-team.pug
View File

@ -4,22 +4,23 @@ sib-widget(name='hd-project-team')
template template
sib-display( sib-display(
data-src='${await value}' data-src='${await value}'
fields='user.account.picture, sup(user.name, is_admin, user.groups), sub(user.profile.city, name)' fields='user.account.picture, sup(user.name, isadmin, user.groups), sub(user.profile.city, name)'
value-isadmin='${await value.is_admin}'
class-user.name='user-name' class-user.name='user-name'
class-is_admin='tag-admin' class-isadmin='tag-admin'
class-user.groups='tag-group' class-user.groups='tag-group'
class-user.profile.city='city' class-user.profile.city='city'
widget-user.account.picture='hd-user-avatar' widget-user.account.picture='hd-user-avatar'
widget-is_admin='hd-project-user-admin' widget-isadmin='hd-project-user-admin'
widget-user.groups='hd-project-user-groups' widget-user.groups='hd-project-user-groups'
multiple-user.groups='' multiple-user.groups=''
) )
sib-widget(name='hd-project-user-admin') sib-widget(name='hd-project-user-admin')
template ${await value ? "Administrator" : ""} template ${(await value) == "false" ? "" : "Administrator"}
sib-widget(name='hd-project-user-groups') sib-widget(name='hd-project-user-groups')
template ${await value.name} template ${await value.name}