Skip to content
Snippets Groups Projects
Commit 649533fd authored by Jean-Baptiste Pasquier's avatar Jean-Baptiste Pasquier
Browse files

Merge branch 'master' into release/sxc-149

parents 3fb0d098 7adfce37
No related branches found
No related tags found
1 merge request!213Solid XMPP Chat Upgrade
Pipeline #7504 passed with warnings
...@@ -3,5 +3,6 @@ ...@@ -3,5 +3,6 @@
"defaultCommandTimeout": 60000, "defaultCommandTimeout": 60000,
"chromeWebSecurity": false, "chromeWebSecurity": false,
"viewportWidth": 1920, "viewportWidth": 1920,
"viewportHeight": 1080 "viewportHeight": 1080,
"video": false
} }
...@@ -37,6 +37,21 @@ ...@@ -37,6 +37,21 @@
margin-right: 1rem; 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) { .user-thumb__admin:not(:empty) {
display: block !important; display: block !important;
@extend %tag-admin; @extend %tag-admin;
......
...@@ -4,11 +4,15 @@ solid-widget(name='hubl-circle-team-template') ...@@ -4,11 +4,15 @@ solid-widget(name='hubl-circle-team-template')
template template
solid-display.user-thumb.is-spaced( solid-display.user-thumb.is-spaced(
data-src='${await value.user}' 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}' value-isadmin='${await value.is_admin}'
action-send="messages"
label-send=""
class-account.picture='avatar user-thumb__picture' class-account.picture='avatar user-thumb__picture'
class-name='user-thumb__name' class-name='user-thumb__name'
class-send='user-thumb__send'
class-isadmin='user-thumb__admin' class-isadmin='user-thumb__admin'
class-profile.city='user-thumb__city' class-profile.city='user-thumb__city'
......
include hubl-user-avatar.pug 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') solid-widget(name='hubl-project-team')
template template
solid-display.user-thumb.is-spaced( solid-display.user-thumb.is-spaced(
data-src='${await value}' 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}' 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.name='user-thumb__name'
class-user='user-thumb__send'
class-isadmin='user-thumb__admin' class-isadmin='user-thumb__admin'
class-user.profile.city='user-thumb__city' class-user.profile.city='user-thumb__city'
class-name='user-thumb__lead' class-name='user-thumb__lead'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment