diff --git a/javascript/apps/taiga/src/app/modules/project/feature-kanban/components/kanban-header/kanban-header.component.html b/javascript/apps/taiga/src/app/modules/project/feature-kanban/components/kanban-header/kanban-header.component.html index ecd18cb3a..1a7b2704c 100644 --- a/javascript/apps/taiga/src/app/modules/project/feature-kanban/components/kanban-header/kanban-header.component.html +++ b/javascript/apps/taiga/src/app/modules/project/feature-kanban/components/kanban-header/kanban-header.component.html @@ -21,7 +21,12 @@ diff --git a/javascript/apps/taiga/src/app/modules/project/feature-kanban/project-feature-kanban.component.css b/javascript/apps/taiga/src/app/modules/project/feature-kanban/project-feature-kanban.component.css index f185acf29..28573a62f 100644 --- a/javascript/apps/taiga/src/app/modules/project/feature-kanban/project-feature-kanban.component.css +++ b/javascript/apps/taiga/src/app/modules/project/feature-kanban/project-feature-kanban.component.css @@ -38,6 +38,5 @@ Copyright (c) 2023-present Kaleidos INC } tg-kanban-header { - margin-block-end: var(--spacing-20); min-block-size: var(--spacing-40); } diff --git a/javascript/apps/taiga/src/app/modules/project/feature-navigation/components/project-navigation-menu/project-navigation-menu.component.css b/javascript/apps/taiga/src/app/modules/project/feature-navigation/components/project-navigation-menu/project-navigation-menu.component.css index 528d1688a..bfabcb00f 100644 --- a/javascript/apps/taiga/src/app/modules/project/feature-navigation/components/project-navigation-menu/project-navigation-menu.component.css +++ b/javascript/apps/taiga/src/app/modules/project/feature-navigation/components/project-navigation-menu/project-navigation-menu.component.css @@ -192,7 +192,6 @@ ul { margin-block: 0; margin-inline-end: var(--spacing-8); margin-inline-start: var(--spacing-16); - padding-block: var(--spacing-4); padding-inline-start: var(--spacing-8); } @@ -201,8 +200,9 @@ ul { @mixin ellipsis; block-size: var(--spacing-28); - display: inline-block; + display: flex; inline-size: 100%; + padding-block: 0; &:hover { background: var(--color-gray90); diff --git a/javascript/apps/taiga/src/app/modules/project/feature-navigation/project-feature-navigation.component.html b/javascript/apps/taiga/src/app/modules/project/feature-navigation/project-feature-navigation.component.html index e3c6b5f32..e9df29b54 100644 --- a/javascript/apps/taiga/src/app/modules/project/feature-navigation/project-feature-navigation.component.html +++ b/javascript/apps/taiga/src/app/modules/project/feature-navigation/project-feature-navigation.component.html @@ -10,7 +10,7 @@ [@mainNavContainer]="menuState" class="main-nav-container-inner"> - + {{ showProjectSettings }} m.ProjectFeatureOverviewModule), }, + { + path: ':slug', + loadChildren: () => + import( + '~/app/modules/project/feature-overview/project-feature-overview.module' + ).then((m) => m.ProjectFeatureOverviewModule), + }, { path: 'overview', loadChildren: () => @@ -56,39 +63,31 @@ const routes: Routes = [ ).then((m) => m.ProjectFeatureViewSetterModule), canDeactivate: [CanDeactivateGuard], }, - { - path: ':slug', - loadChildren: () => - import( - '~/app/modules/project/feature-overview/project-feature-overview.module' - ).then((m) => m.ProjectFeatureOverviewModule), - }, { path: ':slug/kanban', redirectTo: ':slug/kanban/main', pathMatch: 'full', }, { - path: ':slug/new-workflow', + path: ':slug/kanban/:workflow', loadChildren: () => import( - '~/app/modules/project/feature-new-workflow/project-feature-new-workflow.module' - ).then((m) => m.ProjectFeatureNewWorkflowModule), + '~/app/modules/project/feature-view-setter/project-feature-view-setter.module' + ).then((m) => m.ProjectFeatureViewSetterModule), canDeactivate: [CanDeactivateGuard], data: { - newKanban: true, + kanban: true, }, }, { - path: ':slug/kanban/:workflow', + path: ':slug/new-workflow', loadChildren: () => import( - '~/app/modules/project/feature-view-setter/project-feature-view-setter.module' - ).then((m) => m.ProjectFeatureViewSetterModule), + '~/app/modules/project/feature-new-workflow/project-feature-new-workflow.module' + ).then((m) => m.ProjectFeatureNewWorkflowModule), canDeactivate: [CanDeactivateGuard], data: { - kanban: true, - reuseComponent: false, + newKanban: true, }, }, { diff --git a/javascript/libs/ui/src/lib/breadcrumb/breadcrumb.component.css b/javascript/libs/ui/src/lib/breadcrumb/breadcrumb.component.css index c795988de..876f0b064 100644 --- a/javascript/libs/ui/src/lib/breadcrumb/breadcrumb.component.css +++ b/javascript/libs/ui/src/lib/breadcrumb/breadcrumb.component.css @@ -16,7 +16,12 @@ Copyright (c) 2023-present Kaleidos INC } .crumb { - padding: var(--spacing4); + padding: var(--spacing-4); +} + +.crumb-divider { + block-size: var(--spacing-8); + inline-size: var(--spacing-8); } .accent { diff --git a/javascript/libs/ui/src/lib/breadcrumb/breadcrumb.component.html b/javascript/libs/ui/src/lib/breadcrumb/breadcrumb.component.html index ec5af3b7f..ae7565606 100644 --- a/javascript/libs/ui/src/lib/breadcrumb/breadcrumb.component.html +++ b/javascript/libs/ui/src/lib/breadcrumb/breadcrumb.component.html @@ -27,11 +27,10 @@ [class.accent]="isLast && accent"> {{ crumb }} - - > - + *ngIf="!(hideLastCrumb && i === crumbs.length - 2) && !isLast" + src="chevron-right">