Merge branch 'staging' into circle-perf-fix
This commit is contained in:
		| @ -15,5 +15,6 @@ | ||||
|   font-size: 1.4rem; | ||||
|   font-weight: 400; | ||||
|   margin-left: 0.6rem; | ||||
|   margin-top: -2px; | ||||
|   padding: 0.3rem 0.98rem; | ||||
| } | ||||
| @ -107,6 +107,10 @@ | ||||
|           @extend %tag-role; | ||||
|         } | ||||
|       } | ||||
|  | ||||
|       .tag-admin:not(:empty) { | ||||
|         @extend %tag-admin; | ||||
|       } | ||||
|     } | ||||
|  | ||||
|     >[name='sub'] { | ||||
|  | ||||
| @ -4,22 +4,23 @@ sib-widget(name='hd-project-team') | ||||
|   template | ||||
|     sib-display( | ||||
|       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-is_admin='tag-admin' | ||||
|       class-isadmin='tag-admin' | ||||
|       class-user.groups='tag-group' | ||||
|       class-user.profile.city='city' | ||||
|  | ||||
|       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' | ||||
|  | ||||
|       multiple-user.groups='' | ||||
|     ) | ||||
|  | ||||
| sib-widget(name='hd-project-user-admin') | ||||
|   template ${await value ? "Administrator" : ""} | ||||
|   template ${(await value) == "false" ? "" : "Administrator"} | ||||
|  | ||||
| sib-widget(name='hd-project-user-groups') | ||||
|   template ${await value.name} | ||||
|  | ||||
		Reference in New Issue
	
	Block a user