diff --git a/package-lock.json b/package-lock.json index aea4585..b0a1e21 100644 --- a/package-lock.json +++ b/package-lock.json @@ -57,7 +57,7 @@ "@typescript-eslint/eslint-plugin": "7.7.1", "@typescript-eslint/parser": "7.7.1", "conventional-changelog-cli": "5.0.0", - "electron": "33.0.2", + "electron": "33.1.0", "electron-builder": "25.1.8", "electron-debug": "4.1.0", "electron-installer-dmg": "5.0.1", @@ -11818,9 +11818,9 @@ } }, "node_modules/electron": { - "version": "33.0.2", - "resolved": "https://registry.npmjs.org/electron/-/electron-33.0.2.tgz", - "integrity": "sha512-C2WksfP0COsMHbYXSJG68j6S3TjuGDrw/YT42B526yXalIlNQZ2GeAYKryg6AEMkIp3p8TUfDRD0+HyiyCt/nw==", + "version": "33.1.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-33.1.0.tgz", + "integrity": "sha512-7KiY6MtRo1fVFLPGyHS7Inh8yZfrbUTy43nNwUgMD2CBk729BgSwOC2WhmcptNJVlzHJpVxSWkiVi2hp9mH/bw==", "dev": true, "hasInstallScript": true, "dependencies": { diff --git a/package.json b/package.json index de55aff..4d0efae 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "@typescript-eslint/eslint-plugin": "7.7.1", "@typescript-eslint/parser": "7.7.1", "conventional-changelog-cli": "5.0.0", - "electron": "33.0.2", + "electron": "33.1.0", "electron-builder": "25.1.8", "electron-debug": "4.1.0", "electron-installer-dmg": "5.0.1", diff --git a/src/app/pages/detail/detail.component.ts b/src/app/pages/detail/detail.component.ts index 735a09f..7755d1e 100644 --- a/src/app/pages/detail/detail.component.ts +++ b/src/app/pages/detail/detail.component.ts @@ -221,7 +221,7 @@ export class DetailComponent extends BasePageComponent implements AfterViewInit }); }); - const daemonStatusSub = this.daemonService.onDaemonStatusChanged.subscribe((running: boolean) => { + const daemonStatusSub: Subscription = this.daemonService.onDaemonStatusChanged.subscribe((running: boolean) => { if (!running) { this.destroyTables(); } diff --git a/src/app/pages/mining/mining.component.scss b/src/app/pages/mining/mining.component.scss index 82ce946..7933d38 100644 --- a/src/app/pages/mining/mining.component.scss +++ b/src/app/pages/mining/mining.component.scss @@ -4,7 +4,7 @@ user-select: none; } - @media (min-width: 768px) { + @media (width >= 768px) and (min-width: 768px) { .bd-placeholder-img-lg { font-size: 3.5rem; } @@ -27,7 +27,7 @@ .bi { vertical-align: -.125em; - fill: currentColor; + fill: currentcolor; } .nav-scroller { diff --git a/src/app/shared/components/navbar/navbar.component.ts b/src/app/shared/components/navbar/navbar.component.ts index 2cd751e..fa80802 100644 --- a/src/app/shared/components/navbar/navbar.component.ts +++ b/src/app/shared/components/navbar/navbar.component.ts @@ -125,7 +125,7 @@ export class NavbarComponent implements AfterViewInit, OnDestroy { queryResult.forEach((el) => tooltipTriggerList.push(el)); - const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl, { + const tooltipList: bootstrap.Tooltip[] = tooltipTriggerList.map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl, { placement: 'bottom' })); diff --git a/src/app/shared/components/sidebar/sidebar.component.scss b/src/app/shared/components/sidebar/sidebar.component.scss index c314ac6..361e3a9 100644 --- a/src/app/shared/components/sidebar/sidebar.component.scss +++ b/src/app/shared/components/sidebar/sidebar.component.scss @@ -11,8 +11,7 @@ main { height: 100vh; height: -webkit-fill-available; max-height: 100vh; - overflow-x: auto; - overflow-y: hidden; + overflow: auto scroll; } .dropdown-toggle { outline: 0; } diff --git a/src/styles.scss b/src/styles.scss index 60810ab..c207a58 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -24,10 +24,11 @@ $primary: #ff5733; } -@media (min-width: 768px) { +@media (width >= 768px) and (min-width: 768px) { .sidebar { position: fixed !important; } + .sidebar .offcanvas-lg { position: sticky; top: 48px;