From b766ddf6dec80b1ee89123d2997dceb35f4af512 Mon Sep 17 00:00:00 2001 From: Denis Bykhov Date: Thu, 6 Apr 2023 10:54:27 +0600 Subject: [PATCH] Inbox attriubute bar (#2907) Signed-off-by: Denis Bykhov --- packages/theme/styles/panel.scss | 8 +- packages/ui/src/components/Panel.svelte | 113 +++++++++--------- .../src/components/Inbox.svelte | 46 ++++--- 3 files changed, 94 insertions(+), 73 deletions(-) diff --git a/packages/theme/styles/panel.scss b/packages/theme/styles/panel.scss index 69ea0720cd..af721a13e1 100644 --- a/packages/theme/styles/panel.scss +++ b/packages/theme/styles/panel.scss @@ -88,9 +88,11 @@ min-width: 0; min-height: 3rem; background-color: var(--board-card-bg-color); - border: 1px solid var(--divider-color); - border-bottom: none; - border-radius: .5rem .5rem 0 0; + &:not(.embedded) { + border: 1px solid var(--divider-color); + border-bottom: none; + border-radius: .5rem .5rem 0 0; + } } &__content { flex-grow: 1; diff --git a/packages/ui/src/components/Panel.svelte b/packages/ui/src/components/Panel.svelte index 553da4fd34..04a67315a9 100644 --- a/packages/ui/src/components/Panel.svelte +++ b/packages/ui/src/components/Panel.svelte @@ -86,70 +86,73 @@ checkPanel() }} > - {#if !embedded} -
-
- {#if allowClose} +
+
+ {#if allowClose && !embedded} +
- {#if twoRows && !withoutTitle} -
- {/if}
- {/if} + {#if twoRows && !withoutTitle} +
+ {/if} +
{#if $deviceInfo.isMobile} diff --git a/plugins/notification-resources/src/components/Inbox.svelte b/plugins/notification-resources/src/components/Inbox.svelte index 6638d2032b..45479f3631 100644 --- a/plugins/notification-resources/src/components/Inbox.svelte +++ b/plugins/notification-resources/src/components/Inbox.svelte @@ -22,6 +22,8 @@ import view from '@hcengineering/view' import NotificationView from './NotificationView.svelte' + export let visibileNav: boolean + const client = getClient() const hierarchy = client.getHierarchy() const query = createQuery() @@ -73,25 +75,39 @@
-
-
- - + {#if visibileNav} +
+
+ + +
+
+ + {#if loading} + + {:else} + {#each docs as doc} + + {/each} + {/if} + +
- - {#if loading} - - {:else} - {#each docs as doc} - - {/each} - {/if} - -
+ {/if} {#if loading} {:else if component && _id && _class} {/if}
+ +