From ac4eeb65f7b9685ddf34c980a0afb0e4b0dbf286 Mon Sep 17 00:00:00 2001
From: Alexander Platov <sas_lord@mail.ru>
Date: Wed, 19 Jul 2023 15:45:16 +0300
Subject: [PATCH] UBER-601: fixed accentuation of ObjectPresenter (#3507)
Signed-off-by: Alexander Platov <sas_lord@mail.ru>
---
.../src/components/TxView.svelte | 16 ++++++++--------
.../components/issues/RelationEditorPart.svelte | 11 ++++++-----
.../src/components/ObjectPresenter.svelte | 2 +-
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/plugins/activity-resources/src/components/TxView.svelte b/plugins/activity-resources/src/components/TxView.svelte
index 3c0233ec69..f4d137a1a7 100644
--- a/plugins/activity-resources/src/components/TxView.svelte
+++ b/plugins/activity-resources/src/components/TxView.svelte
@@ -245,9 +245,9 @@
<span class="lower"><Label label={m.label} /></span>
{#each value.added as cvalue}
{#if value.isObjectAdded}
- <ObjectPresenter value={cvalue} inline />
+ <ObjectPresenter value={cvalue} inline accent />
{:else}
- <svelte:component this={m.presenter} value={cvalue} inline />
+ <svelte:component this={m.presenter} value={cvalue} inline accent />
{/if}
{/each}
{:else if value.removed.length}
@@ -256,9 +256,9 @@
<span class="lower"><Label label={m.label} /></span>
{#each value.removed as cvalue}
{#if value.isObjectRemoved}
- <ObjectPresenter value={cvalue} inline />
+ <ObjectPresenter value={cvalue} inline accent />
{:else}
- <svelte:component this={m.presenter} value={cvalue} inline />
+ <svelte:component this={m.presenter} value={cvalue} inline accent />
{/if}
{/each}
{:else if value.set === null || value.set === undefined || value.set === ''}
@@ -272,9 +272,9 @@
<span class="lower"><Label label={activity.string.To} /></span>
<span class="strong overflow-label">
{#if value.isObjectSet}
- <ObjectPresenter value={value.set} inline />
+ <ObjectPresenter value={value.set} inline accent />
{:else}
- <svelte:component this={m.presenter} value={value.set} inline />
+ <svelte:component this={m.presenter} value={value.set} inline accent />
{/if}
</span>
{:else}
@@ -300,9 +300,9 @@
{#if !hasMessageType}
<div class="strong overflow-label">
{#if value.isObjectSet}
- <ObjectPresenter value={value.set} inline />
+ <ObjectPresenter value={value.set} inline accent />
{:else}
- <svelte:component this={m.presenter} value={value.set} inline />
+ <svelte:component this={m.presenter} value={value.set} inline accent />
{/if}
</div>
{/if}
diff --git a/plugins/tracker-resources/src/components/issues/RelationEditorPart.svelte b/plugins/tracker-resources/src/components/issues/RelationEditorPart.svelte
index 474aeb5bb5..ee57d94d45 100644
--- a/plugins/tracker-resources/src/components/issues/RelationEditorPart.svelte
+++ b/plugins/tracker-resources/src/components/issues/RelationEditorPart.svelte
@@ -122,10 +122,11 @@
height: 2rem;
min-width: 0;
min-height: 0;
- border-radius: 0.5rem;
+ border-radius: 0.25rem;
// width: fit-content;
+ border: 1px solid transparent;
&:hover {
- border: 1px solid var(--divider-color);
+ border-color: var(--theme-divider-color);
}
.btn-close {
@@ -133,12 +134,12 @@
margin-left: 0.125rem;
padding: 0 0.25rem 0 0.125rem;
height: 1.75rem;
- color: var(--content-color);
+ color: var(--theme-content-color);
border-left: 1px solid transparent;
&:hover {
- color: var(--caption-color);
- border-left-color: var(--divider-color);
+ color: var(--theme-caption-color);
+ border-left-color: var(--theme-divider-color);
}
}
}
diff --git a/plugins/view-resources/src/components/ObjectPresenter.svelte b/plugins/view-resources/src/components/ObjectPresenter.svelte
index 8bda56ad32..b159c078a2 100644
--- a/plugins/view-resources/src/components/ObjectPresenter.svelte
+++ b/plugins/view-resources/src/components/ObjectPresenter.svelte
@@ -23,7 +23,7 @@
export let value: Doc | RelatedDocument | undefined = undefined
export let props: Record<string, any> = {}
export let inline: boolean = true
- export let accent: boolean = true
+ export let accent: boolean = false
export let shouldShowAvatar: boolean = true
export let noUnderline: boolean = false