From daf0d06fb557df575d1b24af2c871f9a1492d434 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 22 Jun 2021 16:25:45 +0200 Subject: [PATCH 1/2] 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 0870ffc310dbe1d1dc3610996aa9485aec204b42 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Thu, 24 Jun 2021 14:34:53 +0200 Subject: [PATCH 2/2] 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)'