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

Merge remote-tracking branch 'origin/master' into feature/3b-improvements

This commit is contained in:
Jean-Baptiste Pasquier 2021-07-05 17:12:28 +02:00
parent 74b8de9ac9 b61eb222b8
commit 65232573c1
7 changed files with 55 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/orbit-dependencies.pug
View File

@ -17,7 +17,7 @@ if componentSet.has("autoLogin") || componentSet.has("registering")
//- script(type="module" src="/lib/sib-auth/index.js" defer)
if componentSet.has("chat") || componentSet.has("circles") || componentSet.has("projects")
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-chat@6.2" defer)
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-chat@6.3" defer)
//- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer)
if componentSet.has("communities")

39
src/styles/chat/_index.scss
View File

@ -5,3 +5,42 @@
height: calc(100vh - 50px - 68px);
}
}
#messages {
@media (max-width: 768px) {
height: calc(100vh - 50px - 58px);
.messages-header {
display: flex;
}
solid-set-default[name="segment2"] {
font-size: 14px;
line-height: 16px;
width: 75%;
}
orbit-user-avatar {
height: 31px;
width: 31px;
}
solid-display-value[name="name"] {
display: block;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
max-width: 210px;
}
solid-display-value[name="hyphen"] {
display: none;
}
solid-link {
vertical-align: super;
}
}
}

8
src/styles/left-nav/_index.scss
View File

@ -225,9 +225,6 @@ nav#main__menu {
orbit-menu-contact-removed {
display: none;
button {
visibility: hidden;
}
}
&:hover {
@ -253,7 +250,7 @@ nav#main__menu {
position: relative;
top: -28px;
display: block;
left: calc(100% - 47px);
left: calc(100% - 44px);
padding-top: 5px;
button {
@ -263,6 +260,9 @@ nav#main__menu {
font-size: 18px;
color: white;
visibility: visible;
position: relative;
bottom: 1px;
margin-left: 6px;
}
}
}

2
src/views/page-messages.pug
View File

@ -1,4 +1,4 @@
div.segment.full.padding-top-small.padding-right-large.padding-bottom-small.padding-left-large.sm-padding-xsmall.border-bottom.border-color-grey.whitespace-normal.bg-color-white
div.segment.full.padding-top-small.padding-right-large.padding-bottom-small.padding-left-large.sm-padding-xxsmall.border-bottom.border-color-grey.whitespace-normal.bg-color-white.message-header
solid-display.labelled-avatar.small(
bind-resources
fields='segment1(account.picture), segment2(name, hyphen, at, username)'

3
src/views/partials/notifications.pug
View File

@ -2,4 +2,5 @@
include notifications/message-circle.pug
include notifications/message-project.pug
include notifications/message-private.pug
include notifications/message-private.pug
include notifications/message-poll.pug

7
src/views/partials/notifications/message-poll.pug Normal file
View File

@ -0,0 +1,7 @@
solid-notifications-template(data-rdf-type='sib:poll')
template
.solid-notification__avatar
| ${await author['account.picture'] ? `<img src="${await author['account.picture']}" style="max-width:100%; max-height: 100%;" />` : `<img src="/images/alien.webp" />`}
.solid-notification__content
.solid-notification__title ${await author.name}
p.solid-notification__summary ${summary}

2
src/views/partials/widgets/orbit-menu-contact-removed.pug
View File

@ -1,5 +1,5 @@
if componentSet.has('chat')
solid-widget(name='orbit-menu-contact-removed')
template ${value != "" ? `
<solid-delete class="menu-delete-button button-remove icon children-icon-close" data-src='${value}' data-label="" confirmation-type="confirm" confirmation-message="Vous êtes sur le point de retirer ce contact. Etes-vous sûr ?" confirmation-submit-text="Oui, valider" confirmation-cancel-text="Non, c'est une erreur" confirmation-submit-class="segment sm-full text-center button text-xsmall text-bold text-uppercase reversed color-secondary bordered padding-right-medium padding-left-medium margin-right-xsmall sm-margin-right-none sm-margin-bottom-medium" confirmation-cancel-class="segment sm-full text-center button text-xsmall text-bold text-uppercase color-secondary bordered padding-right-medium padding-left-medium margin-left-xsmall sm-margin-left-none"></solid-delete>` : ""}
<solid-delete class="menu-delete-button button-remove icon children-icon-close" data-src='${value}' data-label="d" confirmation-type="confirm" confirmation-message="Vous êtes sur le point de retirer ce contact. Etes-vous sûr ?" confirmation-submit-text="Oui, valider" confirmation-cancel-text="Non, c'est une erreur" confirmation-submit-class="segment sm-full text-center button text-xsmall text-bold text-uppercase reversed color-secondary bordered padding-right-medium padding-left-medium margin-right-xsmall sm-margin-right-none sm-margin-bottom-medium" confirmation-cancel-class="segment sm-full text-center button text-xsmall text-bold text-uppercase color-secondary bordered padding-right-medium padding-left-medium margin-left-xsmall sm-margin-left-none"></solid-delete>` : ""}
//- Fix: using type confirm, dialog is not available on Firefox, polyfill only works if dialog is a direct child of body