diff --git a/packages/text-editor/src/types.ts b/packages/text-editor/src/types.ts index 351a28aef4..71b15f941b 100644 --- a/packages/text-editor/src/types.ts +++ b/packages/text-editor/src/types.ts @@ -47,7 +47,7 @@ export const FORMAT_MODES = [ /** * @public */ -export type FormatMode = typeof FORMAT_MODES[number] +export type FormatMode = (typeof FORMAT_MODES)[number] /** * @public diff --git a/packages/theme/styles/_colors.scss b/packages/theme/styles/_colors.scss index 55517cca08..101d48f802 100644 --- a/packages/theme/styles/_colors.scss +++ b/packages/theme/styles/_colors.scss @@ -119,6 +119,12 @@ --theme-popup-divider: rgba(255, 255, 255, .1); --theme-popup-shadow: 0px 4px 4px rgba(0, 0, 0, 0.1); // Light --theme-panel-color: #1A1A28; + --theme-calendar-today-color: #fff; + --theme-calendar-holiday-color: #eb5757; + --theme-calendar-weekend-color: rgba(242, 153, 74, 1); + --theme-calendar-today-bgcolor: rgba(32, 93, 194, .1); + --theme-calendar-holiday-bgcolor: rgba(235, 87, 87, .1); + --theme-calendar-weekend-bgcolor: rgba(242, 153, 74, .05); --body-color: #1f2023; --body-accent: #222326; @@ -269,6 +275,12 @@ --theme-popup-divider: rgba(0, 0, 0, .1); --theme-popup-shadow: 0px 4px 4px rgba(0, 0, 0, 0.1); --theme-panel-color: #FFFFFF; + --theme-calendar-today-color: #000; + --theme-calendar-holiday-color: #eb5757; + --theme-calendar-weekend-color: rgba(242, 153, 74, 1); + --theme-calendar-today-bgcolor: rgba(43, 81, 144, .1); + --theme-calendar-holiday-bgcolor: rgba(235, 87, 87, .1); + --theme-calendar-weekend-bgcolor: rgba(242, 153, 74, .1); --body-color: #fff; --body-accent: #fafafa; // HZ diff --git a/packages/theme/styles/_layouts.scss b/packages/theme/styles/_layouts.scss index 4ce18415b0..674325596e 100644 --- a/packages/theme/styles/_layouts.scss +++ b/packages/theme/styles/_layouts.scss @@ -186,6 +186,7 @@ input.search { display: flex; justify-content: space-between; align-items: center; + min-width: 0; } .flex-stretch { display: flex; diff --git a/packages/theme/styles/components.scss b/packages/theme/styles/components.scss index 4667a22c1c..47a327d2d6 100644 --- a/packages/theme/styles/components.scss +++ b/packages/theme/styles/components.scss @@ -713,6 +713,7 @@ align-items: center; flex-shrink: 1; min-width: 0; + border-radius: 0 1.49rem 1.49rem 0; .label-wrapper { display: flex; diff --git a/packages/ui/src/components/Scroller.svelte b/packages/ui/src/components/Scroller.svelte index e341a041e2..766c1e9160 100644 --- a/packages/ui/src/components/Scroller.svelte +++ b/packages/ui/src/components/Scroller.svelte @@ -444,6 +444,7 @@ class:buttons={buttons === 'normal'} class:union={buttons === 'union'} class:shrink + style:user-select={isScrolling ? 'none' : 'inherit'} style:--scroller-header-height={`${fade.multipler?.top ?? 0.125}rem`} style:--scroller-footer-height={`${fade.multipler?.bottom ?? 0.125}rem`} > diff --git a/packages/ui/src/components/calendar/DatePresenter.svelte b/packages/ui/src/components/calendar/DatePresenter.svelte index bfd2f602c6..9270ec4f0c 100644 --- a/packages/ui/src/components/calendar/DatePresenter.svelte +++ b/packages/ui/src/components/calendar/DatePresenter.svelte @@ -165,7 +165,7 @@ margin-right: 0; } &.normal { - color: var(--content-color); + color: var(--theme-content-color); } &.warning { color: var(--warning-color); @@ -178,15 +178,15 @@ } } .not-selected { - color: var(--content-color); + color: var(--theme-dark-color); } &:hover { - color: var(--caption-color); + color: var(--theme-caption-color); transition-duration: 0; .not-selected { - color: var(--accent-color); + color: var(--theme-caption-color); } } &.editable { @@ -224,9 +224,9 @@ cursor: default; &:hover { - color: var(--content-color); + color: var(--theme-dark-color); .btn-icon { - color: var(--content-color); + color: var(--theme-dark-color); } } } @@ -240,40 +240,38 @@ margin-right: 0.5rem; } &:hover { - color: var(--caption-color); - background-color: var(--body-color); - border-color: var(--divider-color); + color: var(--theme-caption-color); + background-color: var(--theme-button-hovered); + border-color: var(--theme-divider-color); .btn-icon { - color: var(--content-color); + color: var(--theme-caption-color); } } } &.list { padding: 0 0.625em 0 0.5rem; min-height: 1.75rem; - color: var(--content-color); - background-color: var(--body-color); - border: 1px solid var(--divider-color); + background-color: var(--theme-list-button-color); + border: 1px solid var(--theme-divider-color); border-radius: 3rem; transition-property: border, color, background-color; transition-duration: 0.15s; &:hover { - color: var(--caption-color); - background-color: var(--board-card-bg-color); - border-color: var(--button-border-color); + color: var(--theme-caption-color); + background-color: var(--theme-list-button-color); + border-color: var(--theme-divider-color); } } &.link-bordered { padding: 0 0.375rem; - color: var(--accent-color); - border-color: var(--divider-color); + color: var(--theme-content-color); + border-color: var(--theme-button-border); &:hover { - color: var(--accent-color); - background-color: var(--button-bg-hover); - border-color: var(--button-border-hover); + color: var(--theme-caption-color); + background-color: var(--theme-button-hovered); .btn-icon { - color: var(--accent-color); + color: var(--theme-caption-color); } } } @@ -305,7 +303,7 @@ width: 1px; min-width: 1px; height: 0.75rem; - background-color: var(--button-border-color); + background-color: var(--theme-divider-color); } .separator { margin: 0 0.1rem; diff --git a/plugins/attachment-resources/src/components/FileBrowser.svelte b/plugins/attachment-resources/src/components/FileBrowser.svelte index 3bb64b6b14..9b68a033c7 100644 --- a/plugins/attachment-resources/src/components/FileBrowser.svelte +++ b/plugins/attachment-resources/src/components/FileBrowser.svelte @@ -17,7 +17,7 @@ import contact, { Employee, EmployeeAccount } from '@hcengineering/contact' import core, { Class, getCurrentAccount, Ref, Space } from '@hcengineering/core' import { getClient } from '@hcengineering/presentation' - import { ActionIcon, IconMoreH, Label, Loading, location, navigate, TabList, SearchEdit } from '@hcengineering/ui' + import { Label, Loading, location, navigate, TabList, SearchEdit } from '@hcengineering/ui' import view from '@hcengineering/view' import { get } from 'svelte/store' import { dateFileBrowserFilters, FileBrowserSortMode, fileTypeFileBrowserFilters, sortModeToOptionObject } from '..' @@ -122,7 +122,7 @@
{}} /> - +
updateResultQuery(search)} /> - +
- +
{#if selectedViewlet?.$lookup?.descriptor?.component} diff --git a/plugins/contact-resources/src/components/Contacts.svelte b/plugins/contact-resources/src/components/Contacts.svelte index e7b8be6541..fbeb04028a 100644 --- a/plugins/contact-resources/src/components/Contacts.svelte +++ b/plugins/contact-resources/src/components/Contacts.svelte @@ -16,7 +16,7 @@ -
(wSection = element.clientWidth)}> +
@@ -74,23 +72,14 @@
{#if applications > 0 && viewlet && !loading} - {#if wSection < 640} - - - - {:else} +
- {/if} + {:else}
diff --git a/plugins/recruit-resources/src/components/Organizations.svelte b/plugins/recruit-resources/src/components/Organizations.svelte index 2e852116e0..b9eb9f24dd 100644 --- a/plugins/recruit-resources/src/components/Organizations.svelte +++ b/plugins/recruit-resources/src/components/Organizations.svelte @@ -17,7 +17,7 @@ import core, { Doc, DocumentQuery, Ref } from '@hcengineering/core' import { createQuery, getClient } from '@hcengineering/presentation' import { Applicant, Vacancy } from '@hcengineering/recruit' - import { Button, ActionIcon, IconMoreH, Label, Loading, SearchEdit, showPopup, IconAdd } from '@hcengineering/ui' + import { Button, Label, Loading, SearchEdit, showPopup, IconAdd } from '@hcengineering/ui' import view, { BuildModelKey, Viewlet, ViewletPreference } from '@hcengineering/view' import { FilterBar, @@ -237,13 +237,13 @@
(search = e.detail)} /> - +
- +
diff --git a/plugins/recruit-resources/src/components/Vacancies.svelte b/plugins/recruit-resources/src/components/Vacancies.svelte index 8a7cae5a9d..7102c7c66d 100644 --- a/plugins/recruit-resources/src/components/Vacancies.svelte +++ b/plugins/recruit-resources/src/components/Vacancies.svelte @@ -16,17 +16,7 @@ import core, { Doc, DocumentQuery, Ref } from '@hcengineering/core' import { createQuery, getClient } from '@hcengineering/presentation' import { Vacancy } from '@hcengineering/recruit' - import { - Button, - ActionIcon, - IconMoreH, - Label, - Loading, - SearchEdit, - showPopup, - tableToCSV, - IconAdd - } from '@hcengineering/ui' + import { Button, Label, Loading, SearchEdit, showPopup, tableToCSV, IconAdd } from '@hcengineering/ui' import view, { BuildModelKey, Viewlet, ViewletPreference } from '@hcengineering/view' import { FilterBar, @@ -191,13 +181,13 @@
(search = e.detail)} /> - +
- +
diff --git a/plugins/recruit-resources/src/components/review/Reviews.svelte b/plugins/recruit-resources/src/components/review/Reviews.svelte index 0f2e89a91f..109ed2c91e 100644 --- a/plugins/recruit-resources/src/components/review/Reviews.svelte +++ b/plugins/recruit-resources/src/components/review/Reviews.svelte @@ -18,7 +18,7 @@ import { DateRangeMode, Doc, FindOptions, Ref } from '@hcengineering/core' import { IntlString } from '@hcengineering/platform' import { Applicant, Review } from '@hcengineering/recruit' - import { Button, DatePresenter, IconAdd, Label, resizeObserver, showPopup, Scroller } from '@hcengineering/ui' + import { Button, DatePresenter, IconAdd, Label, showPopup, Scroller } from '@hcengineering/ui' import { Table } from '@hcengineering/view-resources' import recruit from '../../plugin' import FileDuo from '../icons/FileDuo.svelte' @@ -42,7 +42,6 @@ 'top' ) } - let wSection: number const options: FindOptions = { lookup: { application: recruit.class.Applicant @@ -50,7 +49,7 @@ } -
(wSection = element.clientWidth)}> +
{#if reviews > 0} - {#if wSection < 640} - -
- - {:else} +
- {/if} + {:else}
diff --git a/plugins/tags-resources/src/components/TagReferencePresenter.svelte b/plugins/tags-resources/src/components/TagReferencePresenter.svelte index b7faedb8fa..f0bb3df016 100644 --- a/plugins/tags-resources/src/components/TagReferencePresenter.svelte +++ b/plugins/tags-resources/src/components/TagReferencePresenter.svelte @@ -44,7 +44,7 @@ }} >
- {value.title} + {value.title} {:else if kind === 'labels'}
- + {value.title} {#if isEditable} diff --git a/plugins/tags-resources/src/components/TagsView.svelte b/plugins/tags-resources/src/components/TagsView.svelte index 9c3e5372c8..5c20a2c206 100644 --- a/plugins/tags-resources/src/components/TagsView.svelte +++ b/plugins/tags-resources/src/components/TagsView.svelte @@ -17,16 +17,7 @@ import { Asset, IntlString, translate } from '@hcengineering/platform' import { createQuery } from '@hcengineering/presentation' import { TagCategory, TagElement } from '@hcengineering/tags' - import { - AnySvelteComponent, - Button, - ActionIcon, - IconMoreH, - Label, - SearchEdit, - showPopup, - IconAdd - } from '@hcengineering/ui' + import { AnySvelteComponent, Button, Label, SearchEdit, showPopup, IconAdd } from '@hcengineering/ui' import { TableBrowser } from '@hcengineering/view-resources' import tags from '../plugin' import CategoryBar from './CategoryBar.svelte' @@ -110,7 +101,7 @@
updateResultQuery(search, category)} /> - +
diff --git a/plugins/tracker-resources/src/components/components/ComponentBrowser.svelte b/plugins/tracker-resources/src/components/components/ComponentBrowser.svelte index 7ccd25d4ed..56424d2518 100644 --- a/plugins/tracker-resources/src/components/components/ComponentBrowser.svelte +++ b/plugins/tracker-resources/src/components/components/ComponentBrowser.svelte @@ -29,10 +29,8 @@ FilterBar } from '@hcengineering/view-resources' import { - ActionIcon, Button, IconAdd, - IconMoreH, Label, SearchEdit, TabItem, @@ -137,14 +135,14 @@
- +
{#if viewlet} - + {/if}
diff --git a/plugins/tracker-resources/src/components/issues/IssueNotification.svelte b/plugins/tracker-resources/src/components/issues/IssueNotification.svelte index 581ba46d32..c0c8626cce 100644 --- a/plugins/tracker-resources/src/components/issues/IssueNotification.svelte +++ b/plugins/tracker-resources/src/components/issues/IssueNotification.svelte @@ -92,114 +92,58 @@ $: icon = getIcon() -
- {#if icon} - - {/if} - -
-
- {title} -
-
-
- {#if status} - - {/if} - {#if issue} - - {/if} -
- {subTitle} -
-
- {params?.subTitlePostfix} -
-
-
-
-
-
-
-
+
+
+
+ {#if icon} +
+ {/if} + {title}
+
-
-
diff --git a/plugins/tracker-resources/src/components/issues/IssuesHeader.svelte b/plugins/tracker-resources/src/components/issues/IssuesHeader.svelte index 7e249f72a1..dd0aad5565 100644 --- a/plugins/tracker-resources/src/components/issues/IssuesHeader.svelte +++ b/plugins/tracker-resources/src/components/issues/IssuesHeader.svelte @@ -1,6 +1,6 @@
{ itemModels = res + res.forEach((m) => { + const key = `list_item_${m.props?.listProps.key}` + if (m.props?.listProps?.fixed) $fixedWidthStore[key] = 0 + }) }) function getInitIndex (categories: any, i: number): number { diff --git a/plugins/workbench-resources/src/components/SpaceBrowser.svelte b/plugins/workbench-resources/src/components/SpaceBrowser.svelte index 6f05285119..b5fcb0bcda 100644 --- a/plugins/workbench-resources/src/components/SpaceBrowser.svelte +++ b/plugins/workbench-resources/src/components/SpaceBrowser.svelte @@ -34,9 +34,7 @@ navigate, Scroller, SearchEdit, - showPopup, - IconMoreH, - ActionIcon + showPopup } from '@hcengineering/ui' import { FilterBar, FilterButton, SpacePresenter } from '@hcengineering/view-resources' import plugin from '../plugin' @@ -134,7 +132,7 @@ update(sort, resultQuery) }} /> - +
{#if withFilterButton} diff --git a/plugins/workbench-resources/src/components/SpaceHeader.svelte b/plugins/workbench-resources/src/components/SpaceHeader.svelte index 6f0a16e2ee..e559d3e5f4 100644 --- a/plugins/workbench-resources/src/components/SpaceHeader.svelte +++ b/plugins/workbench-resources/src/components/SpaceHeader.svelte @@ -18,11 +18,9 @@ import { IntlString } from '@hcengineering/platform' import presentation, { createQuery } from '@hcengineering/presentation' import { - ActionIcon, AnyComponent, Button, IconAdd, - IconMoreH, SearchEdit, TabList, resolvedLocationStore, @@ -117,13 +115,13 @@
dispatch('search', search)} /> - +
- +
{:else} diff --git a/plugins/workbench-resources/src/components/SpecialView.svelte b/plugins/workbench-resources/src/components/SpecialView.svelte index 7cdf048e15..65da629541 100644 --- a/plugins/workbench-resources/src/components/SpecialView.svelte +++ b/plugins/workbench-resources/src/components/SpecialView.svelte @@ -17,12 +17,10 @@ import { Asset, IntlString } from '@hcengineering/platform' import { createQuery } from '@hcengineering/presentation' import { - ActionIcon, AnyComponent, Button, Component, IconAdd, - IconMoreH, Label, Loading, SearchEdit, @@ -178,13 +176,13 @@
- +
- +
diff --git a/tests/sanity/tests/hr.spec.ts b/tests/sanity/tests/hr.spec.ts index a46132b6e5..d2546b2b47 100644 --- a/tests/sanity/tests/hr.spec.ts +++ b/tests/sanity/tests/hr.spec.ts @@ -6,7 +6,7 @@ test.use({ }) export async function createDepartment (page: Page, departmentName: string): Promise { - await page.click('text=Structure Department Organization no employees >> button >> nth=2') + await page.click('button:has-text("Department")') const departmentNameField = page.locator('[placeholder="Department"]') await departmentNameField.click() await departmentNameField.fill(departmentName) diff --git a/tests/sanity/tests/tracker.layout.spec.ts b/tests/sanity/tests/tracker.layout.spec.ts index ef8f3d2abd..f09005817e 100644 --- a/tests/sanity/tests/tracker.layout.spec.ts +++ b/tests/sanity/tests/tracker.layout.spec.ts @@ -95,7 +95,7 @@ test.describe('tracker layout tests', () => { let issuesProps: IssueProps[] = [] const orders = ['Status', 'Modified', 'Priority'] as const const groups = ['Status', 'Assignee', 'Priority', 'Component', 'Sprint', 'No grouping'] as const - const groupsLabels: { [key in typeof groups[number]]?: string[] } = { + const groupsLabels: { [key in (typeof groups)[number]]?: string[] } = { Status: DEFAULT_STATUSES, Assignee: [DEFAULT_USER, 'Chen Rosamund'], Priority: PRIORITIES,