From 06d9e384576c8b22394ffb5fa1f26a8ad7f1366f Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+shamoon@users.noreply.github.com>
Date: Sun, 9 Oct 2022 23:58:41 -0700
Subject: [PATCH] Fix tour / slim sidebar compatibility
---
.../app-frame/app-frame.component.html | 20 +++++++++----------
.../app-frame/app-frame.component.ts | 8 +-------
src-ui/src/styles.scss | 2 +-
3 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index 0c69b808d..3700105f3 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -126,8 +126,8 @@
Correspondents
-
-
+
+
Tags
@@ -147,8 +147,8 @@
Storage paths
-
-
+
+
{{tasksService.failedFileTasks.length}}
Logs
-
-
+
+
Settings
-
-
+
+
Admin
@@ -182,8 +182,8 @@
Info
- -
-
+
-
+
Documentation
diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts
index 98d60e461..b189409a8 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.ts
+++ b/src-ui/src/app/components/app-frame/app-frame.component.ts
@@ -26,7 +26,6 @@ import { TasksService } from 'src/app/services/tasks.service'
import { ComponentCanDeactivate } from 'src/app/guards/dirty-doc.guard'
import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings'
import { ToastService } from 'src/app/services/toast.service'
-import { TourService } from 'ngx-ui-tour-ng-bootstrap'
@Component({
selector: 'app-app-frame',
@@ -44,8 +43,7 @@ export class AppFrameComponent implements OnInit, ComponentCanDeactivate {
private list: DocumentListViewService,
public settingsService: SettingsService,
public tasksService: TasksService,
- private readonly toastService: ToastService,
- private tourService: TourService
+ private readonly toastService: ToastService
) {}
ngOnInit(): void {
@@ -89,10 +87,6 @@ export class AppFrameComponent implements OnInit, ComponentCanDeactivate {
})
}
- get tourIsActive(): boolean {
- return this.tourService.getStatus() == 1
- }
-
closeMenu() {
this.isMenuCollapsed = true
}
diff --git a/src-ui/src/styles.scss b/src-ui/src/styles.scss
index 5bbc1cc32..85f02c4d9 100644
--- a/src-ui/src/styles.scss
+++ b/src-ui/src/styles.scss
@@ -524,7 +524,7 @@ body.tour-active .sidebar {
z-index: inherit !important;
}
-.nav-link.touranchor--is-active {
+.nav-item.touranchor--is-active a {
font-weight: bold !important;
color: var(--bs-primary);
}