From e11c763aff525b76c8e3a4905d608dbe8f284c4f Mon Sep 17 00:00:00 2001 From: Anukriti Singh Date: Tue, 12 Dec 2023 18:03:14 +0530 Subject: [PATCH] [MNT-23433] passing close button position --- app/src/app.config.json | 2 +- .../viewer/src/lib/components/viewer/viewer.component.html | 4 ++-- .../viewer/src/lib/components/viewer/viewer.component.scss | 7 +------ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/app/src/app.config.json b/app/src/app.config.json index 1c3e46a273..d5d37a0a42 100644 --- a/app/src/app.config.json +++ b/app/src/app.config.json @@ -1135,6 +1135,6 @@ "downloadPromptReminderDelay": 30, "enableFileAutoDownload": true, "fileAutoDownloadSizeThresholdInMB": 15, - "isCloseButtonOnLeft": false + "closeButtonPosition": "right" } } diff --git a/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.html b/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.html index 7b0793b48f..ecb907f324 100644 --- a/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.html +++ b/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.html @@ -7,13 +7,13 @@ [nodeId]="nodeId" [versionId]="versionId" [allowNavigate]="navigateMultiple" - [allowRightSidebar]="true" + [allowRightSidebar]="false" [allowPrint]="false" [showRightSidebar]="true" [allowDownload]="false" [allowFullScreen]="false" [overlayMode]="true" - [allowGoBack]="'viewer.isCloseButtonOnLeft' | adfAppConfig: false" + [closeButtonPosition]="'viewer.closeButtonPosition' | adfAppConfig: 'right'" (showViewerChange)="onViewerVisibilityChanged()" [canNavigateBefore]="!!previousNodeId" [canNavigateNext]="!!nextNodeId" diff --git a/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.scss b/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.scss index f2fcaea1c1..64beb08bcd 100644 --- a/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.scss +++ b/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.scss @@ -16,15 +16,10 @@ } } - .adf-viewer-close-button { + .adf-right-close-button { padding-left: 12px; } - // todo: remove this when viewer supports extensions - .adf-viewer-toolbar > * > button:nth-last-child(3) { - display: none; - } - .adf-alfresco-viewer.aca-right_side--hide .adf-viewer__sidebar__right { width: 0; }