From daf0d06fb557df575d1b24af2c871f9a1492d434 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 22 Jun 2021 16:25:45 +0200 Subject: [PATCH 01/17] fix: dependencies --- package-lock.json | 11 +++-------- package.json | 3 +-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4a751bf..a651abe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1615,15 +1615,10 @@ "physical-cpu-count": "^2.0.0" } }, - "@startinblox/hubl-styling-framework": { - "version": "1.9.8", - "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.9.8.tgz", - "integrity": "sha512-MLKE/4sr74yETmWEgLi7vOLyUiF8znXzqsr8qh7qRuInh3nhm2b09KmvLMY1FY/qTBc/dXP0gH4aibI2BRwFLA==" - }, "@startinblox/orbit-styling-framework": { - "version": "1.9.9", - "resolved": "https://registry.npmjs.org/@startinblox/orbit-styling-framework/-/orbit-styling-framework-1.9.9.tgz", - "integrity": "sha512-Y57drIGwsKwEHUOvoZEuJGP9mW58r0BBHgAaJZfzbFXfAKGEu9U2fPBFzQneApDBotBo+6IWmrfCTQz3uo4weQ==" + "version": "1.9.10", + "resolved": "https://registry.npmjs.org/@startinblox/orbit-styling-framework/-/orbit-styling-framework-1.9.10.tgz", + "integrity": "sha512-cRo8xUhIZqk4Op+2RjnR7NIc2NZaGhIQRt90LkhnroNJk4D7SwEgA5bZfk/EgCOO/UVRRb0Rm7Nx2wW03AMOiw==" }, "@types/node": { "version": "14.17.3", diff --git a/package.json b/package.json index 4d426b6..dfab771 100644 --- a/package.json +++ b/package.json @@ -57,8 +57,7 @@ "clearDist": false }, "dependencies": { - "@startinblox/hubl-styling-framework": "^1.9.8", - "@startinblox/orbit-styling-framework": "^1.9.9", + "@startinblox/orbit-styling-framework": "^1.9.10", "cross-env": "^7.0.3", "fs-extra": "^10.0.0", "normalize.css": "^8.0.1", From 001e98631510acde4e6f2d0987de6ef721befea2 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Thu, 24 Jun 2021 14:34:53 +0200 Subject: [PATCH 02/17] 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 0870ffc310dbe1d1dc3610996aa9485aec204b42 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Thu, 24 Jun 2021 14:34:53 +0200 Subject: [PATCH 03/17] 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 a584761cca0cfc652560cd1728ae129ed3abed74 Mon Sep 17 00:00:00 2001 From: Sylvain Lehmann Date: Fri, 28 May 2021 18:16:28 +0200 Subject: [PATCH 04/17] 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 516714d634ef3780965c912a2ff0f25fdc37b0d0 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 28 Jun 2021 15:44:05 +0200 Subject: [PATCH 05/17] 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 { From af388ae0efbf51242630046fcfab4fc0fd2eca20 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Thu, 24 Jun 2021 14:34:53 +0200 Subject: [PATCH 06/17] 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 07/17] 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 { From 35d6a2f74e4af8bd3c81e93c0b508a6ddbc80c1e Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Tue, 29 Jun 2021 16:29:29 +0200 Subject: [PATCH 08/17] fix: left menu - button to remove SO ok on Firefox too --- src/styles/left-nav/_index.scss | 5 +---- src/views/partials/widgets/orbit-menu-contact-removed.pug | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/styles/left-nav/_index.scss b/src/styles/left-nav/_index.scss index 346d9b5..c96e381 100644 --- a/src/styles/left-nav/_index.scss +++ b/src/styles/left-nav/_index.scss @@ -225,9 +225,6 @@ nav#main__menu { orbit-menu-contact-removed { display: none; - button { - display: contents; - } } &:hover { @@ -253,7 +250,7 @@ nav#main__menu { position: relative; top: -28px; display: block; - left: calc(100% - 50px); + left: calc(100% - 44px); padding-top: 5px; button { diff --git a/src/views/partials/widgets/orbit-menu-contact-removed.pug b/src/views/partials/widgets/orbit-menu-contact-removed.pug index ed7431b..3fa488b 100644 --- a/src/views/partials/widgets/orbit-menu-contact-removed.pug +++ b/src/views/partials/widgets/orbit-menu-contact-removed.pug @@ -1,5 +1,5 @@ if componentSet.has('chat') solid-widget(name='orbit-menu-contact-removed') template ${value != "" ? ` - ` : ""} + ` : ""} //- Fix: using type confirm, dialog is not available on Firefox, polyfill only works if dialog is a direct child of body \ No newline at end of file From 0f31d94fa0e3daeb3a2417e4fc4c03126623b23f Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 29 Jun 2021 16:37:33 +0000 Subject: [PATCH 09/17] bump: sxc 6.3 --- src/orbit-dependencies.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/orbit-dependencies.pug b/src/orbit-dependencies.pug index 9c9295a..79aac91 100644 --- a/src/orbit-dependencies.pug +++ b/src/orbit-dependencies.pug @@ -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") From b685a26a1611645d8ce32c3740286554295450a9 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Thu, 1 Jul 2021 15:55:14 +0200 Subject: [PATCH 10/17] fix: left menu - alignment between the coungter and the remove button fixed --- src/styles/left-nav/_index.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/styles/left-nav/_index.scss b/src/styles/left-nav/_index.scss index c96e381..4566b88 100644 --- a/src/styles/left-nav/_index.scss +++ b/src/styles/left-nav/_index.scss @@ -260,6 +260,9 @@ nav#main__menu { font-size: 18px; color: white; visibility: visible; + position: relative; + bottom: 1px; + margin-left: 6px; } } } From ec428e56ae0570a2253b43cf6557174cec05555a Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Thu, 24 Jun 2021 14:34:53 +0200 Subject: [PATCH 11/17] 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 ab7e1d92fe7e3fb216e7e77dbfbb103b7c42a23b Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 28 Jun 2021 15:44:05 +0200 Subject: [PATCH 12/17] 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 { From 4629dddf8ff7168273e2f8653fac0e3d37fd67d8 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Tue, 29 Jun 2021 16:29:29 +0200 Subject: [PATCH 13/17] fix: left menu - button to remove SO ok on Firefox too --- src/styles/left-nav/_index.scss | 5 +---- src/views/partials/widgets/orbit-menu-contact-removed.pug | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/styles/left-nav/_index.scss b/src/styles/left-nav/_index.scss index 346d9b5..c96e381 100644 --- a/src/styles/left-nav/_index.scss +++ b/src/styles/left-nav/_index.scss @@ -225,9 +225,6 @@ nav#main__menu { orbit-menu-contact-removed { display: none; - button { - display: contents; - } } &:hover { @@ -253,7 +250,7 @@ nav#main__menu { position: relative; top: -28px; display: block; - left: calc(100% - 50px); + left: calc(100% - 44px); padding-top: 5px; button { diff --git a/src/views/partials/widgets/orbit-menu-contact-removed.pug b/src/views/partials/widgets/orbit-menu-contact-removed.pug index ed7431b..3fa488b 100644 --- a/src/views/partials/widgets/orbit-menu-contact-removed.pug +++ b/src/views/partials/widgets/orbit-menu-contact-removed.pug @@ -1,5 +1,5 @@ if componentSet.has('chat') solid-widget(name='orbit-menu-contact-removed') template ${value != "" ? ` - ` : ""} + ` : ""} //- Fix: using type confirm, dialog is not available on Firefox, polyfill only works if dialog is a direct child of body \ No newline at end of file From a01d6497a010ea205b4fa9aebafa8c036b5590bc Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Thu, 1 Jul 2021 15:55:14 +0200 Subject: [PATCH 14/17] fix: left menu - alignment between the coungter and the remove button fixed --- src/styles/left-nav/_index.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/styles/left-nav/_index.scss b/src/styles/left-nav/_index.scss index c96e381..4566b88 100644 --- a/src/styles/left-nav/_index.scss +++ b/src/styles/left-nav/_index.scss @@ -260,6 +260,9 @@ nav#main__menu { font-size: 18px; color: white; visibility: visible; + position: relative; + bottom: 1px; + margin-left: 6px; } } } From da8e7f84ed9257ee726a5857ef6e08a32b223cb5 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Fri, 2 Jul 2021 11:38:43 +0200 Subject: [PATCH 15/17] fix: chat - height fixed --- src/styles/chat/_index.scss | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/styles/chat/_index.scss b/src/styles/chat/_index.scss index 373240a..46b4ae5 100644 --- a/src/styles/chat/_index.scss +++ b/src/styles/chat/_index.scss @@ -1,8 +1,12 @@ -#messages { - - .chat-view { - height: calc(100vh - 50px - 78px); +.chat-view { + height: calc(100vh - 50px - 78px); + + @media (max-width: 768px) { + height: calc(100vh - 50px - 68px); } +} + +.message-header { @media (max-width: 768px) { From d5065aa77f7eb4e555ab874cb9dd3ddbb1c012d4 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Fri, 2 Jul 2021 11:50:39 +0200 Subject: [PATCH 16/17] fix: chat - height fixed --- src/styles/chat/_index.scss | 41 +++---------------------------------- 1 file changed, 3 insertions(+), 38 deletions(-) diff --git a/src/styles/chat/_index.scss b/src/styles/chat/_index.scss index 227d8de..46b4ae5 100644 --- a/src/styles/chat/_index.scss +++ b/src/styles/chat/_index.scss @@ -1,43 +1,8 @@ -#messages { - - .chat-view { - height: calc(100vh - 50px - 78px); - } +.chat-view { + height: calc(100vh - 50px - 78px); @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; - } + height: calc(100vh - 50px - 68px); } } From b61eb222b823c28fedb1d7b20a4911161bad603d Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Fri, 2 Jul 2021 14:27:23 +0200 Subject: [PATCH 17/17] fix: chat - height fixed for one-to-one messages --- src/styles/chat/_index.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/chat/_index.scss b/src/styles/chat/_index.scss index 46b4ae5..9d9224d 100644 --- a/src/styles/chat/_index.scss +++ b/src/styles/chat/_index.scss @@ -6,7 +6,7 @@ } } -.message-header { +#messages { @media (max-width: 768px) {