Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UBER-358: Fix icons #3338

Merged
merged 1 commit into from
Jun 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions packages/ui/src/components/Scroller.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -375,7 +374,6 @@
} else if (deltaY > 0 && autoscroll && !scrolling && belowContent && belowContent <= 10) {
scrolling = true
}
scrollY += deltaY
}

let observer: IntersectionObserver
Expand Down Expand Up @@ -452,7 +450,6 @@
(orientir === 'horizontal' && (maskH === 'left' || maskH === 'both'))
? 'visible'
: 'hidden'
let scrollY: number = 0
</script>

<svelte:window on:resize={_resize} />
Expand All @@ -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
Expand Down
7 changes: 2 additions & 5 deletions plugins/contact-assets/assets/icons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 1 addition & 3 deletions plugins/notification-assets/assets/icons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
85 changes: 0 additions & 85 deletions plugins/workbench-resources/src/components/App.svelte

This file was deleted.

3 changes: 1 addition & 2 deletions plugins/workbench-resources/src/components/AppItem.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = []
Expand All @@ -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}" />
Expand Down