diff --git a/packages/theme/styles/components.scss b/packages/theme/styles/components.scss index ad65d394e7..639b6264ca 100644 --- a/packages/theme/styles/components.scss +++ b/packages/theme/styles/components.scss @@ -591,10 +591,7 @@ } } - .hulyToDoLine-statusPriority { - display: flex; - gap: var(--spacing-0_25); - } + .hulyToDoLine-statusPriority, .hulyToDoLine-dragbox, .hulyToDoLine-checkbox { display: flex; @@ -602,8 +599,7 @@ flex-shrink: 0; } .hulyToDoLine-dragbox { - position: relative; - margin-right: var(--spacing-0_25); + display: none; padding: 0; width: var(--global-min-Size); height: var(--global-min-Size); @@ -611,28 +607,28 @@ border: none; outline: none; cursor: grab; + } + .hulyToDoLine-statusPriority { + position: relative; + margin-right: var(--spacing-0_25); + padding-top: var(--spacing-0_5); + min-width: var(--global-min-Size); &.isNew::after { position: absolute; content: ''; - top: var(--spacing-0_75); - right: var(--spacing-0_5); + top: var(--spacing-1_25); + right: calc(-1 * var(--spacing-0_75)); width: var(--spacing-0_5); height: var(--spacing-0_5); background-color: var(--global-primary-LinkColor); border-radius: 50%; } - svg { - visibility: hidden; - } } .hulyToDoLine-checkbox { + display: none; width: var(--global-extra-small-Size); height: var(--global-extra-small-Size); - - &.updating { - padding-top: var(--spacing-0_5); - } } .hulyToDoLine-top-align { color: var(--global-primary-TextColor); @@ -677,24 +673,21 @@ &:hover { background-color: var(--global-surface-01-hover-BackgroundColor); - .hulyToDoLine-dragbox { - &.isNew::after { - content: none; - } - svg { - visibility: visible; - } + .priority-container { + display: none; + } + .hulyToDoLine-dragbox, + .hulyToDoLine-checkbox { + display: flex; } } &.isDrag { + .priority-container { + display: flex; + } .hulyToDoLine-dragbox { - &.isNew::after { - content: ''; - } - svg { - visibility: hidden; - } + display: none; } } } diff --git a/plugins/time-resources/src/components/ToDoElement.svelte b/plugins/time-resources/src/components/ToDoElement.svelte index 8c8697604a..0d09226634 100644 --- a/plugins/time-resources/src/components/ToDoElement.svelte +++ b/plugins/time-resources/src/components/ToDoElement.svelte @@ -77,20 +77,15 @@ }} >
-
- -
-
- {#if updating !== undefined} - - {:else} - - {/if} -
+
+ {#if updating !== undefined} + + {:else} + -
+ {/if}
@@ -117,4 +112,7 @@ {/if}
+
+ +
diff --git a/plugins/time-resources/src/components/ToDoPriorityPresenter.svelte b/plugins/time-resources/src/components/ToDoPriorityPresenter.svelte index 902f3c6e65..2bf1c8a1ac 100644 --- a/plugins/time-resources/src/components/ToDoPriorityPresenter.svelte +++ b/plugins/time-resources/src/components/ToDoPriorityPresenter.svelte @@ -26,7 +26,7 @@ {#if value !== ToDoPriority.NoPriority} -
+
{#if showLabel} diff --git a/tests/sanity/tests/model/planning/planning-page.ts b/tests/sanity/tests/model/planning/planning-page.ts index 9f0d1f0055..3e55956149 100644 --- a/tests/sanity/tests/model/planning/planning-page.ts +++ b/tests/sanity/tests/model/planning/planning-page.ts @@ -236,7 +236,7 @@ export class PlanningPage extends CalendarPage { await this.page .locator('button.hulyToDoLine-container div[class$="overflow-label"]', { hasText: toDoName }) .locator('xpath=..') - .locator('div.flex-row-center button.hulyToDoLine-dragbox') + .locator('div.hulyToDoLine-statusPriority button.hulyToDoLine-dragbox') .click({ button: 'right' }) await this.buttonMenuDelete.click() await this.pressYesDeletePopup(this.page) @@ -246,7 +246,7 @@ export class PlanningPage extends CalendarPage { await this.page .locator('button.hulyToDoLine-container div[class$="overflow-label"]', { hasText: toDoName }) .locator('xpath=..') - .locator('div.flex-row-center div.hulyToDoLine-checkbox > label') + .locator('div.hulyToDoLine-checkbox > label') .click() }