From 020696fb176bc262469d9a78f10814feabb724bb Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Wed, 30 Dec 2020 23:16:30 -0800 Subject: [PATCH 01/13] Fix overflowing document titles on homepage mobile view --- .../saved-view-widget/saved-view-widget.component.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.scss b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.scss index e69de29bb..40d1c836b 100644 --- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.scss +++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.scss @@ -0,0 +1,7 @@ +table { + overflow-wrap: anywhere; +} + +th:first-child { + min-width: 5rem; +} From d42c13a9c6d71edb083f6e8162b30f1c197be969 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Wed, 30 Dec 2020 23:39:07 -0800 Subject: [PATCH 02/13] Reorganized navbar Updated search field, new user menu --- .../app-frame/app-frame.component.html | 58 +++++++++++-------- .../app-frame/app-frame.component.scss | 45 ++++++++++---- 2 files changed, 70 insertions(+), 33 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 d191ec0de..9d6c4924f 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 @@ -1,17 +1,43 @@
@@ -105,13 +131,6 @@  Logs -
  • - - - -  Settings - -
  • @@ -139,13 +158,6 @@  GitHub
    • -
  • - - - -  Logout - -
    • diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss index 5ace8a2ff..433fe3054 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.scss +++ b/src-ui/src/app/components/app-frame/app-frame.component.scss @@ -72,17 +72,42 @@ padding-top: .75rem; padding-bottom: .75rem; font-size: 1rem; - background-color: rgba(0, 0, 0, .25); - box-shadow: inset -1px 0 0 rgba(0, 0, 0, .25); } -.navbar .navbar-toggler { - top: .25rem; - right: 1rem; -} +.navbar .search-form-container { + max-width: 550px; + position: relative; -.navbar .form-control { - padding: .75rem 1rem; - border-width: 0; - border-radius: 0; + svg { + position: absolute; + left: 1.8em; + color: rgba(255, 255, 255, 0.6); + } + + &:focus-within { + svg { + display: none; + } + } + + .form-control { + color: rgba(255, 255, 255, 0.5); + background-color: rgba(0, 0, 0, 0.2); + padding-left: 1.8rem; + border-color: rgba(255, 255, 255, 0.5); + transition: flex 0.3s ease; + max-width: 600px; + min-width: 300px; // 1/2 max + + &::placeholder { + color: rgba(255, 255, 255, 0.5); + } + + &:focus { + background-color: #fff; + color: initial; + flex-grow: 1; + padding-left: 0.5rem; + } + } } From 2e544326e57fadd108c8473e3c6b6c0ec3ff9b4e Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Thu, 31 Dec 2020 00:35:54 -0800 Subject: [PATCH 03/13] Toggle caret tweaks --- .../app-frame/app-frame.component.scss | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss index 433fe3054..44b1531b1 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.scss +++ b/src-ui/src/app/components/app-frame/app-frame.component.scss @@ -1,23 +1,19 @@ - @import "/src/theme"; - - /* +/* * Sidebar */ - - .sidebar { +.sidebar { position: fixed; top: 0; bottom: 0; left: 0; z-index: 100; /* Behind the navbar */ - padding: 48px 0 0; /* Height of navbar */ + padding: 50px 0 0; /* Height of navbar */ box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1); } - @media (max-width: 767.98px) { .sidebar { - top: 3rem; + top: 3.5rem; } } @@ -26,11 +22,11 @@ top: 0; /* height: calc(100vh - 48px); */ height: 100%; - padding-top: .5rem; + padding-top: 0.5rem; overflow-x: hidden; - overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */ + overflow-y: auto; + /* Scrollable contents if viewport is shorter than content. */ } - @supports ((position: -webkit-sticky) or (position: sticky)) { .sidebar-sticky { position: -webkit-sticky; @@ -53,27 +49,33 @@ font-weight: bold; } -.sidebar .nav-link:hover .sidebaricon, -.sidebar .nav-link.active .sidebaricon { +.sidebar .nav-link.active .sidebaricon, +.sidebar .nav-link:hover .sidebaricon { color: inherit; } .sidebar-heading { - font-size: .75rem; + font-size: 0.75rem; text-transform: uppercase; } - /* * Navbar */ - - .navbar-brand { - padding-top: .75rem; - padding-bottom: .75rem; +.navbar-brand { + padding-top: 0.75rem; + padding-bottom: 0.75rem; font-size: 1rem; } +.navbar-toggler { +} + +.dropdown-toggle::after { + margin-left: 0.4em; + vertical-align: 0.155em; +} + .navbar .search-form-container { max-width: 550px; position: relative; @@ -91,16 +93,16 @@ } .form-control { - color: rgba(255, 255, 255, 0.5); - background-color: rgba(0, 0, 0, 0.2); + color: rgba(255, 255, 255, 0.3); + background-color: rgba(0, 0, 0, 0.15); padding-left: 1.8rem; - border-color: rgba(255, 255, 255, 0.5); + border-color: rgba(255, 255, 255, 0.2); transition: flex 0.3s ease; max-width: 600px; min-width: 300px; // 1/2 max &::placeholder { - color: rgba(255, 255, 255, 0.5); + color: rgba(255, 255, 255, 0.4); } &:focus { From be7bf5288b698359849552469a3114c13a44104e Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Thu, 31 Dec 2020 07:52:14 -0800 Subject: [PATCH 04/13] Fix alignment --- src-ui/src/app/components/app-frame/app-frame.component.html | 2 +- src-ui/src/app/components/app-frame/app-frame.component.scss | 2 +- 2 files changed, 2 insertions(+), 2 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 9d6c4924f..8029edc98 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 @@ -8,7 +8,7 @@ Paperless-ng -
    +
    diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss index 44b1531b1..f62eccf96 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.scss +++ b/src-ui/src/app/components/app-frame/app-frame.component.scss @@ -82,7 +82,7 @@ svg { position: absolute; - left: 1.8em; + left: 2rem; color: rgba(255, 255, 255, 0.6); } From f090537ef4c5650277b2b7f00fc29173e827f64f Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Thu, 31 Dec 2020 16:23:08 -0800 Subject: [PATCH 05/13] tweak username display, dropdown size + spacing --- .../app-frame/app-frame.component.html | 27 ++++++++++++------- .../app-frame/app-frame.component.scss | 13 ++++++++- .../app-frame/app-frame.component.ts | 23 +++++++++++++--- 3 files changed, 49 insertions(+), 14 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 8029edc98..a05b691af 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 @@ -20,21 +20,28 @@ diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss index f62eccf96..f2abb80f9 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.scss +++ b/src-ui/src/app/components/app-frame/app-frame.component.scss @@ -62,13 +62,16 @@ /* * Navbar */ + .navbar-brand { padding-top: 0.75rem; padding-bottom: 0.75rem; font-size: 1rem; } -.navbar-toggler { +.dropdown.show .dropdown-toggle, +.dropdown-toggle:hover { + opacity: 0.7; } .dropdown-toggle::after { @@ -76,6 +79,14 @@ vertical-align: 0.155em; } +.navbar .dropdown-menu { + font-size: 0.875rem; // body size + + a svg { + opacity: 0.6; + } +} + .navbar .search-form-container { max-width: 550px; position: relative; 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 c4c00843d..dca0d9106 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 @@ -9,7 +9,8 @@ import { SavedViewService } from 'src/app/services/rest/saved-view.service'; import { SearchService } from 'src/app/services/rest/search.service'; import { environment } from 'src/environments/environment'; import { DocumentDetailComponent } from '../document-detail/document-detail.component'; - +import { Meta } from '@angular/platform-browser'; + @Component({ selector: 'app-app-frame', templateUrl: './app-frame.component.html', @@ -22,8 +23,11 @@ export class AppFrameComponent implements OnInit, OnDestroy { private activatedRoute: ActivatedRoute, private openDocumentsService: OpenDocumentsService, private searchService: SearchService, - public savedViewService: SavedViewService + public savedViewService: SavedViewService, + private meta: Meta ) { + console.log(meta); + } versionString = `${environment.appTitle} ${environment.version}` @@ -55,7 +59,7 @@ export class AppFrameComponent implements OnInit, OnDestroy { term.length < 2 ? from([[]]) : this.searchService.autocomplete(term) ) ) - + itemSelected(event) { event.preventDefault() let currentSearch: string = this.searchField.value @@ -98,4 +102,17 @@ export class AppFrameComponent implements OnInit, OnDestroy { } } + get displayName() { + // TODO: taken from dashboard component, is this the best way to pass around username? + let tagFullName = this.meta.getTag('name=full_name') + let tagUsername = this.meta.getTag('name=username') + if (tagFullName && tagFullName.content) { + return tagFullName.content + } else if (tagUsername && tagUsername.content) { + return tagUsername.content + } else { + return null + } + } + } From dc525783ee396cd43f961d9e1a8d8a985afa58e8 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Fri, 1 Jan 2021 12:25:16 -0800 Subject: [PATCH 06/13] search icon position --- .../src/app/components/app-frame/app-frame.component.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss index f2abb80f9..473e6f85b 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.scss +++ b/src-ui/src/app/components/app-frame/app-frame.component.scss @@ -89,11 +89,14 @@ .navbar .search-form-container { max-width: 550px; - position: relative; + + form { + position: relative; + } svg { position: absolute; - left: 2rem; + left: 0.6rem; color: rgba(255, 255, 255, 0.6); } From 54a0da8151995d0182665d6e58535ef9d5276c44 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Fri, 1 Jan 2021 12:29:52 -0800 Subject: [PATCH 07/13] Dark mode compatability --- .../src/app/components/app-frame/app-frame.component.scss | 6 +++++- src-ui/src/theme_dark.scss | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss index 473e6f85b..2d3cc5f04 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.scss +++ b/src-ui/src/app/components/app-frame/app-frame.component.scss @@ -104,6 +104,10 @@ svg { display: none; } + + .form-control::placeholder { + color: rgba(255, 255, 255, 0); + } } .form-control { @@ -121,7 +125,7 @@ &:focus { background-color: #fff; - color: initial; + color: #212529; flex-grow: 1; padding-left: 0.5rem; } diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss index a122f1d86..5f08583e8 100644 --- a/src-ui/src/theme_dark.scss +++ b/src-ui/src/theme_dark.scss @@ -36,6 +36,10 @@ $border-color-dark-mode: #47494f; } } + .text-light { + color: $text-color-dark-mode !important; + } + .border { border-color: $border-color-dark-mode !important; } From a4e5d36a021440c86c65b32db512e85eee118d08 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Fri, 1 Jan 2021 12:36:19 -0800 Subject: [PATCH 08/13] Linting --- .../src/app/components/app-frame/app-frame.component.scss | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss index 2d3cc5f04..26c4db273 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.scss +++ b/src-ui/src/app/components/app-frame/app-frame.component.scss @@ -19,13 +19,11 @@ .sidebar-sticky { position: relative; - top: 0; - /* height: calc(100vh - 48px); */ + top: 0; /* height: calc(100vh - 48px); */ height: 100%; padding-top: 0.5rem; overflow-x: hidden; - overflow-y: auto; - /* Scrollable contents if viewport is shorter than content. */ + overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */ } @supports ((position: -webkit-sticky) or (position: sticky)) { .sidebar-sticky { From 6566e36141a6268ab294efb1f6f883678faf028b Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Fri, 1 Jan 2021 12:41:05 -0800 Subject: [PATCH 09/13] Mistakenly overwritten files from merge of dev branch --- src-ui/angular.json | 275 +++++++++++++------------ src-ui/src/environments/environment.ts | 2 +- 2 files changed, 139 insertions(+), 138 deletions(-) diff --git a/src-ui/angular.json b/src-ui/angular.json index f081430c7..db8c66b19 100644 --- a/src-ui/angular.json +++ b/src-ui/angular.json @@ -1,138 +1,139 @@ { - "$schema": "./node_modules/@angular/cli/lib/config/schema.json", - "version": 1, - "newProjectRoot": "projects", - "projects": { - "paperless-ui": { - "projectType": "application", - "schematics": { - "@schematics/angular:component": { - "style": "scss" - } - }, - "root": "", - "sourceRoot": "src", - "prefix": "app", - "architect": { - "build": { - "builder": "@angular-devkit/build-angular:browser", - "options": { - "outputPath": "dist/paperless-ui", - "outputHashing": "none", - "index": "src/index.html", - "main": "src/main.ts", - "polyfills": "src/polyfills.ts", - "tsConfig": "tsconfig.app.json", - "aot": true, - "assets": [ - "src/favicon.ico", - "src/assets", - "src/manifest.webmanifest" - ], - "styles": [ - "src/styles.scss" - ], - "scripts": [], - "allowedCommonJsDependencies": [ - "ng2-pdf-viewer" - ] - }, - "configurations": { - "production": { - "fileReplacements": [ - { - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.prod.ts" - } - ], - "optimization": true, - "outputHashing": "none", - "sourceMap": false, - "extractCss": true, - "namedChunks": false, - "extractLicenses": true, - "vendorChunk": false, - "buildOptimizer": true, - "budgets": [ - { - "type": "initial", - "maximumWarning": "2mb", - "maximumError": "5mb" - }, - { - "type": "anyComponentStyle", - "maximumWarning": "6kb", - "maximumError": "10kb" - } - ] - } - } - }, - "serve": { - "builder": "@angular-devkit/build-angular:dev-server", - "options": { - "browserTarget": "paperless-ui:build" - }, - "configurations": { - "production": { - "browserTarget": "paperless-ui:build:production" - } - } - }, - "extract-i18n": { - "builder": "@angular-devkit/build-angular:extract-i18n", - "options": { - "browserTarget": "paperless-ui:build" - } - }, - "test": { - "builder": "@angular-devkit/build-angular:karma", - "options": { - "main": "src/test.ts", - "polyfills": "src/polyfills.ts", - "tsConfig": "tsconfig.spec.json", - "karmaConfig": "karma.conf.js", - "assets": [ - "src/favicon.ico", - "src/assets", - "src/manifest.webmanifest" - ], - "styles": [ - "src/styles.scss" - ], - "scripts": [] - } - }, - "lint": { - "builder": "@angular-devkit/build-angular:tslint", - "options": { - "tsConfig": [ - "tsconfig.app.json", - "tsconfig.spec.json", - "e2e/tsconfig.json" - ], - "exclude": [ - "**/node_modules/**" - ] - } - }, - "e2e": { - "builder": "@angular-devkit/build-angular:protractor", - "options": { - "protractorConfig": "e2e/protractor.conf.js", - "devServerTarget": "paperless-ui:serve" - }, - "configurations": { - "production": { - "devServerTarget": "paperless-ui:serve:production" - } - } - } - } - } - }, - "defaultProject": "paperless-ui", - "cli": { - "analytics": "7c47c2bc-b97e-4014-85ae-b0c99b5750b4" - } -} \ No newline at end of file + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "version": 1, + "newProjectRoot": "projects", + "projects": { + "paperless-ui": { + "projectType": "application", + "schematics": { + "@schematics/angular:component": { + "style": "scss" + } + }, + "root": "", + "sourceRoot": "src", + "prefix": "app", + "architect": { + "build": { + "builder": "@angular-devkit/build-angular:browser", + "options": { + "outputPath": "dist/paperless-ui", + "outputHashing": "none", + "index": "src/index.html", + "main": "src/main.ts", + "polyfills": "src/polyfills.ts", + "tsConfig": "tsconfig.app.json", + "aot": true, + "assets": [ + "src/favicon.ico", + "src/assets", + "src/manifest.webmanifest", { + "glob": "pdf.worker.min.js", + "input": "node_modules/pdfjs-dist/build/", + "output": "/assets/js/" + } + ], + "styles": [ + "src/styles.scss" + ], + "scripts": [], + "allowedCommonJsDependencies": [ + "ng2-pdf-viewer" + ] + }, + "configurations": { + "production": { + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.prod.ts" + } + ], + "optimization": true, + "outputHashing": "none", + "sourceMap": false, + "extractCss": true, + "namedChunks": false, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": true, + "budgets": [ + { + "type": "initial", + "maximumWarning": "2mb", + "maximumError": "5mb" + }, + { + "type": "anyComponentStyle", + "maximumWarning": "6kb", + "maximumError": "10kb" + } + ] + } + } + }, + "serve": { + "builder": "@angular-devkit/build-angular:dev-server", + "options": { + "browserTarget": "paperless-ui:build" + }, + "configurations": { + "production": { + "browserTarget": "paperless-ui:build:production" + } + } + }, + "extract-i18n": { + "builder": "@angular-devkit/build-angular:extract-i18n", + "options": { + "browserTarget": "paperless-ui:build" + } + }, + "test": { + "builder": "@angular-devkit/build-angular:karma", + "options": { + "main": "src/test.ts", + "polyfills": "src/polyfills.ts", + "tsConfig": "tsconfig.spec.json", + "karmaConfig": "karma.conf.js", + "assets": [ + "src/favicon.ico", + "src/assets", + "src/manifest.webmanifest" + ], + "styles": [ + "src/styles.scss" + ], + "scripts": [] + } + }, + "lint": { + "builder": "@angular-devkit/build-angular:tslint", + "options": { + "tsConfig": [ + "tsconfig.app.json", + "tsconfig.spec.json", + "e2e/tsconfig.json" + ], + "exclude": [ + "**/node_modules/**" + ] + } + }, + "e2e": { + "builder": "@angular-devkit/build-angular:protractor", + "options": { + "protractorConfig": "e2e/protractor.conf.js", + "devServerTarget": "paperless-ui:serve" + }, + "configurations": { + "production": { + "devServerTarget": "paperless-ui:serve:production" + } + } + } + } + } + }, + "defaultProject": "paperless-ui" +} diff --git a/src-ui/src/environments/environment.ts b/src-ui/src/environments/environment.ts index 7c5b29e82..29a8f3af6 100644 --- a/src-ui/src/environments/environment.ts +++ b/src-ui/src/environments/environment.ts @@ -4,7 +4,7 @@ export const environment = { production: false, - apiBaseUrl: "http://10.0.1.26:8000/api/", + apiBaseUrl: "http://localhost:8000/api/", appTitle: "Paperless-ng", version: "DEVELOPMENT" }; From 77409616974f5c59cd3a7af253ea108bf074e0b9 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Fri, 1 Jan 2021 12:42:58 -0800 Subject: [PATCH 10/13] Spaces --- src-ui/src/app/components/app-frame/app-frame.component.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss index 26c4db273..d23ee8141 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.scss +++ b/src-ui/src/app/components/app-frame/app-frame.component.scss @@ -19,11 +19,11 @@ .sidebar-sticky { position: relative; - top: 0; /* height: calc(100vh - 48px); */ + top: 0; /* height: calc(100vh - 48px); */ height: 100%; padding-top: 0.5rem; overflow-x: hidden; - overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */ + overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */ } @supports ((position: -webkit-sticky) or (position: sticky)) { .sidebar-sticky { From 3d2d9cb3a2e00052b0390e1f09ba55fd1b4d4374 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Fri, 1 Jan 2021 12:43:19 -0800 Subject: [PATCH 11/13] Remove unused line --- src-ui/src/app/components/app-frame/app-frame.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss index d23ee8141..6809875eb 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.scss +++ b/src-ui/src/app/components/app-frame/app-frame.component.scss @@ -19,7 +19,7 @@ .sidebar-sticky { position: relative; - top: 0; /* height: calc(100vh - 48px); */ + top: 0; height: 100%; padding-top: 0.5rem; overflow-x: hidden; From 1234634ba3a301394aa5816affb7e70bd17ba563 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Fri, 1 Jan 2021 12:49:48 -0800 Subject: [PATCH 12/13] Not sure why Typescript complained about this --- src-ui/src/app/app.component.ts | 2 +- src-ui/src/app/services/app-view.service.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src-ui/src/app/app.component.ts b/src-ui/src/app/app.component.ts index 1c2001043..30ecb40d0 100644 --- a/src-ui/src/app/app.component.ts +++ b/src-ui/src/app/app.component.ts @@ -9,8 +9,8 @@ import { AppViewService } from './services/app-view.service'; export class AppComponent { constructor (appViewService: AppViewService) { - appViewService.updateDarkModeSettings() (window as any).pdfWorkerSrc = '/assets/js/pdf.worker.min.js'; + appViewService.updateDarkModeSettings() } diff --git a/src-ui/src/app/services/app-view.service.ts b/src-ui/src/app/services/app-view.service.ts index 6af2e43af..67a429ffe 100644 --- a/src-ui/src/app/services/app-view.service.ts +++ b/src-ui/src/app/services/app-view.service.ts @@ -18,7 +18,7 @@ export class AppViewService { this.updateDarkModeSettings() } - updateDarkModeSettings() { + updateDarkModeSettings(): void { let darkModeUseSystem = this.settings.get(SETTINGS_KEYS.DARK_MODE_USE_SYSTEM) let darkModeEnabled = this.settings.get(SETTINGS_KEYS.DARK_MODE_ENABLED) From 1e541b688ddd5dc3f85a739a9acf51554d5ca31b Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Fri, 1 Jan 2021 12:52:35 -0800 Subject: [PATCH 13/13] brand width rem --- src-ui/src/app/components/app-frame/app-frame.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 36408dce5..46065a102 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 @@ -5,7 +5,7 @@ - + Paperless-ng