UBER-358: Fix icons (#3338)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
hcengineering · Jun 5, 2023 · 2aff844 · 2aff844
1 parent 4243f68
commit 2aff844
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 116 deletions.
diff --git 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
 </script>
 
 <svelte:window on:resize={_resize} />
@@ -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
       }}
     >
       <div

diff --git a/plugins/contact-assets/assets/icons.svg b/plugins/contact-assets/assets/icons.svg
diff --git a/plugins/notification-assets/assets/icons.svg b/plugins/notification-assets/assets/icons.svg
diff --git a/plugins/workbench-resources/src/components/App.svelte b/plugins/workbench-resources/src/components/App.svelte
diff --git 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
@@ -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<Application> | undefined
   export let apps: Application[] = []
@@ -46,7 +46,7 @@
     >
       {#each apps.filter((it) => !hiddenAppsIds.includes(it._id)) as app}
         <NavLink app={app.alias} shrink={0}>
-          <App selected={app._id === active} icon={app.icon} label={app.label} />
+          <AppItem selected={app._id === active} icon={app.icon} label={app.label} />
         </NavLink>
       {/each}
       <div class="apps-space-{direction}" />