diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html index ce0e82c90..50cf08ef6 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html @@ -70,6 +70,7 @@ diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.ts b/apps/red-ui/src/app/components/base-screen/base-screen.component.ts index 8648f04c9..e51e82711 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.ts +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.ts @@ -16,6 +16,7 @@ interface MenuItem { readonly routerLink?: string; readonly show: boolean; readonly action?: () => void; + readonly showDot?: () => boolean; } const isNavigationStart = event => event instanceof NavigationStart; @@ -33,22 +34,26 @@ export class BaseScreenComponent { name: _('top-bar.navigation-items.my-account.children.my-profile'), routerLink: '/main/my-profile', show: true, + showDot: () => false, }, { name: _('top-bar.navigation-items.my-account.children.admin'), routerLink: '/main/admin', show: this.currentUser.isManager || this.currentUser.isUserAdmin, action: this.appStateService.reset, + showDot: () => false, }, { name: _('top-bar.navigation-items.my-account.children.downloads'), routerLink: '/main/downloads', show: this.currentUser.isUser, + showDot: () => this.fileDownloadService.hasPendingDownloads, }, { name: _('top-bar.navigation-items.my-account.children.trash'), routerLink: '/main/admin/trash', show: this.currentUser.isManager, + showDot: () => false, }, ]; readonly searchActions: readonly SpotlightSearchAction[] = [ diff --git a/apps/red-ui/src/app/components/notifications/notifications.component.scss b/apps/red-ui/src/app/components/notifications/notifications.component.scss index c59622ea0..7d292b8b6 100644 --- a/apps/red-ui/src/app/components/notifications/notifications.component.scss +++ b/apps/red-ui/src/app/components/notifications/notifications.component.scss @@ -42,11 +42,7 @@ } .dot { - height: 8px; - width: 8px; - border-radius: 50%; background-color: variables.$grey-4; - position: absolute; top: 8px; right: 8px; } diff --git a/apps/red-ui/src/app/modules/dossier/components/page-indicator/page-indicator.component.scss b/apps/red-ui/src/app/modules/dossier/components/page-indicator/page-indicator.component.scss index 047d53725..9f97ddf1b 100644 --- a/apps/red-ui/src/app/modules/dossier/components/page-indicator/page-indicator.component.scss +++ b/apps/red-ui/src/app/modules/dossier/components/page-indicator/page-indicator.component.scss @@ -43,11 +43,6 @@ } .dot { - background: variables.$primary; - height: 8px; - width: 8px; - border-radius: 50%; - position: absolute; top: 9px; right: 10px; } diff --git a/libs/common-ui b/libs/common-ui index 782284f9e..d2f16b1a8 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 782284f9e97ce63c0ecbc5be4b99bd8e41d89ad2 +Subproject commit d2f16b1a8441e8d214a854582f9c8a10fda2fff0