From d264df1504b4ba2dcb360d8e78e83d643fe66d7a Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 11 Mar 2021 15:54:30 -0800 Subject: [PATCH 01/18] Additional metadata for small cards --- .../document-card-small.component.html | 34 +++++++++++++++---- .../document-card-small.component.scss | 27 ++++++++++++++- .../document-card-small.component.ts | 3 ++ .../document-list.component.html | 2 +- src-ui/src/theme_dark.scss | 2 +- 5 files changed, 58 insertions(+), 10 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 eca5abb97..96c41091d 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 @@ -25,13 +25,35 @@ {{(document.correspondent$ | async)?.name}}: - {{document.title | documentTitle}} (#{{document.archive_serial_number}}) + {{document.title | documentTitle}}

-
- -
-
+
+
+ + + +
+
+
@@ -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 81ea8873e0e2f627bf024b035444d9591232a09a Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 12 Mar 2021 06:02:39 -0800 Subject: [PATCH 02/18] Use medium date --- .../document-card-small/document-card-small.component.html | 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.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html index 96c41091d..a8dea01fe 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 @@ -49,7 +49,7 @@ - {{document.created | customDate:'shortDate'}} + {{document.created | customDate:'mediumDate'}}
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 03/18] 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 04/18] 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 @@

-
- - -

@@ -62,13 +61,33 @@

-
- 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 06/18] 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 0ba35a6eb511957e02351aa565c3add415234d13 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 12 Mar 2021 07:58:37 -0800 Subject: [PATCH 09/18] More semantically correct elements --- .../document-card-large.component.html | 16 ++++++++-------- .../document-card-large.component.scss | 4 ---- .../document-card-small.component.html | 8 ++++---- .../document-card-small.component.scss | 4 ---- 4 files changed, 12 insertions(+), 20 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 9e02d32ef..f4ba713ea 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,31 +61,31 @@
-
- - - - +
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 911e3c254..340b302f9 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 @@ -50,10 +50,6 @@ } } - .no-click { - cursor: default; - } - .metadata-icon { width: 0.8rem; height: 0.8rem; 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 a211bc043..b388a4bff 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 @@ -37,19 +37,19 @@ {{(document.document_type$ | async)?.name}} - - +
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 1f1e2fc46..c712de017 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 @@ -51,10 +51,6 @@ } } - .no-click { - cursor: default; - } - .metadata-icon { width: 0.8rem; height: 0.8rem; From 76cee7840830c4874d4a49916a735ec6c85bcac7 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 12 Mar 2021 08:12:36 -0800 Subject: [PATCH 10/18] Visual tweaks for responsive --- .../document-card-large.component.html | 10 +++++----- .../document-card-large.component.scss | 4 ++++ 2 files changed, 9 insertions(+), 5 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 f4ba713ea..419f57a44 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,25 +61,25 @@
-
-
  • +
    +
  • Score:
    • - -
  • +
  • #{{document.archive_serial_number}}
    • -
  • +
  • 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 340b302f9..c3a358a2b 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 @@ -54,4 +54,8 @@ width: 0.8rem; height: 0.8rem; } + + .search-score { + padding-top: 0.35rem !important; + } } From eb5eabf3c673f562ac56c142bc0ae207e9043775 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 12 Mar 2021 09:17:49 -0800 Subject: [PATCH 11/18] fix text not visible in light mode on large card --- .../document-card-large.component.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 419f57a44..2d74129c5 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,25 +61,25 @@
    • -
    -
  • +
    +
  • Score:
    • - -
  • +
  • #{{document.archive_serial_number}}
    • -
  • +
  • From 27998df6e4608cf87c84e1e4a2066f4539f78958 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 12 Mar 2021 19:35:25 -0800 Subject: [PATCH 12/18] div instead of li --- .../document-card-large.component.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 2d74129c5..7e4408312 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 @@ -62,10 +62,10 @@
    • -
  • +
    Score: -
    • +
    -
  • +
    #{{document.archive_serial_number}} -
    • -
  • +
    • +
    {{document.created | customDate:'mediumDate'}} - +
    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 13/18] 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 14/18] 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 15/18] 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 @@
    - -
  • - - - - #{{document.archive_serial_number}} -
    • -
  • - - - - - {{document.created | customDate:'mediumDate'}} -
    • +
    +
    + + + + + {{document.created | customDate:'mediumDate'}} +
    +
    + + + + #{{document.archive_serial_number}} +
    +
    From e62ecefcd7cd4a11ab9ecb1275f16b11e98f6c8a Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 12 Mar 2021 20:12:00 -0800 Subject: [PATCH 16/18] dark mode background color --- .../document-card-small/document-card-small.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 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 667fd8618..45673660c 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,15 +30,15 @@
    - -
    -
    +
    +
    From 65733863b1cb537e2da930fd69dc23b61c4aaaa2 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 12 Mar 2021 20:12:05 -0800 Subject: [PATCH 17/18] tooltip placement --- .../document-card-large/document-card-large.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7e4408312..119960386 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 @@ -79,7 +79,7 @@ #{{document.archive_serial_number}}
    -
    +
    From 7a8494da4deb45edeb197dc5c467ff26bbf74ce4 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 12 Mar 2021 20:15:18 -0800 Subject: [PATCH 18/18] Small card tooltip tweaks, medium date --- .../document-card-small/document-card-small.component.html | 2 +- .../document-card-small/document-card-small.component.scss | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 45673660c..0c66419e8 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 @@ -38,7 +38,7 @@ {{(document.document_type$ | async)?.name}}
    -
    +
    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 6bd7e64c7..2daa97337 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 @@ -64,4 +64,5 @@ ::ng-deep .tooltip-inner { text-align: left !important; + font-size: 90%; }