From 67437f7b9cb1974406e4d2f53a4bb2a218d58672 Mon Sep 17 00:00:00 2001 From: Daniel <71837281+darmiel@users.noreply.github.com> Date: Sat, 6 Mar 2021 15:27:55 +0100 Subject: [PATCH 01/86] Check if the user has permissions for Docker --- install-paperless-ng.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/install-paperless-ng.sh b/install-paperless-ng.sh index 8fb44e222..b0f0950fc 100755 --- a/install-paperless-ng.sh +++ b/install-paperless-ng.sh @@ -64,6 +64,17 @@ if [[ -z $(which docker-compose) ]] ; then exit 1 fi +# Check if user has permissions to run Docker by trying to get the status of Docker (docker status). +# If this fails, the user probably does not have permissions for Docker. +docker stats --no-stream 2>/dev/null 1>&2 +if [ $? -ne 0 ] ; then + echo "" + echo "WARN: It look like the current user does not have Docker permissions." + echo "WARN: Use 'sudo usermod -aG docker $USER' to assign Docker permissions to the user." + echo "" + sleep 3 +fi + echo "" echo "############################################" echo "### Paperless-ng docker installation ###" From 42fd62ecfd54bd55915439690b88552b3020c914 Mon Sep 17 00:00:00 2001 From: Daniel <71837281+darmiel@users.noreply.github.com> Date: Sat, 6 Mar 2021 15:30:16 +0100 Subject: [PATCH 02/86] Changed spaces to tabs --- install-paperless-ng.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install-paperless-ng.sh b/install-paperless-ng.sh index b0f0950fc..f9cfddf14 100755 --- a/install-paperless-ng.sh +++ b/install-paperless-ng.sh @@ -68,8 +68,8 @@ fi # If this fails, the user probably does not have permissions for Docker. docker stats --no-stream 2>/dev/null 1>&2 if [ $? -ne 0 ] ; then - echo "" - echo "WARN: It look like the current user does not have Docker permissions." + echo "" + echo "WARN: It look like the current user does not have Docker permissions." echo "WARN: Use 'sudo usermod -aG docker $USER' to assign Docker permissions to the user." echo "" sleep 3 From 4862eb5e84c656f5921eedeb8ad43d395c553bd8 Mon Sep 17 00:00:00 2001 From: Daniel <71837281+darmiel@users.noreply.github.com> Date: Sat, 6 Mar 2021 15:40:19 +0100 Subject: [PATCH 03/86] Use -e switch after docker permission check --- install-paperless-ng.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install-paperless-ng.sh b/install-paperless-ng.sh index f9cfddf14..c550d253c 100755 --- a/install-paperless-ng.sh +++ b/install-paperless-ng.sh @@ -1,7 +1,5 @@ #!/bin/bash -set -e - ask() { while true ; do if [[ -z $3 ]] ; then @@ -75,6 +73,8 @@ if [ $? -ne 0 ] ; then sleep 3 fi +set -e + echo "" echo "############################################" echo "### Paperless-ng docker installation ###" From 254dc62ca672f6b4fd11126dd907fb4b335ba70c Mon Sep 17 00:00:00 2001 From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com> Date: Sat, 6 Mar 2021 22:50:35 +0100 Subject: [PATCH 04/86] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e59535af4..7cecbc0f8 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ [![ci](https://github.com/jonaswinkler/paperless-ng/workflows/ci/badge.svg)](https://github.com/jonaswinkler/paperless-ng/actions) ![Ansible Role](https://github.com/jonaswinkler/paperless-ng/workflows/Ansible%20Role/badge.svg) +[![Crowdin](https://badges.crowdin.net/paperless-ng/localized.svg)](https://crowdin.com/project/paperless-ng) [![Documentation Status](https://readthedocs.org/projects/paperless-ng/badge/?version=latest)](https://paperless-ng.readthedocs.io/en/latest/?badge=latest) [![Gitter](https://badges.gitter.im/paperless-ng/community.svg)](https://gitter.im/paperless-ng/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Docker Hub Pulls](https://img.shields.io/docker/pulls/jonaswinkler/paperless-ng.svg)](https://hub.docker.com/r/jonaswinkler/paperless-ng) From 59bc467c508f2e9576d39219dc3226f095b5a054 Mon Sep 17 00:00:00 2001 From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com> Date: Sat, 6 Mar 2021 22:52:52 +0100 Subject: [PATCH 05/86] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7cecbc0f8..45c71ab67 100644 --- a/README.md +++ b/README.md @@ -78,9 +78,9 @@ The documentation for Paperless-ng is available on [ReadTheDocs](https://paperle # Translation -Paperless is currently available in English, German, Dutch, French, and Portuguese. +Paperless is currently available in English, German, Dutch, French, Portuguese, Italian, and Romanian. -There's an active translation project at transifex! If you want to help out by translating paperless into your language, please head over to https://github.com/jonaswinkler/paperless-ng/issues/212 for details. +There's an active translation project at crowdin! If you want to help out by translating paperless into your language, please head over to https://github.com/jonaswinkler/paperless-ng/issues/212 for details. # Feature Requests From 77815af5fb24ae4470c3213fb2209d6630869666 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sat, 6 Mar 2021 14:29:24 -0800 Subject: [PATCH 06/86] Update angular.json --- .../document-card-large.component.html | 7 +------ .../document-card-large.component.ts | 10 ---------- .../document-card-small.component.html | 7 +------ .../document-card-small.component.ts | 10 ---------- 4 files changed, 2 insertions(+), 32 deletions(-) diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html index 71dac6a57..cf969ddbe 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html @@ -52,12 +52,7 @@  View - - - - - - + diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts index bf42c4235..10457054f 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts @@ -1,7 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { DomSanitizer } from '@angular/platform-browser'; import { PaperlessDocument } from 'src/app/data/paperless-document'; -import { PaperlessDocumentMetadata } from 'src/app/data/paperless-document-metadata'; import { DocumentService } from 'src/app/services/rest/document.service'; import { SettingsService, SETTINGS_KEYS } from 'src/app/services/settings.service'; import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'; @@ -48,8 +47,6 @@ export class DocumentCardLargeComponent implements OnInit { mouseOnPreview = false popoverHidden = true - metadata: PaperlessDocumentMetadata - get searchScoreClass() { if (this.searchScore > 0.7) { return "success" @@ -61,9 +58,6 @@ export class DocumentCardLargeComponent implements OnInit { } ngOnInit(): void { - this.documentService.getMetadata(this.document?.id).subscribe(result => { - this.metadata = result - }) } getIsThumbInverted() { @@ -95,10 +89,6 @@ export class DocumentCardLargeComponent implements OnInit { return this.documentService.getPreviewUrl(this.document.id) } - getContentType() { - return this.metadata?.has_archive_version ? 'application/pdf' : this.metadata?.original_mime_type - } - mouseEnterPreview() { this.mouseOnPreview = true if (!this.popover.isOpen()) { diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html index 1dde0c9d4..aa0aa9225 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html @@ -46,12 +46,7 @@ - - - - - - + diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts index 033abab27..e025e4e25 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts @@ -1,7 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { map } from 'rxjs/operators'; import { PaperlessDocument } from 'src/app/data/paperless-document'; -import { PaperlessDocumentMetadata } from 'src/app/data/paperless-document-metadata'; import { DocumentService } from 'src/app/services/rest/document.service'; import { SettingsService, SETTINGS_KEYS } from 'src/app/services/settings.service'; import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'; @@ -37,12 +36,7 @@ export class DocumentCardSmallComponent implements OnInit { mouseOnPreview = false popoverHidden = true - metadata: PaperlessDocumentMetadata - ngOnInit(): void { - this.documentService.getMetadata(this.document?.id).subscribe(result => { - this.metadata = result - }) } getIsThumbInverted() { @@ -74,10 +68,6 @@ export class DocumentCardSmallComponent implements OnInit { ) } - getContentType() { - return this.metadata?.has_archive_version ? 'application/pdf' : this.metadata?.original_mime_type - } - mouseEnterPreview() { this.mouseOnPreview = true if (!this.popover.isOpen()) { From e61f0425476c21a1001a06c9a582ae74aa65a274 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sat, 6 Mar 2021 14:29:24 -0800 Subject: [PATCH 07/86] Remove metadata API calls --- .../document-card-large.component.html | 7 +------ .../document-card-large.component.ts | 10 ---------- .../document-card-small.component.html | 7 +------ .../document-card-small.component.ts | 10 ---------- 4 files changed, 2 insertions(+), 32 deletions(-) diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html index 71dac6a57..cf969ddbe 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html @@ -52,12 +52,7 @@  View - - - - - - + diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts index bf42c4235..10457054f 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts @@ -1,7 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { DomSanitizer } from '@angular/platform-browser'; import { PaperlessDocument } from 'src/app/data/paperless-document'; -import { PaperlessDocumentMetadata } from 'src/app/data/paperless-document-metadata'; import { DocumentService } from 'src/app/services/rest/document.service'; import { SettingsService, SETTINGS_KEYS } from 'src/app/services/settings.service'; import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'; @@ -48,8 +47,6 @@ export class DocumentCardLargeComponent implements OnInit { mouseOnPreview = false popoverHidden = true - metadata: PaperlessDocumentMetadata - get searchScoreClass() { if (this.searchScore > 0.7) { return "success" @@ -61,9 +58,6 @@ export class DocumentCardLargeComponent implements OnInit { } ngOnInit(): void { - this.documentService.getMetadata(this.document?.id).subscribe(result => { - this.metadata = result - }) } getIsThumbInverted() { @@ -95,10 +89,6 @@ export class DocumentCardLargeComponent implements OnInit { return this.documentService.getPreviewUrl(this.document.id) } - getContentType() { - return this.metadata?.has_archive_version ? 'application/pdf' : this.metadata?.original_mime_type - } - mouseEnterPreview() { this.mouseOnPreview = true if (!this.popover.isOpen()) { diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html index 1dde0c9d4..aa0aa9225 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html @@ -46,12 +46,7 @@ - - - - - - + diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts index 033abab27..e025e4e25 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts @@ -1,7 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { map } from 'rxjs/operators'; import { PaperlessDocument } from 'src/app/data/paperless-document'; -import { PaperlessDocumentMetadata } from 'src/app/data/paperless-document-metadata'; import { DocumentService } from 'src/app/services/rest/document.service'; import { SettingsService, SETTINGS_KEYS } from 'src/app/services/settings.service'; import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'; @@ -37,12 +36,7 @@ export class DocumentCardSmallComponent implements OnInit { mouseOnPreview = false popoverHidden = true - metadata: PaperlessDocumentMetadata - ngOnInit(): void { - this.documentService.getMetadata(this.document?.id).subscribe(result => { - this.metadata = result - }) } getIsThumbInverted() { @@ -74,10 +68,6 @@ export class DocumentCardSmallComponent implements OnInit { ) } - getContentType() { - return this.metadata?.has_archive_version ? 'application/pdf' : this.metadata?.original_mime_type - } - mouseEnterPreview() { this.mouseOnPreview = true if (!this.popover.isOpen()) { From 4b4f3e76cc2b55f0c59e62a44cb77f319073ff5d Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sat, 6 Mar 2021 14:50:38 -0800 Subject: [PATCH 08/86] Re-merging this branch with Reverted dev --- src-ui/package.json | 1 - src-ui/src/app/app.module.ts | 2 -- .../document-detail.component.html | 17 +------------- .../document-detail.component.ts | 12 ---------- .../document-card-large.component.html | 7 +++--- .../document-card-large.component.ts | 7 +++--- .../document-card-small.component.ts | 6 ----- .../document-list.component.html | 2 +- .../popover-preview/popover-preview.scss | 22 +++++++++++++++++++ .../manage/settings/settings.component.html | 15 ++----------- .../manage/settings/settings.component.ts | 2 -- src-ui/src/app/services/settings.service.ts | 2 -- src-ui/src/theme_dark.scss | 2 +- 13 files changed, 35 insertions(+), 62 deletions(-) create mode 100644 src-ui/src/app/components/document-list/popover-preview/popover-preview.scss diff --git a/src-ui/package.json b/src-ui/package.json index 595228501..b005d843a 100644 --- a/src-ui/package.json +++ b/src-ui/package.json @@ -25,7 +25,6 @@ "bootstrap": "^4.5.0", "file-saver": "^2.0.5", "ng-bootstrap": "^1.6.3", - "ng2-pdf-viewer": "^6.3.2", "ngx-color": "^6.2.0", "ngx-cookie-service": "^10.1.1", "ngx-file-drop": "^10.0.0", diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index be7ea2d0b..dc8b185ea 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -47,7 +47,6 @@ import { SavedViewWidgetComponent } from './components/dashboard/widgets/saved-v import { StatisticsWidgetComponent } from './components/dashboard/widgets/statistics-widget/statistics-widget.component'; import { UploadFileWidgetComponent } from './components/dashboard/widgets/upload-file-widget/upload-file-widget.component'; import { WidgetFrameComponent } from './components/dashboard/widgets/widget-frame/widget-frame.component'; -import { PdfViewerModule } from 'ng2-pdf-viewer'; import { WelcomeWidgetComponent } from './components/dashboard/widgets/welcome-widget/welcome-widget.component'; import { YesNoPipe } from './pipes/yes-no.pipe'; import { FileSizePipe } from './pipes/file-size.pipe'; @@ -144,7 +143,6 @@ registerLocaleData(localeRo) ReactiveFormsModule, NgxFileDropModule, InfiniteScrollModule, - PdfViewerModule, NgSelectModule, ColorSliderModule ], diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html index f9b87aee3..79215c51c 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.html +++ b/src-ui/src/app/components/document-detail/document-detail.component.html @@ -1,14 +1,4 @@ -
-
-
Page
-
- -
-
of {{previewNumPages}}
-
-
-
+ + + +
+
@@ -55,9 +77,7 @@
- {{document.created | customDate:'shortDate'}}
- diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss index cbe8fa6f6..410481569 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss @@ -1,9 +1,13 @@ @import "/src/theme"; +.card-text { + font-size: 90%; +} + .doc-img { object-fit: cover; object-position: top left; - height: 200px; + height: 190px; mix-blend-mode: multiply; } @@ -34,3 +38,24 @@ .doc-img-background-selected { background-color: $primaryFaded; } + +.card-metadata { + line-height: 1; + + .btn { + line-height: 1; + } + + .metadata-icon { + width: 0.8rem; + height: 0.8rem; + } +} + +.card-footer .btn { + padding-top: .10rem; +} + +::ng-deep .tooltip-inner { + text-align: left !important; +} diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts index e025e4e25..10c2c5d23 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts @@ -29,6 +29,9 @@ export class DocumentCardSmallComponent implements OnInit { @Output() clickCorrespondent = new EventEmitter() + @Output() + clickDocumentType = new EventEmitter() + moreTags: number = null @ViewChild('popover') popover: NgbPopover diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html index e289c607e..c8bf8a9cd 100644 --- a/src-ui/src/app/components/document-list/document-list.component.html +++ b/src-ui/src/app/components/document-list/document-list.component.html @@ -170,5 +170,5 @@
- +
diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss index f3336cc1a..8b6e6aab5 100644 --- a/src-ui/src/theme_dark.scss +++ b/src-ui/src/theme_dark.scss @@ -226,7 +226,7 @@ $border-color-dark-mode: #47494f; } .btn-outline-secondary { - border-color: $text-color-dark-mode; + border-color: darken($text-color-dark-mode, 30%); color: $text-color-dark-mode; &:not(:disabled):not(.disabled):hover { From ccc39e0e55f3e0422a3218c098e71d71533dbfd1 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 11 Mar 2021 16:03:00 -0800 Subject: [PATCH 44/86] Fix illegible logged in as in dark mode --- 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 e17e21e03..96ca1382c 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 @@ -31,7 +31,7 @@
From f5a06ac0dd3e2a43ba47aa81b219d44eb4323868 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 12 Mar 2021 06:11:53 -0800 Subject: [PATCH 47/86] Slightly shorter thumbnail --- .../document-card-small/document-card-small.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss index 410481569..3f9183074 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss @@ -7,7 +7,7 @@ .doc-img { object-fit: cover; object-position: top left; - height: 190px; + height: 180px; mix-blend-mode: multiply; } From 5eca0ce55480c98f16b831af39bcc3cdc4bc6ae5 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 12 Mar 2021 06:30:03 -0800 Subject: [PATCH 48/86] Light mode fixes --- .../document-card-small.component.html | 8 ++++---- .../document-card-small.component.scss | 9 +++++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html index a8dea01fe..7de26bf0f 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html @@ -29,8 +29,8 @@

-
- Score: - - + - - Created: {{document.created | customDate}}
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss index c49de93b5..9caaabf5c 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss @@ -37,3 +37,21 @@ .doc-img-background-selected { background-color: $primaryFaded; } + +.card-metadata { + line-height: 1; + + button { + line-height: 1; + + &:hover, + &:focus { + background-color: transparent !important; + } + } + + .metadata-icon { + width: 0.8rem; + height: 0.8rem; + } +} From cb2eff47cc3b129a3b2804384e464becd0a36535 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 12 Mar 2021 07:15:00 -0800 Subject: [PATCH 51/86] Refactor --- .../document-card-large/document-card-large.component.html | 2 +- .../document-card-large/document-card-large.component.scss | 2 +- .../document-card-small/document-card-small.component.html | 2 +- .../document-card-small/document-card-small.component.scss | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html index 6580fc27d..1518acba7 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html @@ -61,7 +61,7 @@ - From 9b4625b4a5bb542220f758e2d0c819565a0adccc Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 12 Mar 2021 19:52:31 -0800 Subject: [PATCH 58/86] Fix pager color in dark mode --- src-ui/src/theme_dark.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss index 8b6e6aab5..bf8b5064a 100644 --- a/src-ui/src/theme_dark.scss +++ b/src-ui/src/theme_dark.scss @@ -76,6 +76,10 @@ $border-color-dark-mode: #47494f; } } + .page-item.active .page-link { + background-color: darken($primary-dark-mode, 10%); + } + .nav-tabs { border-color: $border-color-dark-mode; From 43b1700e91a44bad0f949e2069f68cb5750c95c3 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 12 Mar 2021 19:59:45 -0800 Subject: [PATCH 59/86] hover color for card footer buttons --- .../document-card-small/document-card-small.component.scss | 1 + src-ui/src/theme_dark.scss | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss index c712de017..6bd7e64c7 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss @@ -48,6 +48,7 @@ &:hover, &:focus { background-color: transparent !important; + color: $primary; } } diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss index bf8b5064a..996f9da3d 100644 --- a/src-ui/src/theme_dark.scss +++ b/src-ui/src/theme_dark.scss @@ -283,6 +283,10 @@ $border-color-dark-mode: #47494f; background-color: $bg-dark-mode !important; } + .card-footer button:hover { + color: $primary-dark-mode !important; + } + .form-control:not(.is-invalid):not(.btn), input:not(.is-invalid), textarea:not(.is-invalid) { From 0aacebf78397588e30884c1eebf9c9b647a7faf5 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 12 Mar 2021 20:00:23 -0800 Subject: [PATCH 60/86] Display date & ASN on one line if fits --- .../document-card-small.component.html | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html index b388a4bff..667fd8618 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html @@ -30,26 +30,28 @@