Merge branch 'master' into release/sxc-149
This commit is contained in:
		@ -3,5 +3,6 @@
 | 
			
		||||
    "defaultCommandTimeout": 60000,
 | 
			
		||||
    "chromeWebSecurity": false,
 | 
			
		||||
    "viewportWidth": 1920,
 | 
			
		||||
    "viewportHeight": 1080
 | 
			
		||||
    "viewportHeight": 1080,
 | 
			
		||||
    "video": false
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -37,6 +37,21 @@
 | 
			
		||||
  margin-right: 1rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.user-thumb__send {
 | 
			
		||||
  position: relative;
 | 
			
		||||
  bottom: 7px;
 | 
			
		||||
  left: -5px;
 | 
			
		||||
 | 
			
		||||
  solid-link {
 | 
			
		||||
    @include icon('speech');
 | 
			
		||||
 | 
			
		||||
    &::before {
 | 
			
		||||
      display: inline-block;
 | 
			
		||||
      color: #FF6765;
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.user-thumb__admin:not(:empty) {
 | 
			
		||||
  display: block !important;
 | 
			
		||||
  @extend %tag-admin;
 | 
			
		||||
 | 
			
		||||
@ -4,11 +4,15 @@ solid-widget(name='hubl-circle-team-template')
 | 
			
		||||
  template
 | 
			
		||||
    solid-display.user-thumb.is-spaced(
 | 
			
		||||
      data-src='${await value.user}'
 | 
			
		||||
      fields='account.picture, sup(name, isadmin), sub(profile.city)'
 | 
			
		||||
      fields='account.picture, sup(name, send, isadmin), sub(profile.city)'
 | 
			
		||||
      value-isadmin='${await value.is_admin}'
 | 
			
		||||
 | 
			
		||||
      action-send="messages"
 | 
			
		||||
      label-send=""
 | 
			
		||||
 | 
			
		||||
      class-account.picture='avatar user-thumb__picture'
 | 
			
		||||
      class-name='user-thumb__name'
 | 
			
		||||
      class-send='user-thumb__send'
 | 
			
		||||
      class-isadmin='user-thumb__admin'
 | 
			
		||||
      class-profile.city='user-thumb__city'
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -1,15 +1,21 @@
 | 
			
		||||
include hubl-user-avatar.pug
 | 
			
		||||
 | 
			
		||||
solid-widget(name='hubl-project-team-contact')
 | 
			
		||||
  template 
 | 
			
		||||
    solid-link(data-src='\${value}', next='messages')
 | 
			
		||||
 | 
			
		||||
solid-widget(name='hubl-project-team')
 | 
			
		||||
  template
 | 
			
		||||
    solid-display.user-thumb.is-spaced(
 | 
			
		||||
      data-src='${await value}'
 | 
			
		||||
      fields='user.account.picture, sup(user.name, isadmin), sub(user.profile.city, name)'
 | 
			
		||||
      fields='user.account.picture, sup(user.name, user, isadmin), sub(user.profile.city, name)'
 | 
			
		||||
      value-isadmin='${await value.is_admin}'
 | 
			
		||||
 | 
			
		||||
      class-user.account.picture='avatar user-thumb__picture'
 | 
			
		||||
      widget-user='hubl-project-team-contact'
 | 
			
		||||
 | 
			
		||||
      class-user.account.picture='avatar user-thumb__picture'
 | 
			
		||||
      class-user.name='user-thumb__name'
 | 
			
		||||
      class-user='user-thumb__send'
 | 
			
		||||
      class-isadmin='user-thumb__admin'
 | 
			
		||||
      class-user.profile.city='user-thumb__city'
 | 
			
		||||
      class-name='user-thumb__lead'
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user