From a584761cca0cfc652560cd1728ae129ed3abed74 Mon Sep 17 00:00:00 2001 From: Sylvain Lehmann Date: Fri, 28 May 2021 18:16:28 +0200 Subject: [PATCH 1/3] feature: add poll notification template --- src/views/partials/notifications.pug | 3 ++- src/views/partials/notifications/message-poll.pug | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 src/views/partials/notifications/message-poll.pug diff --git a/src/views/partials/notifications.pug b/src/views/partials/notifications.pug index 93f7eef..b17336d 100644 --- a/src/views/partials/notifications.pug +++ b/src/views/partials/notifications.pug @@ -2,4 +2,5 @@ include notifications/message-circle.pug include notifications/message-project.pug -include notifications/message-private.pug \ No newline at end of file +include notifications/message-private.pug +include notifications/message-poll.pug diff --git a/src/views/partials/notifications/message-poll.pug b/src/views/partials/notifications/message-poll.pug new file mode 100644 index 0000000..26d0301 --- /dev/null +++ b/src/views/partials/notifications/message-poll.pug @@ -0,0 +1,7 @@ +solid-notifications-template(data-rdf-type='sib:poll') + template + .solid-notification__avatar + | ${await author['account.picture'] ? `` : ``} + .solid-notification__content + .solid-notification__title ${await author.name} + p.solid-notification__summary ${summary} From af388ae0efbf51242630046fcfab4fc0fd2eca20 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Thu, 24 Jun 2021 14:34:53 +0200 Subject: [PATCH 2/3] fix: messages - ellipsis for header's name --- src/styles/chat/_index.scss | 41 ++++++++++++++++++++++++++++++++++--- src/views/page-messages.pug | 2 +- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/src/styles/chat/_index.scss b/src/styles/chat/_index.scss index f3a202a..373240a 100644 --- a/src/styles/chat/_index.scss +++ b/src/styles/chat/_index.scss @@ -1,7 +1,42 @@ -.chat-view { - height: calc(100vh - 50px - 78px); +#messages { + + .chat-view { + height: calc(100vh - 50px - 78px); + } @media (max-width: 768px) { - height: calc(100vh - 50px - 68px); + + 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; + } } } diff --git a/src/views/page-messages.pug b/src/views/page-messages.pug index a3b2e46..d89d442 100644 --- a/src/views/page-messages.pug +++ b/src/views/page-messages.pug @@ -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)' From 24bb8d54a6c04b38db02607bc4ff9077cb423c3e Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 28 Jun 2021 15:44:05 +0200 Subject: [PATCH 3/3] fix: left menu - button to remove SO doesn't take too much space --- src/styles/left-nav/_index.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/styles/left-nav/_index.scss b/src/styles/left-nav/_index.scss index 9773c79..346d9b5 100644 --- a/src/styles/left-nav/_index.scss +++ b/src/styles/left-nav/_index.scss @@ -226,7 +226,7 @@ nav#main__menu { orbit-menu-contact-removed { display: none; button { - visibility: hidden; + display: contents; } } @@ -253,7 +253,7 @@ nav#main__menu { position: relative; top: -28px; display: block; - left: calc(100% - 47px); + left: calc(100% - 50px); padding-top: 5px; button {