From 1c01925ed48570656a703be462f0be4f1a686770 Mon Sep 17 00:00:00 2001 From: Alexander Platov Date: Fri, 13 Jan 2023 06:10:29 +0300 Subject: [PATCH] Update Requests layout, fix UI (#2503) Signed-off-by: Alexander Platov --- packages/text-editor/lang/en.json | 5 ++ packages/text-editor/lang/ru.json | 5 ++ .../src/components/CollaboratorEditor.svelte | 6 +- .../src/components/ReferenceInput.svelte | 70 +++++++++++++------ packages/text-editor/src/plugin.ts | 1 + packages/text-editor/src/types.ts | 10 +++ packages/theme/styles/_layouts.scss | 1 + packages/ui/src/components/Scroller.svelte | 2 + packages/ui/src/components/ShowMore.svelte | 7 +- .../src/components/AttachmentRefInput.svelte | 10 ++- .../src/components/NotificationView.svelte | 4 +- .../src/components/NotificationsPopup.svelte | 1 - plugins/request-assets/lang/en.json | 3 +- plugins/request-assets/lang/ru.json | 3 +- plugins/request-resources/package.json | 3 +- .../src/components/RequestActions.svelte | 35 +++++++--- .../src/components/RequestView.svelte | 10 ++- .../src/components/RequestsPopup.svelte | 14 ++-- .../src/components/icons/Comments.svelte | 38 ++++++++++ .../src/components/icons/DocFail.svelte | 43 ++++++++++++ .../src/components/icons/DocSuccess.svelte | 43 ++++++++++++ plugins/request-resources/src/plugin.ts | 3 +- 22 files changed, 264 insertions(+), 53 deletions(-) create mode 100644 plugins/request-resources/src/components/icons/Comments.svelte create mode 100644 plugins/request-resources/src/components/icons/DocFail.svelte create mode 100644 plugins/request-resources/src/components/icons/DocSuccess.svelte diff --git a/packages/text-editor/lang/en.json b/packages/text-editor/lang/en.json index a002b62751..486c00cba2 100644 --- a/packages/text-editor/lang/en.json +++ b/packages/text-editor/lang/en.json @@ -15,6 +15,11 @@ "Code": "Code", "CodeBlock": "Code block", "GettingWorkDone": "Getting work done", + "Send": "Send", + "Attach": "Attach", + "TextStyle": "Text style", + "Emoji": "Emoji", + "GIF": "GIF", "Smileys": "Smileys", "Nature": "Nature", "Symbols": "Symbols", diff --git a/packages/text-editor/lang/ru.json b/packages/text-editor/lang/ru.json index 6cb42e125f..3c1d0cac8e 100644 --- a/packages/text-editor/lang/ru.json +++ b/packages/text-editor/lang/ru.json @@ -15,6 +15,11 @@ "Code": "Код", "CodeBlock": "Кодовый блок", "GettingWorkDone": "Для работы", + "Send": "Отправить", + "Attach": "Прикреплять", + "TextStyle": "Стиль текста", + "Emoji": "Эмодзи", + "GIF": "GIF", "Smileys": "Смайлики", "Nature": "Природа", "Symbols": "Символы", diff --git a/packages/text-editor/src/components/CollaboratorEditor.svelte b/packages/text-editor/src/components/CollaboratorEditor.svelte index ca447e4329..e37f33d773 100644 --- a/packages/text-editor/src/components/CollaboratorEditor.svelte +++ b/packages/text-editor/src/components/CollaboratorEditor.svelte @@ -468,7 +468,7 @@
{#if isFormatting && !readonly} -
+
{:else} -
+
{/if}
{:else if comparedVersion !== undefined} -
+
-
+
{ cHeight = element.clientHeight @@ -71,7 +71,7 @@ .showMore { position: absolute; left: 50%; - bottom: 0; + bottom: 0.25rem; padding: 0.5rem 1rem; transform: translateX(-50%); @@ -82,11 +82,12 @@ border: 0.5px solid var(--popup-divider); box-shadow: 0px 8px 15px rgba(0, 0, 0, 0.1); border-radius: 2.5rem; + // z-index: 1; user-select: none; cursor: pointer; &.outter { - bottom: -2.75rem; + bottom: 0; transform: translateX(-50%); } &:hover { diff --git a/plugins/attachment-resources/src/components/AttachmentRefInput.svelte b/plugins/attachment-resources/src/components/AttachmentRefInput.svelte index c357c41e6d..e4070adb0f 100644 --- a/plugins/attachment-resources/src/components/AttachmentRefInput.svelte +++ b/plugins/attachment-resources/src/components/AttachmentRefInput.svelte @@ -15,11 +15,13 @@ {#if value.status === RequestStatus.Active} @@ -93,16 +115,11 @@ space={value.space} _class={value._class} objectId={value._id} - showSend={false} + iconSend={Comments} + labelSend={request.string.Comment} on:update={onUpdate} placeholder={request.string.PleaseTypeMessage} + extraActions={approvable ? extraActions : undefined} />
-
-
{/if} diff --git a/plugins/request-resources/src/components/RequestView.svelte b/plugins/request-resources/src/components/RequestView.svelte index 3c575a53cb..b5a1ae3ae5 100644 --- a/plugins/request-resources/src/components/RequestView.svelte +++ b/plugins/request-resources/src/components/RequestView.svelte @@ -63,10 +63,14 @@