-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: allow navigation to entities from disabled entity-select (#1256)
Co-authored-by: Simon <33730997+TheSlimvReal@users.noreply.github.com>
- Loading branch information
1 parent
ef6be53
commit 0d62b44
Showing
8 changed files
with
29 additions
and
29 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,7 +29,3 @@ | |
.inactive { | ||
color: grey; | ||
} | ||
|
||
.clickable { | ||
cursor: pointer; | ||
} |
2 changes: 1 addition & 1 deletion
2
src/app/child-dev-project/schools/school-block/school-block.component.html
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,4 +1,4 @@ | ||
<span> | ||
<app-fa-dynamic-icon [icon]="icon" class="icon"></app-fa-dynamic-icon> | ||
<span class="underline-on-hover">{{ entity?.name }}</span> | ||
<span>{{ entity?.name }}</span> | ||
</span> |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,6 +14,6 @@ | |
} | ||
|
||
.remove-item { | ||
margin: 0.15em; | ||
margin-left: 0.5em; | ||
cursor: pointer; | ||
} |
32 changes: 17 additions & 15 deletions
32
...tity-components/entity-utils/view-components/display-entity/display-entity.component.html
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,15 +1,17 @@ | ||
<ng-container | ||
*ngIf="entityBlockComponent && entityToDisplay" | ||
[appDynamicComponent]="{ | ||
component: entityBlockComponent, | ||
config: { | ||
entity: entityToDisplay, | ||
linkDisabled: linkDisabled, | ||
tooltipDisabled: true | ||
} | ||
}" | ||
> | ||
</ng-container> | ||
<ng-container *ngIf="!entityBlockComponent"> | ||
{{ entityToDisplay?.toString() }} | ||
</ng-container> | ||
<span [ngClass]="{ clickable: !linkDisabled }"> | ||
<ng-container | ||
*ngIf="entityBlockComponent && entityToDisplay" | ||
[appDynamicComponent]="{ | ||
component: entityBlockComponent, | ||
config: { | ||
entity: entityToDisplay, | ||
linkDisabled: linkDisabled, | ||
tooltipDisabled: true | ||
} | ||
}" | ||
> | ||
</ng-container> | ||
<ng-container *ngIf="!entityBlockComponent"> | ||
{{ entityToDisplay?.toString() }} | ||
</ng-container> | ||
</span> |
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 |
---|---|---|
@@ -0,0 +1,7 @@ | ||
|
||
.clickable { | ||
cursor: pointer; | ||
} | ||
.clickable:hover { | ||
text-decoration: underline; | ||
} |
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