-
Notifications
You must be signed in to change notification settings - Fork 467
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: fix breadcrumb errors (#29650)
### Parent Issue #29648 ### Proposed Changes * Fix problem with breadcrumbs styles and PrimeNG v17 * Fix problem with storybook and alias signals ### Checklist - [x] Tests - [x] Translations - [x] Security Implications Contemplated (add notes if applicable) ### Screenshots Original | Updated :-------------------------:|:-------------------------:  |   |   |   |   |   | 
- Loading branch information
Showing
8 changed files
with
166 additions
and
238 deletions.
There are no files selected for viewing
1 change: 0 additions & 1 deletion
1
core-web/apps/dotcms-ui/src/app/view/components/dot-crumbtrail/dot-crumbtrail.component.html
This file was deleted.
Oops, something went wrong.
52 changes: 26 additions & 26 deletions
52
core-web/apps/dotcms-ui/src/app/view/components/dot-crumbtrail/dot-crumbtrail.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 9 additions & 13 deletions
22
core-web/apps/dotcms-ui/src/app/view/components/dot-crumbtrail/dot-crumbtrail.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,15 @@ | ||
| import { Observable } from 'rxjs'; | ||
| import { Component, inject } from '@angular/core'; | ||
| import { toSignal } from '@angular/core/rxjs-interop'; | ||
|
|
||
| import { Component, OnInit } from '@angular/core'; | ||
|
|
||
| import { DotCrumb, DotCrumbtrailService } from './service/dot-crumbtrail.service'; | ||
| import { DotCrumbtrailService } from './service/dot-crumbtrail.service'; | ||
| @Component({ | ||
| selector: 'dot-crumbtrail', | ||
| templateUrl: './dot-crumbtrail.component.html', | ||
| template: '<p-breadcrumb [model]="$model()" />', | ||
| styleUrls: ['./dot-crumbtrail.component.scss'] | ||
| }) | ||
| export class DotCrumbtrailComponent implements OnInit { | ||
| crumb: Observable<DotCrumb[]>; | ||
|
|
||
| constructor(private crumbTrailService: DotCrumbtrailService) {} | ||
|
|
||
| ngOnInit() { | ||
| this.crumb = this.crumbTrailService.crumbTrail$; | ||
| } | ||
| export class DotCrumbtrailComponent { | ||
| readonly #crumbTrailService = inject(DotCrumbtrailService); | ||
| $model = toSignal(this.#crumbTrailService.crumbTrail$, { | ||
| initialValue: [] | ||
| }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 43 additions & 34 deletions
77
core-web/libs/dotcms-scss/angular/dotcms-theme/components/_breadcrumb.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,38 +1,47 @@ | ||
| @use "variables" as *; | ||
|
|
||
| .p-breadcrumb ul li .p-menuitem-link { | ||
| transition: none; | ||
| border-radius: $border-radius-xs; | ||
| } | ||
|
|
||
| .p-breadcrumb ul li .p-menuitem-link:focus { | ||
| outline: 0 none; | ||
| outline-offset: 0; | ||
| box-shadow: none; | ||
| } | ||
|
|
||
| .p-breadcrumb ul li .p-menuitem-link[href] .p-menuitem-text { | ||
| font-size: $font-size-default; | ||
|
|
||
| &:hover { | ||
| color: $color-palette-primary; | ||
| text-decoration: underline; | ||
| .p-breadcrumb { | ||
| border: 0 none; | ||
| padding: $spacing-3 0; | ||
|
|
||
| .p-breadcrumb-list { | ||
| li { | ||
| .p-menuitem-link { | ||
| transition: none; | ||
| .p-menuitem-text { | ||
| color: $color-palette-gray-700; | ||
| font-size: $font-size-default; | ||
| cursor: pointer; | ||
| &[href] { | ||
| color: $black; | ||
| &:hover { | ||
| color: $color-palette-primary; | ||
| text-decoration: underline; | ||
| } | ||
| } | ||
| } | ||
| .p-menuitem-icon { | ||
| color: $black; | ||
| } | ||
| &:focus { | ||
| outline: 0 none; | ||
| outline-offset: 0; | ||
| box-shadow: none; | ||
| } | ||
| } | ||
| &.p-menuitem-separator { | ||
| margin: 0 $spacing-1 0 $spacing-1; | ||
| color: $black; | ||
| } | ||
|
|
||
| &:last-child { | ||
| .p-menuitem-text { | ||
| color: $color-palette-gray-700; | ||
| } | ||
| .p-menuitem-icon { | ||
| color: $color-palette-gray-700; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .p-breadcrumb ul li .p-menuitem-link .p-menuitem-text { | ||
| color: $color-palette-gray-700; | ||
| } | ||
|
|
||
| .p-breadcrumb ul li .p-menuitem-link .p-menuitem-icon { | ||
| color: $black; | ||
| } | ||
|
|
||
| .p-breadcrumb ul li.p-breadcrumb-chevron { | ||
| margin: 0 $spacing-1 0 $spacing-1; | ||
| color: $black; | ||
| } | ||
|
|
||
| .p-breadcrumb ul li:last-child .p-menuitem-icon { | ||
| color: $black; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.