From c1523249a486c5a957f630ae8c1ebba1dd3b4199 Mon Sep 17 00:00:00 2001 From: Andrey Sobolev Date: Mon, 5 Jun 2023 11:12:26 +0700 Subject: [PATCH] UBER-358: Fix icons * Fix inbox colors * Remove Safari Scroll Fix, since it is fixed in latest Safari. Signed-off-by: Andrey Sobolev --- packages/ui/src/components/Scroller.svelte | 19 ----- plugins/contact-assets/assets/icons.svg | 7 +- plugins/notification-assets/assets/icons.svg | 4 +- .../src/components/App.svelte | 85 ------------------- .../src/components/AppItem.svelte | 3 +- .../src/components/Applications.svelte | 4 +- 6 files changed, 6 insertions(+), 116 deletions(-) delete mode 100644 plugins/workbench-resources/src/components/App.svelte diff --git a/packages/ui/src/components/Scroller.svelte b/packages/ui/src/components/Scroller.svelte index 0d2b3b654db..a015231e11f 100644 --- a/packages/ui/src/components/Scroller.svelte +++ b/packages/ui/src/components/Scroller.svelte @@ -22,7 +22,6 @@ import IconUpOutline from './icons/UpOutline.svelte' import IconDownOutline from './icons/DownOutline.svelte' import HalfUpDown from './icons/HalfUpDown.svelte' - import { isSafari } from '../utils' export let padding: string | undefined = undefined export let autoscroll: boolean = false @@ -375,7 +374,6 @@ } else if (deltaY > 0 && autoscroll && !scrolling && belowContent && belowContent <= 10) { scrolling = true } - scrollY += deltaY } let observer: IntersectionObserver @@ -452,7 +450,6 @@ (orientir === 'horizontal' && (maskH === 'left' || maskH === 'both')) ? 'visible' : 'hidden' - let scrollY: number = 0 @@ -478,22 +475,6 @@ style:overflow-x={horizontal ? 'auto' : 'hidden'} on:scroll={(evt) => { if ($tooltipstore.label !== undefined) closeTooltip() - const newPos = divScroll?.scrollTop ?? 0 - - // TODO: Workaround: https://front.hc.engineering/workbench/platform/tracker/TSK-760 - // In Safari scroll could jump on click, with no particular reason. - - if ( - !scrolling && - !isScrolling && - scrollY !== 0 && - Math.abs(newPos - scrollY) > 100 && - divScroll !== undefined && - isSafari() - ) { - divScroll.scrollTop = scrollY - } - scrollY = divScroll?.scrollTop ?? 0 }} >
- - - - - + + diff --git a/plugins/notification-assets/assets/icons.svg b/plugins/notification-assets/assets/icons.svg index adb3873dc86..987607d6988 100644 --- a/plugins/notification-assets/assets/icons.svg +++ b/plugins/notification-assets/assets/icons.svg @@ -3,9 +3,7 @@ - - - + diff --git a/plugins/workbench-resources/src/components/App.svelte b/plugins/workbench-resources/src/components/App.svelte deleted file mode 100644 index 594965107ba..00000000000 --- a/plugins/workbench-resources/src/components/App.svelte +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - diff --git a/plugins/workbench-resources/src/components/AppItem.svelte b/plugins/workbench-resources/src/components/AppItem.svelte index e562ed772e5..f0f5a9d87f6 100644 --- a/plugins/workbench-resources/src/components/AppItem.svelte +++ b/plugins/workbench-resources/src/components/AppItem.svelte @@ -77,8 +77,7 @@ } &.selected { - background-color: var(--theme-button-enabled); - border: 1px solid var(--theme-button-border); + background-color: var(--theme-button-pressed); .icon-container { color: var(--theme-caption-color); } diff --git a/plugins/workbench-resources/src/components/Applications.svelte b/plugins/workbench-resources/src/components/Applications.svelte index 3934a7c7c16..39efbca0f28 100644 --- a/plugins/workbench-resources/src/components/Applications.svelte +++ b/plugins/workbench-resources/src/components/Applications.svelte @@ -19,7 +19,7 @@ import { NavLink } from '@hcengineering/view-resources' import type { Application } from '@hcengineering/workbench' import workbench from '@hcengineering/workbench' - import App from './App.svelte' + import AppItem from './AppItem.svelte' export let active: Ref | undefined export let apps: Application[] = [] @@ -46,7 +46,7 @@ > {#each apps.filter((it) => !hiddenAppsIds.includes(it._id)) as app} - + {/each}