From dca68e896db2675de2e42a2c599394a62a0f5535 Mon Sep 17 00:00:00 2001 From: nsemets Date: Thu, 14 Aug 2025 13:53:26 +0300 Subject: [PATCH 1/4] fix(menu): added new items --- .../components/nav-menu/nav-menu.component.ts | 4 ++++ src/app/core/constants/nav-items.constant.ts | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/src/app/core/components/nav-menu/nav-menu.component.ts b/src/app/core/components/nav-menu/nav-menu.component.ts index e730b3a40..c8d2400df 100644 --- a/src/app/core/components/nav-menu/nav-menu.component.ts +++ b/src/app/core/components/nav-menu/nav-menu.component.ts @@ -87,6 +87,10 @@ export class NavMenuComponent { } goToLink(item: MenuItem) { + if (item.id === 'support' || item.id === 'donate') { + window.open(item.url, '_blank'); + } + if (!item.items) { this.closeMenu.emit(); } diff --git a/src/app/core/constants/nav-items.constant.ts b/src/app/core/constants/nav-items.constant.ts index 3ed62c7c9..e8e289b33 100644 --- a/src/app/core/constants/nav-items.constant.ts +++ b/src/app/core/constants/nav-items.constant.ts @@ -167,7 +167,16 @@ export const MENU_ITEMS: MenuItem[] = [ label: 'navigation.searchOsf', icon: 'osf-icon-search', routerLinkActiveOptions: { exact: false }, + visible: true, + }, + { + id: 'support', + routerLink: null, + label: 'navigation.support', + icon: 'osf-icon-support', styleClass: 'mb-5', + url: 'https://help.osf.io/', + routerLinkActiveOptions: { exact: false }, visible: true, }, { @@ -370,4 +379,13 @@ export const MENU_ITEMS: MenuItem[] = [ }, ], }, + { + id: 'donate', + routerLink: null, + routerLinkActiveOptions: { exact: false }, + label: 'navigation.donate', + icon: 'osf-icon-donate', + url: 'https://www.cos.io/support-cos', + visible: true, + }, ]; From 4a28cb8210d909d28a7f29ab868718fc7c101b28 Mon Sep 17 00:00:00 2001 From: nsemets Date: Thu, 14 Aug 2025 15:49:41 +0300 Subject: [PATCH 2/4] fix(menu): updated naming --- src/app/core/constants/nav-items.constant.ts | 38 ++++++++++---------- src/assets/i18n/en.json | 1 + 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/app/core/constants/nav-items.constant.ts b/src/app/core/constants/nav-items.constant.ts index c93d02985..0fba21ee3 100644 --- a/src/app/core/constants/nav-items.constant.ts +++ b/src/app/core/constants/nav-items.constant.ts @@ -236,7 +236,7 @@ export const MENU_ITEMS: MenuItem[] = [ { id: 'registries-overview', routerLink: '/registries/overview', - label: 'navigation.overview', + label: 'navigation.discover', visible: true, routerLinkActiveOptions: { exact: true }, }, @@ -267,7 +267,7 @@ export const MENU_ITEMS: MenuItem[] = [ { id: 'preprints-overview', routerLink: '/preprints/overview', - label: 'navigation.overview', + label: 'navigation.discover', visible: true, routerLinkActiveOptions: { exact: false }, }, @@ -287,22 +287,6 @@ export const MENU_ITEMS: MenuItem[] = [ }, ], }, - { - id: 'my-profile', - routerLink: '/my-profile', - label: 'navigation.profile', - icon: 'osf-icon-profile', - visible: false, - routerLinkActiveOptions: { exact: false }, - }, - { - id: 'institutions', - routerLink: '/institutions', - label: 'navigation.institutions', - icon: 'osf-icon-institutions', - visible: true, - routerLinkActiveOptions: { exact: false }, - }, { id: 'collections', label: 'navigation.collections', @@ -327,12 +311,28 @@ export const MENU_ITEMS: MenuItem[] = [ visible: true, routerLinkActiveOptions: { exact: false }, }, + { + id: 'institutions', + routerLink: '/institutions', + label: 'navigation.institutions', + icon: 'osf-icon-institutions', + visible: true, + routerLinkActiveOptions: { exact: false }, + styleClass: 'mb-5', + }, + { + id: 'my-profile', + routerLink: '/my-profile', + label: 'navigation.profile', + icon: 'osf-icon-profile', + visible: false, + routerLinkActiveOptions: { exact: false }, + }, { id: 'settings', label: 'navigation.settings', icon: 'osf-icon-settings', routerLinkActiveOptions: { exact: true }, - styleClass: 'mt-5', visible: false, items: [ { diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index ed151ff90..36af20d73 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -148,6 +148,7 @@ "myResources": "My Resources", "registries": "Registries", "overview": "Overview", + "discover": "Discover", "registriesSubRoutes": { "myRegistrations": "My Registrations", "registryDetails": "Registry Details" From 27f4b5d700e895535e5f90aafe89b6888a691275 Mon Sep 17 00:00:00 2001 From: nsemets Date: Thu, 14 Aug 2025 18:46:47 +0300 Subject: [PATCH 3/4] fix(menu): changed overview to discover and replaced some icons --- .../pages/dashboard/dashboard.component.html | 10 ++-- .../pages/dashboard/dashboard.component.scss | 10 ---- .../pages/dashboard/dashboard.component.ts | 4 +- .../my-profile/my-profile.component.html | 2 +- .../preprint-services.component.html | 2 +- .../contributors/contributors.component.html | 11 ++-- .../title-and-abstract-step.component.html | 2 +- .../landing/preprints-landing.component.html | 11 ++-- .../features/preprints/preprints.routes.ts | 8 +-- .../view-duplicates.component.html | 7 ++- .../view-duplicates.component.ts | 5 +- .../linked-resources.component.html | 7 ++- .../linked-resources.component.ts | 5 +- .../overview-components.component.html | 7 ++- .../overview-components.component.ts | 5 +- .../registry-services.component.html | 2 +- .../my-registrations.component.scss | 3 + .../features/registries/registries.routes.ts | 4 +- .../registration-links-card.component.html | 9 +-- .../registration-links-card.component.ts | 9 +-- .../folder-selector.component.html | 2 +- .../data-resources.component.html | 53 +++++++++--------- .../data-resources.component.scss | 6 +- .../files-tree/files-tree.component.html | 14 ++--- .../my-projects-table.component.html | 2 +- .../my-projects-table.component.ts | 11 ++-- .../registration-card.component.html | 8 +-- .../registration-card.component.ts | 12 +++- src/assets/i18n/en.json | 4 +- src/assets/icons/colored/sort.svg | 4 -- src/assets/images/files/doc.svg | 4 -- src/assets/images/files/pdf.svg | 3 - src/assets/images/help-button.svg | 12 ---- src/assets/images/project/arnold-ven.png | Bin 6135 -> 0 bytes src/assets/images/project/center-for-os.png | Bin 10432 -> 0 bytes 35 files changed, 119 insertions(+), 139 deletions(-) delete mode 100644 src/assets/icons/colored/sort.svg delete mode 100644 src/assets/images/files/doc.svg delete mode 100644 src/assets/images/files/pdf.svg delete mode 100644 src/assets/images/help-button.svg delete mode 100644 src/assets/images/project/arnold-ven.png delete mode 100644 src/assets/images/project/center-for-os.png diff --git a/src/app/features/home/pages/dashboard/dashboard.component.html b/src/app/features/home/pages/dashboard/dashboard.component.html index e0b636867..d732f630d 100644 --- a/src/app/features/home/pages/dashboard/dashboard.component.html +++ b/src/app/features/home/pages/dashboard/dashboard.component.html @@ -34,12 +34,14 @@ /> -
- +
+

{{ 'home.loggedIn.publicProjects.title' | translate }}

-
+

{{ 'home.loggedIn.latestResearch.title' | translate }}

{{ 'home.loggedIn.latestResearch.subtitle' | translate }}

@@ -48,7 +50,7 @@

{{ 'home.loggedIn.latestResearch.title' | translate }}

-
+

{{ 'home.loggedIn.hosting.title' | translate }}

{{ 'home.loggedIn.hosting.subtitle' | translate }}

diff --git a/src/app/features/home/pages/dashboard/dashboard.component.scss b/src/app/features/home/pages/dashboard/dashboard.component.scss index e146c9417..db6bc077a 100644 --- a/src/app/features/home/pages/dashboard/dashboard.component.scss +++ b/src/app/features/home/pages/dashboard/dashboard.component.scss @@ -1,5 +1,3 @@ -@use "assets/styles/mixins" as mix; - :host { display: flex; flex-direction: column; @@ -20,20 +18,12 @@ .public-projects-container { background-color: var(--gradient-1); - - .osf-icon-search { - color: var(--dark-blue-1); - font-size: mix.rem(32px); - margin-right: mix.rem(12px); - } } .latest-research-container { background-color: var(--bg-blue-3); - row-gap: mix.rem(24px); } .hosting-container { background-color: var(--bg-blue-2); - row-gap: mix.rem(24px); } diff --git a/src/app/features/home/pages/dashboard/dashboard.component.ts b/src/app/features/home/pages/dashboard/dashboard.component.ts index 563e18143..66608b15f 100644 --- a/src/app/features/home/pages/dashboard/dashboard.component.ts +++ b/src/app/features/home/pages/dashboard/dashboard.component.ts @@ -16,7 +16,7 @@ import { ActivatedRoute, Router, RouterLink } from '@angular/router'; import { CreateProjectDialogComponent } from '@osf/features/my-projects/components'; import { AccountSettingsService } from '@osf/features/settings/account-settings/services'; -import { MyProjectsTableComponent, SubHeaderComponent } from '@osf/shared/components'; +import { IconComponent, MyProjectsTableComponent, SubHeaderComponent } from '@osf/shared/components'; import { MY_PROJECTS_TABLE_PARAMS } from '@osf/shared/constants'; import { SortOrder } from '@osf/shared/enums'; import { IS_MEDIUM } from '@osf/shared/helpers'; @@ -27,7 +27,7 @@ import { ConfirmEmailComponent } from '../../components'; @Component({ selector: 'osf-dashboard', - imports: [RouterLink, Button, SubHeaderComponent, MyProjectsTableComponent, TranslatePipe], + imports: [RouterLink, Button, SubHeaderComponent, MyProjectsTableComponent, IconComponent, TranslatePipe], templateUrl: './dashboard.component.html', styleUrl: './dashboard.component.scss', providers: [DialogService], diff --git a/src/app/features/my-profile/my-profile.component.html b/src/app/features/my-profile/my-profile.component.html index 75465539d..a1c91161c 100644 --- a/src/app/features/my-profile/my-profile.component.html +++ b/src/app/features/my-profile/my-profile.component.html @@ -42,7 +42,7 @@

{{ currentUser()?.fullName }}

@if (currentUser()?.education?.length) {
- +

{{ currentUser()?.education?.[0]?.institution }}

diff --git a/src/app/features/preprints/components/preprint-services/preprint-services.component.html b/src/app/features/preprints/components/preprint-services/preprint-services.component.html index afd953155..c4f3cc58a 100644 --- a/src/app/features/preprints/components/preprint-services/preprint-services.component.html +++ b/src/app/features/preprints/components/preprint-services/preprint-services.component.html @@ -8,7 +8,7 @@

{{ 'preprints.services.title' | translate }}

diff --git a/src/app/features/preprints/components/stepper/metadata-step/contributors/contributors.component.html b/src/app/features/preprints/components/stepper/metadata-step/contributors/contributors.component.html index 18e837dc1..c0aceccdb 100644 --- a/src/app/features/preprints/components/stepper/metadata-step/contributors/contributors.component.html +++ b/src/app/features/preprints/components/stepper/metadata-step/contributors/contributors.component.html @@ -1,11 +1,12 @@

{{ 'project.overview.metadata.contributors' | translate }}

+
- - - Warning: Changing your permissions will prevent you from editing your draft. + + {{ 'preprints.preprintContributorsWarning' | translate }}
+ {{ 'project.overview.metadata.contributors' | translate }}
diff --git a/src/app/features/preprints/components/stepper/title-and-abstract-step/title-and-abstract-step.component.html b/src/app/features/preprints/components/stepper/title-and-abstract-step/title-and-abstract-step.component.html index 7e835e96c..63e2b0b1c 100644 --- a/src/app/features/preprints/components/stepper/title-and-abstract-step/title-and-abstract-step.component.html +++ b/src/app/features/preprints/components/stepper/title-and-abstract-step/title-and-abstract-step.component.html @@ -50,7 +50,7 @@

{{ 'preprints.preprintStepper.titleAndAbstract.title' | translate }}

styleClass="w-full" [label]="'common.buttons.back' | translate" severity="info" - [routerLink]="['/preprints', 'overview', providerId(), 'discover']" + [routerLink]="['/preprints', providerId(), 'discover']" /> {{ 'preprints.title' | translate }}

{{ 'preprints.createServer.title' | translate }}

{{ 'preprints.createServer.description' | translate }} - {{ - 'preprints.createServer.openSourceCode' | translate - }} + + {{ 'preprints.createServer.openSourceCode' | translate }} + {{ 'preprints.createServer.and' | translate }} - {{ - 'preprints.createServer.publicRoadmap' | translate - }} + {{ 'preprints.createServer.publicRoadmap' | translate }} . {{ 'preprints.createServer.inputWelcome' | translate }}

diff --git a/src/app/features/preprints/preprints.routes.ts b/src/app/features/preprints/preprints.routes.ts index bb6400578..53d6f507a 100644 --- a/src/app/features/preprints/preprints.routes.ts +++ b/src/app/features/preprints/preprints.routes.ts @@ -36,24 +36,24 @@ export const preprintsRoutes: Routes = [ { path: '', pathMatch: 'full', - redirectTo: 'overview', + redirectTo: 'discover', }, { - path: 'overview', + path: 'discover', loadComponent: () => import('@osf/features/preprints/pages/landing/preprints-landing.component').then( (c) => c.PreprintsLandingComponent ), }, { - path: 'overview/:providerId', + path: ':providerId', loadComponent: () => import('@osf/features/preprints/pages/preprint-provider-overview/preprint-provider-overview.component').then( (c) => c.PreprintProviderOverviewComponent ), }, { - path: 'overview/:providerId/discover', + path: ':providerId/discover', loadComponent: () => import('@osf/features/preprints/pages/preprint-provider-discover/preprint-provider-discover.component').then( (c) => c.PreprintProviderDiscoverComponent diff --git a/src/app/features/project/analytics/components/view-duplicates/view-duplicates.component.html b/src/app/features/project/analytics/components/view-duplicates/view-duplicates.component.html index b3ca268c8..f3940f870 100644 --- a/src/app/features/project/analytics/components/view-duplicates/view-duplicates.component.html +++ b/src/app/features/project/analytics/components/view-duplicates/view-duplicates.component.html @@ -16,10 +16,11 @@

{{ 'project.overview.dialog.fork.noForksMessage' | @if (duplicate.currentUserPermissions.includes(UserPermissions.Read)) {
-

- +

+ {{ duplicate.title }}

+
@if (duplicate.currentUserPermissions.includes(UserPermissions.Write)) { icon="fas fa-ellipsis-vertical" raised variant="outlined" - (click)="componentActionMenu.toggle($event)" + (onClick)="componentActionMenu.toggle($event)" > } diff --git a/src/app/features/project/analytics/components/view-duplicates/view-duplicates.component.ts b/src/app/features/project/analytics/components/view-duplicates/view-duplicates.component.ts index d58e3aa7c..03596d19b 100644 --- a/src/app/features/project/analytics/components/view-duplicates/view-duplicates.component.ts +++ b/src/app/features/project/analytics/components/view-duplicates/view-duplicates.component.ts @@ -9,7 +9,7 @@ import { PaginatorState } from 'primeng/paginator'; import { map, of } from 'rxjs'; -import { DatePipe, NgClass } from '@angular/common'; +import { DatePipe } from '@angular/common'; import { ChangeDetectionStrategy, Component, @@ -32,6 +32,7 @@ import { } from '@osf/features/registry/store/registry-overview'; import { CustomPaginatorComponent, + IconComponent, LoadingSpinnerComponent, SubHeaderComponent, TruncatedTextComponent, @@ -49,11 +50,11 @@ import { ClearDuplicates, DuplicatesSelectors, GetAllDuplicates } from '@shared/ Button, Menu, TruncatedTextComponent, - NgClass, DatePipe, LoadingSpinnerComponent, RouterLink, CustomPaginatorComponent, + IconComponent, ], templateUrl: './view-duplicates.component.html', styleUrl: './view-duplicates.component.scss', diff --git a/src/app/features/project/overview/components/linked-resources/linked-resources.component.html b/src/app/features/project/overview/components/linked-resources/linked-resources.component.html index dafa8ce61..240745ac9 100644 --- a/src/app/features/project/overview/components/linked-resources/linked-resources.component.html +++ b/src/app/features/project/overview/components/linked-resources/linked-resources.component.html @@ -17,17 +17,18 @@

{{ 'project.overview.linkedProjects.title' | translate }}

@for (linkedResource of linkedResources(); track linkedResource.id) {
-

- +

+ {{ linkedResource.title }}

+
diff --git a/src/app/features/project/overview/components/linked-resources/linked-resources.component.ts b/src/app/features/project/overview/components/linked-resources/linked-resources.component.ts index 18ec6782c..5496a16f5 100644 --- a/src/app/features/project/overview/components/linked-resources/linked-resources.component.ts +++ b/src/app/features/project/overview/components/linked-resources/linked-resources.component.ts @@ -6,18 +6,17 @@ import { Button } from 'primeng/button'; import { DialogService } from 'primeng/dynamicdialog'; import { Skeleton } from 'primeng/skeleton'; -import { NgClass } from '@angular/common'; import { ChangeDetectionStrategy, Component, inject, input } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; import { DeleteNodeLinkDialogComponent, LinkResourceDialogComponent } from '@osf/features/project/overview/components'; -import { TruncatedTextComponent } from '@osf/shared/components'; +import { IconComponent, TruncatedTextComponent } from '@osf/shared/components'; import { IS_XSMALL } from '@osf/shared/helpers'; import { NodeLinksSelectors } from '@shared/stores'; @Component({ selector: 'osf-linked-resources', - imports: [Button, NgClass, Skeleton, TranslatePipe, TruncatedTextComponent], + imports: [Button, Skeleton, TranslatePipe, TruncatedTextComponent, IconComponent], templateUrl: './linked-resources.component.html', styleUrl: './linked-resources.component.scss', providers: [DialogService], diff --git a/src/app/features/project/overview/components/overview-components/overview-components.component.html b/src/app/features/project/overview/components/overview-components/overview-components.component.html index 57320c9c7..275c3c19c 100644 --- a/src/app/features/project/overview/components/overview-components/overview-components.component.html +++ b/src/app/features/project/overview/components/overview-components/overview-components.component.html @@ -19,10 +19,11 @@

{{ 'project.overview.components.title' | translate }}

@for (component of components(); track component.id) {
-

- +

+ {{ component.title }}

+
@if (component.currentUserPermissions.includes(UserPermissions.Write)) { icon="fas fa-ellipsis-vertical" raised variant="outlined" - (click)="componentActionMenu.toggle($event)" + (onClick)="componentActionMenu.toggle($event)" > } diff --git a/src/app/features/project/overview/components/overview-components/overview-components.component.ts b/src/app/features/project/overview/components/overview-components/overview-components.component.ts index b023deaeb..01660ddfd 100644 --- a/src/app/features/project/overview/components/overview-components/overview-components.component.ts +++ b/src/app/features/project/overview/components/overview-components/overview-components.component.ts @@ -7,12 +7,11 @@ import { DialogService } from 'primeng/dynamicdialog'; import { Menu } from 'primeng/menu'; import { Skeleton } from 'primeng/skeleton'; -import { NgClass } from '@angular/common'; import { ChangeDetectionStrategy, Component, inject, input } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; import { Router } from '@angular/router'; -import { TruncatedTextComponent } from '@osf/shared/components'; +import { IconComponent, TruncatedTextComponent } from '@osf/shared/components'; import { ResourceType, UserPermissions } from '@osf/shared/enums'; import { IS_XSMALL } from '@osf/shared/helpers'; @@ -22,7 +21,7 @@ import { DeleteComponentDialogComponent } from '../delete-component-dialog/delet @Component({ selector: 'osf-project-components', - imports: [Button, Menu, Skeleton, TranslatePipe, TruncatedTextComponent, NgClass], + imports: [Button, Menu, Skeleton, TranslatePipe, TruncatedTextComponent, IconComponent], templateUrl: './overview-components.component.html', styleUrl: './overview-components.component.scss', changeDetection: ChangeDetectionStrategy.OnPush, diff --git a/src/app/features/registries/components/registry-services/registry-services.component.html b/src/app/features/registries/components/registry-services/registry-services.component.html index 5a629b5e4..832caae5d 100644 --- a/src/app/features/registries/components/registry-services/registry-services.component.html +++ b/src/app/features/registries/components/registry-services/registry-services.component.html @@ -8,7 +8,7 @@

{{ 'registries.services.title' | translate }} diff --git a/src/app/features/registries/pages/my-registrations/my-registrations.component.scss b/src/app/features/registries/pages/my-registrations/my-registrations.component.scss index e69de29bb..5f81e6c60 100644 --- a/src/app/features/registries/pages/my-registrations/my-registrations.component.scss +++ b/src/app/features/registries/pages/my-registrations/my-registrations.component.scss @@ -0,0 +1,3 @@ +:host { + flex: 1; +} diff --git a/src/app/features/registries/registries.routes.ts b/src/app/features/registries/registries.routes.ts index 4b3ea5983..c2ce29a6f 100644 --- a/src/app/features/registries/registries.routes.ts +++ b/src/app/features/registries/registries.routes.ts @@ -31,11 +31,11 @@ export const registriesRoutes: Routes = [ redirectTo: 'overview', }, { - path: 'overview', + path: 'discover', loadComponent: () => import('@osf/features/registries/pages').then((c) => c.RegistriesLandingComponent), }, { - path: 'overview/:name', + path: ':name', loadComponent: () => import('@osf/features/registries/pages/registries-provider-search/registries-provider-search.component').then( (c) => c.RegistriesProviderSearchComponent diff --git a/src/app/features/registry/components/registration-links-card/registration-links-card.component.html b/src/app/features/registry/components/registration-links-card/registration-links-card.component.html index 95a2f6e72..8afb19122 100644 --- a/src/app/features/registry/components/registration-links-card/registration-links-card.component.html +++ b/src/app/features/registry/components/registration-links-card/registration-links-card.component.html @@ -1,12 +1,9 @@ @if (registrationData()) {
-
- @if (registrationData().isPublic) { - - } @else { - - } +
+ +

{{ registrationData().title || 'project.registrations.card.noTitle' | translate }}

diff --git a/src/app/features/registry/components/registration-links-card/registration-links-card.component.ts b/src/app/features/registry/components/registration-links-card/registration-links-card.component.ts index bc6556254..02831f81a 100644 --- a/src/app/features/registry/components/registration-links-card/registration-links-card.component.ts +++ b/src/app/features/registry/components/registration-links-card/registration-links-card.component.ts @@ -6,13 +6,14 @@ import { Card } from 'primeng/card'; import { DatePipe } from '@angular/common'; import { ChangeDetectionStrategy, Component, computed, input, output } from '@angular/core'; -import { LinkedNode, LinkedRegistration, RegistryComponentModel } from '@osf/features/registry/models'; -import { DataResourcesComponent, TruncatedTextComponent } from '@shared/components'; -import { RevisionReviewStates } from '@shared/enums'; +import { DataResourcesComponent, IconComponent, TruncatedTextComponent } from '@osf/shared/components'; +import { RevisionReviewStates } from '@osf/shared/enums'; + +import { LinkedNode, LinkedRegistration, RegistryComponentModel } from '../../models'; @Component({ selector: 'osf-registration-links-card', - imports: [Card, Button, TranslatePipe, DatePipe, DataResourcesComponent, TruncatedTextComponent], + imports: [Card, Button, TranslatePipe, DatePipe, DataResourcesComponent, TruncatedTextComponent, IconComponent], templateUrl: './registration-links-card.component.html', styleUrl: './registration-links-card.component.scss', changeDetection: ChangeDetectionStrategy.OnPush, diff --git a/src/app/shared/components/addons/folder-selector/folder-selector.component.html b/src/app/shared/components/addons/folder-selector/folder-selector.component.html index ca63a66d2..c9e78d3b9 100644 --- a/src/app/shared/components/addons/folder-selector/folder-selector.component.html +++ b/src/app/shared/components/addons/folder-selector/folder-selector.component.html @@ -47,7 +47,7 @@

{{ 'settings.addons.configureAddon.selectFolder' | translate }}

- + - @if (hasData()) { - data-resource - } @else { - - } + data-resource +

{{ 'resourceCard.resources.data' | translate }}

 + - @if (hasAnalyticCode()) { - code-resource - } @else { - - } + code-resource

{{ 'resourceCard.resources.analyticCode' | translate }}

 + - @if (hasMaterials()) { - materials-resource - } @else { - - } + materials-resource +

{{ 'resourceCard.resources.materials' | translate }}

 + - @if (hasPapers()) { - papers-resource - } @else { - - } + papers-resource +

{{ 'resourceCard.resources.papers' | translate }}

 + - @if (hasSupplements()) { - supplements-resource - } @else { - - } + supplements-resource +

{{ 'resourceCard.resources.supplements' | translate }}
diff --git a/src/app/shared/components/data-resources/data-resources.component.scss b/src/app/shared/components/data-resources/data-resources.component.scss index 95189c74d..0552ac4b9 100644 --- a/src/app/shared/components/data-resources/data-resources.component.scss +++ b/src/app/shared/components/data-resources/data-resources.component.scss @@ -1,13 +1,11 @@ -@use "/assets/styles/variables" as var; - .icon-container { - color: var.$dark-blue-1; + color: var(--dark-blue-1); display: flex; align-items: center; column-gap: 0.5rem; &:hover { text-decoration: none; - color: var.$pr-blue-1; + color: var(--pr-blue-1); } } diff --git a/src/app/shared/components/files-tree/files-tree.component.html b/src/app/shared/components/files-tree/files-tree.component.html index 3282cfd12..a1d66f1f1 100644 --- a/src/app/shared/components/files-tree/files-tree.component.html +++ b/src/app/shared/components/files-tree/files-tree.component.html @@ -10,7 +10,7 @@ @if (isDragOver()) {
-

{{ 'project.files.dropText' | translate }}

+

{{ 'project.files.dropText' | translate }}

}
@@ -35,12 +35,10 @@ @if (file.previousFolder) {
-
-
- - - {{ file.name ?? '' }} -
+
+ + + {{ file.name ?? '' }}
} @else { @@ -100,7 +98,7 @@

{{ 'project.files.emptyState' | transl } @else {
-

{{ 'project.files.dropText' | translate }}

+

{{ 'project.files.dropText' | translate }}

}

diff --git a/src/app/shared/components/my-projects-table/my-projects-table.component.html b/src/app/shared/components/my-projects-table/my-projects-table.component.html index 3b210ca68..141f1fda4 100644 --- a/src/app/shared/components/my-projects-table/my-projects-table.component.html +++ b/src/app/shared/components/my-projects-table/my-projects-table.component.html @@ -63,7 +63,7 @@

- + {{ item.title }}

diff --git a/src/app/shared/components/my-projects-table/my-projects-table.component.ts b/src/app/shared/components/my-projects-table/my-projects-table.component.ts index f15e71df9..a748d2238 100644 --- a/src/app/shared/components/my-projects-table/my-projects-table.component.ts +++ b/src/app/shared/components/my-projects-table/my-projects-table.component.ts @@ -8,14 +8,15 @@ import { CommonModule } from '@angular/common'; import { ChangeDetectionStrategy, Component, input, output } from '@angular/core'; import { FormControl } from '@angular/forms'; -import { SortOrder } from '@osf/shared/enums/sort-order.enum'; -import { TableParameters } from '@osf/shared/models/table-parameters.model'; -import { SearchInputComponent } from '@shared/components/search-input/search-input.component'; -import { MyResourcesItem } from '@shared/models/my-resources/my-resources.models'; +import { SortOrder } from '@osf/shared/enums'; +import { MyResourcesItem, TableParameters } from '@osf/shared/models'; + +import { IconComponent } from '../icon/icon.component'; +import { SearchInputComponent } from '../search-input/search-input.component'; @Component({ selector: 'osf-my-projects-table', - imports: [CommonModule, TableModule, SearchInputComponent, Skeleton, TranslatePipe], + imports: [CommonModule, TableModule, SearchInputComponent, IconComponent, Skeleton, TranslatePipe], templateUrl: './my-projects-table.component.html', styleUrl: './my-projects-table.component.scss', changeDetection: ChangeDetectionStrategy.OnPush, diff --git a/src/app/shared/components/registration-card/registration-card.component.html b/src/app/shared/components/registration-card/registration-card.component.html index 41f52bb53..2dfae9848 100644 --- a/src/app/shared/components/registration-card/registration-card.component.html +++ b/src/app/shared/components/registration-card/registration-card.component.html @@ -2,12 +2,8 @@ @if (registrationData()) {
-
- @if (registrationData().public) { - - } @else { - - } +
+

{{ registrationData().title || 'project.registrations.card.noTitle' | translate }}

diff --git a/src/app/shared/components/registration-card/registration-card.component.ts b/src/app/shared/components/registration-card/registration-card.component.ts index a1d28102f..733cb2197 100644 --- a/src/app/shared/components/registration-card/registration-card.component.ts +++ b/src/app/shared/components/registration-card/registration-card.component.ts @@ -11,11 +11,21 @@ import { RegistrationReviewStates, RegistryStatus, RevisionReviewStates } from ' import { RegistrationCard } from '@osf/shared/models'; import { DataResourcesComponent } from '../data-resources/data-resources.component'; +import { IconComponent } from '../icon/icon.component'; import { StatusBadgeComponent } from '../status-badge/status-badge.component'; @Component({ selector: 'osf-registration-card', - imports: [Card, Button, TranslatePipe, DatePipe, RouterLink, StatusBadgeComponent, DataResourcesComponent], + imports: [ + Card, + Button, + TranslatePipe, + DatePipe, + RouterLink, + StatusBadgeComponent, + DataResourcesComponent, + IconComponent, + ], templateUrl: './registration-card.component.html', styleUrl: './registration-card.component.scss', changeDetection: ChangeDetectionStrategy.OnPush, diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 36af20d73..5a1c35c56 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -2079,7 +2079,9 @@ "postModerationNotice": "{{pluralCapitalizedPreprintWord}} are a permanent part of the scholarly record. Withdrawal requests are subject to this service’s policy on {{singularPreprintWord}} version removal and at the discretion of the moderators.
This service uses post-moderation. This request will be submitted to service moderators for review. If the request is approved, this {{singularPreprintWord}} version will be replaced by a tombstone page with metadata and the reason for withdrawal. This {{singularPreprintWord}} version will still be searchable by other users after removal.", "noModerationNotice": "{{pluralCapitalizedPreprintWord}} are a permanent part of the scholarly record. Withdrawal requests are subject to this service’s policy on {{singularPreprintWord}} version removal and at the discretion of the moderators.
This request will be submitted to {{supportEmail}} for review and removal. If the request is approved, this {{singularPreprintWord}} version will be replaced by a tombstone page with metadata and the reason for withdrawal. This {{singularPreprintWord}} version will still be searchable by other users after removal." } - } + }, + "preprintContributorsWarning": "Warning: Changing your permissions will prevent you from editing your draft.", + "addContributorBySearch": "Add Contributor By Search" }, "registries": { "title": "Registries", diff --git a/src/assets/icons/colored/sort.svg b/src/assets/icons/colored/sort.svg deleted file mode 100644 index d0e579666..000000000 --- a/src/assets/icons/colored/sort.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/images/files/doc.svg b/src/assets/images/files/doc.svg deleted file mode 100644 index 0755bd04a..000000000 --- a/src/assets/images/files/doc.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/images/files/pdf.svg b/src/assets/images/files/pdf.svg deleted file mode 100644 index f2bd18821..000000000 --- a/src/assets/images/files/pdf.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/images/help-button.svg b/src/assets/images/help-button.svg deleted file mode 100644 index 3ef25edd3..000000000 --- a/src/assets/images/help-button.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/assets/images/project/arnold-ven.png b/src/assets/images/project/arnold-ven.png deleted file mode 100644 index fbe982d021ca8918960397d51ade0e8ef6e30cd0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6135 zcmX|FWmpv9+6F<=MS59UkQ8tMX{5VBP(qMc7m*TWL6GiRI+l_Wfu&1n5Rj0imsmoj zyO9()<9E*W{h66--gsu7_lf(yBMtP_L1c_%czAdqO$`+zJUo03;Mtty7I00P!JOma zf!j1y6pi0o?PPnp)2UwercuX_5QI=Sxho!0zmQISHuTMuf;cV$L>Po$!g`1IP)&vE z8~eU(9vLZzDy3pn6o(}tmRH@M{Z?2kiADl-VpV(pP-~`ryJ)lL>Cd_4pA9)je-pNS za&Xz%Ub{}|=_bZta2k8TZzACKw+AE&PRm^iOOMtbaqGeqQug)tr$2HqQc(%X=dEl# zVdN(6m?(YL8v}V#W-6R|6w4w5ZH#{d%=|rFWuts`@rRBxFdR3SDItHcUO-02uP}6z z3vKp#GJjbrjR<6%dSYU`(vye^=toIDZ@5RGDrCiu$BQ2ZfvfW_+N5Te`yDr$KPTb2 zJUIZreku-UGO|v2O*m~E1qHV3OnL{?86Uk0 zs7Lc|r{W=mLikP4zxl`|F~&Q3l}@-ClxAJyOM_ri5>rUGbhF zw6jn#9z;e)HU+RTtgYqv3qARK=U`~5FM;#^UAE`V9_5zJ9;nbXz$JTgjWoW5 zw@5`jMCS^%!R}9!6S=fqX1|n2gy6KttKGtrTP5l4N*3>%FUv0rh{vRC;rn7V_4VVB zNL7E;^Npe$(@pJ%t%S1(b$TTh8IKU-9<)hm13N!I*?5f8bd}=pU{FJY=gs=KIB#dE1SS`QoXH?rbelyz-(`&Ge&{=$P9 z$!)hwp9NbQQ1Lt&LB3fZ$-`iD<~Bj1b6V5w{_SS_(F}Kq8{L+O=*ErSHF@so-Hrj` zI#{hY4tlwg_CjI!!h;_r>Bd3g-pPmgm=gn%hB=?9$evkul*a$Le~}6ig)?kT5x9wP z-MfcB-%{1g=iu4RLJVRIA+@4ll`X!pth8!9*_r+2ce!(azGEa$8L6I3yj7tXLxvnH z)DCtU|E$Y9_J$E&$Ig6m6v$zstE+n(!sFEG^i9j@$32%Emu`;bhrO{ZOC}_<$Uj@( zuB~l1I$GMVFUTbv40>nk9qnqslMo}Wr37_W#RQ^0_cM3u>&$0 za2sx-bKvw0mv1L$?UU5D3)yf|kT-vfyxp(<{%WG!0{rC}+PL5Jd!y{%{VsMm5WE-lL&^=X@WjXd>CX6lP+4!tO2rfPfG6K;$wr4giGK?nN#@y&dEWTQxcWF&5-rnjNTQOvq9nDvXBX8G7`Pgl2GLlwJBzq4X? zjqn^$f-l;b5x4ZZ%3cnn7N^qLcZQJiCic6Z?9NBOR&^NrMB29o>bDJAh7F!>)~=gDp%NLPSQ?r%?NGGhwYCK!&SClM@i!s*>L;f2XL4O zn$_HY#cy03z`>cj7SQ8|%G2m0BN>3wSU5|Xd$j4@dF=OBvQk!OpTlbHjR6lQw(|~M z)L5CBC@n;h7&J0{r*?bWiI&t1e*p|H-0e7F{7gRqiKZv{n{EYz-RGvP`Y1+CO>MwK zd0_(-3YmYakV!oHM#w?v7Os{j3P!9+S__r&r($w6omC|6iuCDl99nc>;^gG)G8nc3 z78==ndAFu#%&V0qWT`-u8{AW2*<9QMM@2@j@pdZSvZ06DYJ)rnz^M;k#3I%SFN7?# zG(vF$58GqNR5!3CG<|sPBLRW2;$1pEzsgC7Nkg8XSY(jSbtKcSkh%!JAiDMV_4QYn zQ4L@f5C?{Nyv{Rc@4cfb7%xwD3K%nOdeq?rx%fbGbc>r43hWnxj@^7w?8@Gk6=#Q_ z5@?cMzT7I4e08HWTDc5-7xT&)QNMd0T>-zD^A4?-4U6Z{)-Znm}@ zn;M>bdmcb^%UYka4uMw$s6R*^5$p>+S)!0#!;&wZ>KF&~2%GgJQx!3#6e zI$g)c$Gx&`g1CA%PppL#8#KbwCC8@VC=i<*vuc#lXB|kqVJ9bMD67|FqYp!w;^1gd z@B`+d1N*~`U0;Rqx8k=26%E@n1h`{eb#(4*wuG3YCeSA2sv?lv6EzElfM-)yKAW;C zybr;}lTHim%ocx*F{4(~QL5%3k6VTmA2`_k>d`SCc(b#zhv2M)$|d0B^wdLuZ8YO< zM%CF=v%wyI3IdjuA{|gWiPqvHYE~QWFWQ%IWbuoO#!vQCFDJQcuy0Ee7v)&h2S(SP z+XjJR#C8`Zp1n}bRx1uo=g;it*2|uB_|^6}VgbV0>xcT@+gqT=3Dnp^#<3!9RUXWz zRNvJGeEqrk76~OO?Xtd*GnPPUnPL3Q4;+Er7g{s7W3sgjedSbP(`TYS0Z=pO*)o*MB z6{o?1YLikVt~6FRQ#=pLEPBv`RQ#yt8W+&Hy>c3po*w^KNSeP!&9zpUN#FyT?}tj} z$_J$KT?hoSh@E#^>dBV(XDt*lP0^M&$QOOLs)GhUOBsboyBDiYb$61ov@py0FifDE zT;`>*4#uTVk*c(4F(8$Q7Hz*rjn+dpqC8`y-mOx)608knC$)LPHNdIHf*<(FO2Hd@ z$wQg0ZINbR0sPSPzKilrTO2wve@_JWGL)A_7j~jvoM3+0J8JmD^OtXUJ&cfrF!XXyrpM_~vBEO)RG6k@+v`a2p5L#OjnzdX z-ZKcC;e&RiK>pc*ApL*wGNJc7~jof{wRU((vq@ffdH5h4kiM~0j!p!jkw zIf1<`a<2%H|4k502rV`2a;k2%s62%Y<5bi8y1js`5)ujxT7rJiJ0Vg^cB832?>m6l zg~Mxaj{i48Q~log&$Sk9X^rpT8KoH7kej3R`oDv?3RduH{b#_XpAbBo&k?=39|TE6q{D+q3Iu-P?vN{KMQ!t__iRp-ez)n~ni}Zw4U;X>%l5wZ z@-OPWuB~Q*kMWJ=V=yXVIx0wGZVqo;9do~v(F1mI_w_UP%=KSOwe7M`NjjqgEG(U@ zB`_*Kp9e6KXSU$Yo8a_*S%xuo47G@ezSC;=yE?Ru4v=PYUmpp)v}$rE9q$Zb6nlMU z=>xW~Ir#-q;{h4MojJO;=kp9zT78d#Tc$Yxga|^k{f?b<6b%*ORFB0*$2kaz?`PFp zX-@N&Gp!S@aY9ki5xkiXnO6D|V#TT*?#f0t;_}RD;oe92xkKPNa=AEaA)QQd!T6fy zVsF&TtPYQo*$|xCUBFncikhw}(zu5zH|)Z~ zqo&7I0;+jQo|E05`*rVspK2Bn&4i)ww-u9p_xWBkyuEC>-0 z-RU6Yv>*P6L?X+dH@+<~Dx6+$a=gngo4&7|icKFwPCw0x%8PQBvk{z*37u- z1x+%))>MV1;Z7)B_)bt%`_1)-k17)UHILs?u*p4ddGAK~#I&v;j>^MjkX~$bVlAgOcLRxYms z5wAnoK_PQ^JHmR0j)w4Qx%q9}jM;f`XV;ytjDeP>TbHMMcNfJRC$RuPMKA)NAwyGj z&Gto^BFnW~?A~{yUg9qa1zv9D(G?@u4n^ z>P+Ir&8WBeU+ze}Dx;kaMGN{Cwcp32Ftk!y`GyoPqsjNuLt|xRGT*hkfGX3W!J@6h+sp8m3Z*JkPro(mH8JZ&6FsCua|r6Y>$l6DgH5vg%>EC z4`HX&hZ6xUx|MJ?KZWd`>#Ivctzx4>EuiB9Ifc_#KBa!Brjben&?*uwk5+V%l4q0i ztoUNo8{MDn_xlN&)2U`1CCx(|w*C-%MueAA2}I1kVBBNOezo}mv`Yd* zdz-$Rkkw~jkw3LUf5_&mmvKLX*z4qvWSUW4dB%I3kgFGs#!fX0ub#;c*BynQ{_s(_2b8&Iq?q0k&yV-{h^z|uZQ;o>)cMue_2cYH!P+V?4ZH^0l12;L> z)3B}~@AiODGG^Ic#*14sw7xIBbSNtx)0Rt!F5&ERZXaw_F1=21LFL7=R|I{`%8Id1 z$FmJ(ZmfIGd?i>2`Mh%XRJ+&Opxw_`_8Sc1Nv0nZy62Gi>khLdrHFgi9Rz@U+0@s~ z%1x_pjmK#G!hfSPkdqw@l86y_aH^_z-Bm%kk9{4W(=HIQ!(8AfWSI?hW~?||34?5s z{LSp4mCb9*ZB%?}#KFPQ&6ECl#eVw?KhxE8`i7-DXqof9(LZid9423uCigeK?Wt0N z@*Gr|1%F~y-8Nj%;)}HhcgLxl&o<%}-mgzWv`p7T^!NOw+}9~T8iFiy<>la@h%+xr zdGKe#rw3>zI7OGv#frqG&tX3gsz9nK&EXu;^f*{o3RbS|3ef3*H6!I4%)#$(!RPb^ zNyHwNPRF7qGrb^DER}&E6Lf?2MEkXPGHtPGHHW9LpnTy{(sZu!$n`w=T^S7x^$S%s zwL|0UJ%IPd=&{z+)*}5H1*}>a5PEO^xyjg~P2!yj9M0_nG9?3Nrn0SP1Pn@lDl1)B zUnODMPPJuYcUF*=&b3RlW^5AJ1O5`P()Bl~UFN`k$D4%3E zUuIp#Z|ax&yv3LN{*sA`eGM()Qd$~BL^jL?^9f+!zb{&j)8xjV!3v7;7$Qx>#r3IEM~ts>7)OU*HI30pUx+29U}mQ#9f6*yjUQUj$Wt=;;?H))ruFyP z%boou@D@j4KHoFcO6Co8VWdxhS5GVMcix$-TRdYny?=$TlmK=!Xi5BKbJ9uvFgH#O zKpX~}syBQVZUTa%EF0e7BceJfh!ASWkV0CAOh7jh+mU6XTOTr$gr2~!%&e3ZB<+P9G~J`NGd5Oy2F*6WY&n_EBw~xyY$PLwV?jgM-F3zbLEXb=OXaDZ_*0M z8Tyn@L+w^``=Z+f8pW!tShzExZWZw#HSqJ?GsFv0K diff --git a/src/assets/images/project/center-for-os.png b/src/assets/images/project/center-for-os.png deleted file mode 100644 index 64955a25ac0f5012315b3cbca5dd1b7a556f27c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10432 zcmZ{qWmFq&*M;%o8lbqlyE`dTEVxT?mm&p#L@Q-u_ZrEP4yK^_+S)wY%4?LA^_kr_WOO@CZnlAD(b-L*d{N zPzaEq=(yY^G#c8$!7^AOFyK1}R1hJxxrSVB2^@SFDFPT7_3bP!Gplr0Zlp8>I7Hz8 zJ>)L|M4O$cv9ZzC+S+-ot$)A<*3b}FRFoPWeGrPA&BIfjl9G~@m9@f)fP{L-4?=#< zmI~_d*kQ%OQcYA$`8GQ{Tdd-)tf**bX9xGKIRY8=u7zg)THZ~(SA7s?rxB5^UD=T4P;j>a^w(f<<$ZUCy;R?mz;9rD@@2Bz= z;z>#4cC{dChIPLm?=SaOpuqVIr--2qjg5NR+S}XPD;)uk<5^<9zUr)OY+|CK!i!5w zOS%E4vT(_ub}1goM?uu5-05jz^Q%KcBpl=E0{%nz>tSzjY;0{YU0O?FklJX3H3eP@JbVdx%$uxuD6qe|-t0^hD`{XeFF`Anfa&vbV z@!?c%(xKbHh^zrQySQMZp;gzBbM4(Qel~0>-Q2|MtLdgPZT4Ug>x8DBOxm*ru4bN% z%+2OB7Cs;6@Xzl3cHu;ho}?%6%Du%J(t5&aZt7wW(*)F?gZ;DD5he#e^! z0&jMNa_H*L-dyg6pT=(ok=@*6Xc4OTJ+7Wl z2c5PFtXLO9TZo2scXqCi7x|LggI*=~e^!C%EiJ#@-F;qI+Tf5w(HFX00 z-hMES0w@+{?7xD(MUU~1RA)bi)PgWLr`*@c2?*p|*2;|VFT7iBZCeRxk6Kn7Y%lSxPn4S)H^->7G8AF-eY=U9^At zR3_xQcD4U7kJLm7EJ#Ej@0uXTliMXx61Sj)$QS1a0%;yFA1|-;TSK?1r0J}JxrT9!xLKg^1s3W|$g5C4>92fVVvt>+aK(2I#ZzC1tP z-`{hYwwa4PeL3Xeh!EG-)y21Pc5-58W!(;CTB7&K0HPtw8;M%-i4)W!alo}MlYh7-0vzRcSON0IR@q^E%>4Jqus&ui%x&7%()sks$&)cAE?VeSVNyPrNcfhA2 zYX>WfP0REs?x=srGzphOj=HJ+6$XFre{;O}Q>W}*EUAFaXxjPT!J~r%5)u-VCby7> zC+dpg;^NfQ)V#brJPd_6a+=!#pp1$uDt^!n$aTjU6l1Do%iZl6QiYmfD+}pXFiE<^L(uBj7c+*VfUgudg5SvYMHnU$3%2 zT%i3^9%5ro0o^}5tYP!?_U`aHA{s)J@YoxtaCCH}prG)aSXm(t8ci2qV`7Tp#kIV; zy&Z(JAJoXJu68#xOeg=xU6PvyLqtLS*W^OYWBvaL@x6h@nfO26LVOvWG>1v4M{!Dp)|vt3tJ zMIDqQ;ZHPYG_4BZ_6CZaYDw6aS3n?z8yJK*yu{NSi2Fd0ZKM% za-(UL#U#j28ZTD{P_5I|A1H)!pBz|91N$47%5^u zP0x(s;p%!O#{;fbG-|kG3wq6GE49b;S-)95-(%#_@iA-k@>E86akyhJ&i*CFS1Q43Y2Sy ?Lq6SEB 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 YHhh>u_bd4~U@{R-39KexDQh13KhrJI%K!iX From 9a91b4ff99c224663e1df1a3ea3475c5ce30db03 Mon Sep 17 00:00:00 2001 From: nsemets Date: Thu, 14 Aug 2025 18:49:52 +0300 Subject: [PATCH 4/4] fix(menu): added margin --- src/app/core/constants/nav-items.constant.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/core/constants/nav-items.constant.ts b/src/app/core/constants/nav-items.constant.ts index 0fba21ee3..523333453 100644 --- a/src/app/core/constants/nav-items.constant.ts +++ b/src/app/core/constants/nav-items.constant.ts @@ -394,7 +394,7 @@ export const MENU_ITEMS: MenuItem[] = [ visible: false, routerLink: null, routerLinkActiveOptions: { exact: false }, - styleClass: 'mt-5', + styleClass: 'my-5', }, { id: 'log-out', @@ -402,6 +402,6 @@ export const MENU_ITEMS: MenuItem[] = [ visible: false, routerLink: null, routerLinkActiveOptions: { exact: false }, - styleClass: 'mt-5', + styleClass: 'my-5', }, ];