Merge from develop

This commit is contained in:
Konstantinos Triantafyllou 2023-05-29 15:26:29 +03:00
commit ab13a41625
3 changed files with 6 additions and 6 deletions

View File

@ -365,8 +365,8 @@ export class AppComponent implements OnInit, OnDestroy {
title: this.stakeholder.name,
logoUrl: StringUtils.getLogoUrl(this.stakeholder),
logoSmallUrl: StringUtils.getLogoUrl(this.stakeholder),
logoInfo: '<div class="uk-margin-left uk-width-medium"><div class="uk-margin-remove uk-text-background uk-text-bold uk-text-small">Monitor</div>' +
'<div class="uk-h6 uk-text-truncate uk-margin-remove">Dashboard</div></div>',
logoInfo: '<div class="uk-margin-left uk-width-medium"><div class="uk-margin-remove uk-text-background uk-text-bold uk-text-small">Monitor Dashboard</div>' +
'<div class="uk-h6 uk-text-truncate uk-margin-remove">' + this.stakeholder.name + '</div></div>',
position: 'left',
badge: true,
menuPosition: "center"
@ -378,8 +378,8 @@ export class AppComponent implements OnInit, OnDestroy {
title: this.stakeholder.name,
logoUrl: StringUtils.getLogoUrl(this.stakeholder),
logoSmallUrl: StringUtils.getLogoUrl(this.stakeholder),
logoInfo: '<div class="uk-margin-left uk-width-medium"><div class="uk-margin-remove uk-text-background uk-text-bold uk-text-small">Monitor Admin</div>' +
'<div class="uk-h6 uk-text-truncate uk-margin-remove">Dashboard</div></div>',
logoInfo: '<div class="uk-margin-left uk-width-medium"><div class="uk-margin-remove uk-text-background uk-text-bold uk-text-small">Monitor Admin Dashboard</div>' +
'<div class="uk-h6 uk-text-truncate uk-margin-remove">' + this.stakeholder.name + '</div></div>',
position: 'left',
badge: true,
menuPosition: "center"

@ -1 +1 @@
Subproject commit 2ca9f0bdd44ce4e37258cc63dccd3667d92d5379
Subproject commit 4e91d169e0b657b34c79f4613f9fb1a7031b03f6

@ -1 +1 @@
Subproject commit c92a0dea1b7fc51f0cf272f8d4343735d000a23b
Subproject commit 468b2b008f474c88dacc52991a5231693833f1f9