From 4d86850bc7fc2f56f12ddb7bd9dcec2cfa92b849 Mon Sep 17 00:00:00 2001
From: Eugene Pankov <e@ajenti.org>
Date: Mon, 6 Feb 2023 22:01:53 +0100
Subject: [PATCH] wip

---
 app/src/preload.scss                          |  2 --
 app/src/toastr.scss                           |  4 +++
 .../src/components/startPage.component.ts     |  1 +
 tabby-core/src/services/profiles.service.ts   | 30 +++++++++----------
 tabby-core/src/theme.scss                     |  1 +
 tabby-core/src/theme.vendor.scss              |  3 ++
 6 files changed, 24 insertions(+), 17 deletions(-)
 create mode 100644 tabby-core/src/theme.vendor.scss

diff --git a/app/src/preload.scss b/app/src/preload.scss
index d6e22b4f..7f72c897 100644
--- a/app/src/preload.scss
+++ b/app/src/preload.scss
@@ -1,5 +1,3 @@
-// TODO test toastr
-
 app-root {
   background: #1D272D;
 }
diff --git a/app/src/toastr.scss b/app/src/toastr.scss
index 172e60a5..c85259d3 100644
--- a/app/src/toastr.scss
+++ b/app/src/toastr.scss
@@ -8,6 +8,8 @@
     box-shadow: 0 1px 0 rgba(0,0,0,.25);
     padding: 7px 12px;
     background-image: none;
+    display: block !important;
+    border: none !important;
     width: auto;
     flex-basis: auto;
     border-radius: 0.5rem;
@@ -15,10 +17,12 @@
 
     &.toast-error {
       background-color: #BD362F;
+      color: white !important;
     }
 
     &.toast-info {
       background-color: #555;
+      color: #eee !important;
     }
   }
 }
diff --git a/tabby-core/src/components/startPage.component.ts b/tabby-core/src/components/startPage.component.ts
index 36738229..2f47c76c 100644
--- a/tabby-core/src/components/startPage.component.ts
+++ b/tabby-core/src/components/startPage.component.ts
@@ -28,6 +28,7 @@ export class StartPageComponent {
         return this.domSanitizer.bypassSecurityTrustHtml(icon ?? '')
     }
 
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
     buttonsTrackBy (_, btn: Command): any {
         return btn.label + btn.icon
     }
diff --git a/tabby-core/src/services/profiles.service.ts b/tabby-core/src/services/profiles.service.ts
index 3468c6b2..97d3488d 100644
--- a/tabby-core/src/services/profiles.service.ts
+++ b/tabby-core/src/services/profiles.service.ts
@@ -156,21 +156,21 @@ export class ProfilesService {
                     callback: () => resolve(p),
                 }))]
 
-                // TODO try {
-                //     const { SettingsTabComponent } = window['nodeRequire']('tabby-settings')
-                //     options.push({
-                //         name: this.translate.instant('Manage profiles'),
-                //         icon: 'fas fa-window-restore',
-                //         weight: 10,
-                //         callback: () => {
-                //             this.app.openNewTabRaw({
-                //                 type: SettingsTabComponent,
-                //                 inputs: { activeTab: 'profiles' },
-                //             })
-                //             resolve(null)
-                //         },
-                //     })
-                // } catch { }
+                try {
+                    const { SettingsTabComponent } = window['nodeRequire']('tabby-settings')
+                    options.push({
+                        name: this.translate.instant('Manage profiles'),
+                        icon: 'fas fa-window-restore',
+                        weight: 10,
+                        callback: () => {
+                            this.app.openNewTabRaw({
+                                type: SettingsTabComponent,
+                                inputs: { activeTab: 'profiles' },
+                            })
+                            resolve(null)
+                        },
+                    })
+                } catch { }
 
                 if (this.getProviders().some(x => x.supportsQuickConnect)) {
                     options.push({
diff --git a/tabby-core/src/theme.scss b/tabby-core/src/theme.scss
index be0e172c..40084749 100644
--- a/tabby-core/src/theme.scss
+++ b/tabby-core/src/theme.scss
@@ -7,6 +7,7 @@ $button-hover-bg: rgba(0, 0, 0, .25);
 $button-active-bg: rgba(0, 0, 0, .5);
 
 @import '~bootstrap/scss/bootstrap.scss';
+@import "./theme.vendor.scss";
 
 window-controls {
     svg {
diff --git a/tabby-core/src/theme.vendor.scss b/tabby-core/src/theme.vendor.scss
new file mode 100644
index 00000000..e22f66e1
--- /dev/null
+++ b/tabby-core/src/theme.vendor.scss
@@ -0,0 +1,3 @@
+// $alert-border-radius: 0;
+// @mixin border-radius ($r) {}
+@import "../../node_modules/ngx-toastr/toastr-bs5-alert.scss";