Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/app/core/constants/nav-items.constant.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,15 @@ export const PROJECT_MENU_ITEMS: CustomMenuItem[] = [
label: 'navigation.registrations',
routerLink: 'registrations',
visible: true,
routerLinkActiveOptions: { exact: true },
routerLinkActiveOptions: { exact: false },
},
{
id: 'project-contributors',
label: 'navigation.contributors',
routerLink: 'contributors',
visible: true,
requiredPermission: UserPermissions.Read,
routerLinkActiveOptions: { exact: true },
routerLinkActiveOptions: { exact: false },
},
{
id: 'project-analytics',
Expand All @@ -87,22 +87,22 @@ export const PROJECT_MENU_ITEMS: CustomMenuItem[] = [
routerLink: 'addons',
visible: true,
requiredPermission: UserPermissions.Write,
routerLinkActiveOptions: { exact: true },
routerLinkActiveOptions: { exact: false },
},
{
id: 'project-linked-services',
label: 'navigation.linkedServices',
routerLink: 'links',
visible: true,
routerLinkActiveOptions: { exact: true },
routerLinkActiveOptions: { exact: false },
},
{
id: 'project-settings',
label: 'navigation.settings',
routerLink: 'settings',
visible: true,
requiredPermission: UserPermissions.Read,
routerLinkActiveOptions: { exact: true },
routerLinkActiveOptions: { exact: false },
},
];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,15 @@ <h3>{{ 'settings.addons.configureAddon.selectFolder' | translate }}</h3>
@let itemId = folder.itemId || '/';
@let isLinkDisabled = !folder.mayContainRootCandidates || folder.itemType !== StorageItemType.Folder;
<div class="folders-table-row relative">
<div class="flex gap-2 flex-1">
<div tabindex="0" class="flex align-items-center gap-2">
<div class="flex gap-2 flex-1 max-w-full">
<div tabindex="0" class="flex align-items-center gap-2 w-11">
<i class="{{ folder.itemType === StorageItemType.Folder ? 'fas fa-folder' : 'fas fa-file' }}"></i>
@if (isLinkDisabled) {
<span class="folder-link-disabled">{{ folder.itemName }}</span>
<span class="folder-link-disabled overflow-ellipsis">{{ folder.itemName }}</span>
} @else {
<a
tabindex="0"
class="cursor-pointer folder-link"
class="cursor-pointer folder-link overflow-ellipsis"
(keydown.enter)="
handleCreateOperationInvocation(
operationName,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
.folders-table {
min-width: 100%;
border-radius: mix.rem(8px);
overflow-x: auto;
border: 1px solid var(--grey-2);

&-heading {
Expand All @@ -20,7 +19,6 @@
height: mix.rem(44px);
border-bottom: 1px solid var(--grey-2);
padding: 0 mix.rem(27px);
min-width: max-content;

.folder-link {
color: var(--dark-blue-1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@
<div class="flex gap-2 table-cell" [class.pl-6]="foldersStack.length">
@if (file.kind !== 'folder') {
<div
class="flex gap-2 min-w-0 hover:underline py-1"
class="flex align-items-center gap-2 min-w-0 hover:underline py-1"
(click)="openEntry($event, file)"
(keydown.enter)="openEntry($event, file)"
tabindex="0"
>
<i class="fas fa-file blue-icon"></i>
<span class="entry-title blue-text">{{ file?.name ?? '' }}</span>
<span class="entry-title">{{ file?.name ?? '' }}</span>
</div>
} @else {
<div
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,6 @@
max-width: 100%;
}

.blue-text {
color: var(--primary-blue-1);

&:hover {
color: var(--primary-blue-3);
}
}

.tree-table {
.p-tree {
padding: 0;
Expand Down
7 changes: 6 additions & 1 deletion src/styles/overrides/tree.scss
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,12 @@

.p-tree-node-selected {
.files-table-row {
background: var(--bg-blue-3);
color: var(--white);
background: var(--pr-blue-1);

.blue-icon {
color: var(--white);
}
}
}
}
Expand Down
Loading