wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-05-22 07:26:19 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Planner: updated ToDos layout (#6651)

Browse Source 
Signed-off-by: Alexander Platov <alexander.platov@hardcoreeng.com>
This commit is contained in:
Alexander Platov 2024-09-20 21:58:02 +07:00 committed by GitHub
parent 2a9e9918ac
commit 4165163e96
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/theme/styles/components.scss
View File

@ -577,9 +577,12 @@
} }
&.second:not(.isOpen), &.second:not(.isOpen),
&.border, &.border,
&.default:not(.nested:last-child) { &.default:not(.nested) {
border-bottom: 1px solid var(--theme-navpanel-divider); // var(--global-surface-01-BorderColor); border-bottom: 1px solid var(--theme-navpanel-divider); // var(--global-surface-01-BorderColor);
} }
&.default.nested:not(:last-child) {
border-bottom: 1px dashed var(--theme-navpanel-divider);
}
.hulyAccordionItem-header { .hulyAccordionItem-header {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@ -790,6 +793,12 @@
} }
} }
} }
&.hiddenHeader {
display: none;
visibility: hidden;
&.nested + .hulyAccordionItem-content { padding-top: var(--spacing-1); }
}
&:hover .hulyAccordionItem-header__chevron { &:hover .hulyAccordionItem-header__chevron {
color: var(--button-subtle-IconColor); color: var(--button-subtle-IconColor);
background-color: var(--global-ui-hover-BackgroundColor); background-color: var(--global-ui-hover-BackgroundColor);
@ -806,6 +815,9 @@
&.medium.bottomSpace + .hulyAccordionItem-content { &.medium.bottomSpace + .hulyAccordionItem-content {
padding-bottom: var(--spacing-2); padding-bottom: var(--spacing-2);
} }
&.medium.nested.bottomSpace + .hulyAccordionItem-content {
padding-bottom: var(--spacing-1);
}
&.large.bottomSpace + .hulyAccordionItem-content { &.large.bottomSpace + .hulyAccordionItem-content {
padding-bottom: var(--spacing-2); padding-bottom: var(--spacing-2);
} }

2
packages/ui/src/components/AccordionItem.svelte
View File

@ -39,6 +39,7 @@
export let duration: number | boolean = false export let duration: number | boolean = false
export let fixHeader: boolean = false export let fixHeader: boolean = false
export let categoryHeader: boolean = false export let categoryHeader: boolean = false
export let hiddenHeader: boolean = false
export let background: string | undefined = undefined export let background: string | undefined = undefined
const dispatch = createEventDispatcher() const dispatch = createEventDispatcher()
@ -74,6 +75,7 @@
class:selectable class:selectable
class:scroller-header={fixHeader} class:scroller-header={fixHeader}
class:categoryHeader class:categoryHeader
class:hiddenHeader
style:background-color={background ?? 'transparent'} style:background-color={background ?? 'transparent'}
on:click|stopPropagation={handleClick} on:click|stopPropagation={handleClick}
> >

2
plugins/time-resources/src/components/ToDoProjectGroup.svelte
View File

@ -81,7 +81,7 @@
} }
</script> </script>
<AccordionItem {id} {icon} {iconProps} {title} {label} size={'medium'} nested> <AccordionItem {id} {icon} {iconProps} {title} {label} size={'medium'} nested hiddenHeader={project === false}>
{#each todos as todo, index} {#each todos as todo, index}
<ToDoDraggable {todo} {index} {groupName} {projectId} on:drop={handleDrop}> <ToDoDraggable {todo} {index} {groupName} {projectId} on:drop={handleDrop}>
<ToDoElement {todo} planned={mode !== 'unplanned'} /> <ToDoElement {todo} planned={mode !== 'unplanned'} />

2
plugins/time-resources/src/components/ToDos.svelte
View File

@ -237,9 +237,9 @@
active: WithLookup<ToDo>[] active: WithLookup<ToDo>[]
): [IntlString, WithLookup<ToDo>[]][] { ): [IntlString, WithLookup<ToDo>[]][] {
const groups = new Map<IntlString, WithLookup<ToDo>[]>([ const groups = new Map<IntlString, WithLookup<ToDo>[]>([
[time.string.Scheduled, []],
[time.string.Unplanned, unplanned], [time.string.Unplanned, unplanned],
[time.string.ToDos, []], [time.string.ToDos, []],
[time.string.Scheduled, []],
[time.string.Done, done] [time.string.Done, done]
]) ])
const now = Date.now() const now = Date.now()