diff --git a/UI/Web/src/app/cards/_modals/bulk-add-to-collection/bulk-add-to-collection.component.scss b/UI/Web/src/app/cards/_modals/bulk-add-to-collection/bulk-add-to-collection.component.scss index 1cfe40c07..29342b14b 100644 --- a/UI/Web/src/app/cards/_modals/bulk-add-to-collection/bulk-add-to-collection.component.scss +++ b/UI/Web/src/app/cards/_modals/bulk-add-to-collection/bulk-add-to-collection.component.scss @@ -9,11 +9,11 @@ .collection { overflow: auto; .modal-body { - height: calc(100vh - 235px); + max-height: calc(100vh - 235px); min-height: 150px; .list-group { overflow: auto; - height: calc(100vh - 355px); + max-height: calc(100vh - 355px); min-height: 32px; } } diff --git a/UI/Web/src/app/cards/card-detail-drawer/card-detail-drawer.component.scss b/UI/Web/src/app/cards/card-detail-drawer/card-detail-drawer.component.scss index 8873c06ac..8296d7865 100644 --- a/UI/Web/src/app/cards/card-detail-drawer/card-detail-drawer.component.scss +++ b/UI/Web/src/app/cards/card-detail-drawer/card-detail-drawer.component.scss @@ -12,7 +12,7 @@ .tab-content { overflow: auto; - height: calc(40vh - 63px); // drawer height - offcanvas heading height + height: calc(40vh - (46px + 1rem)); // drawer height - offcanvas heading height } .h6 { diff --git a/UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.html b/UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.html index 1eb306484..4839f00e8 100644 --- a/UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.html +++ b/UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.html @@ -13,13 +13,13 @@ -
+

- +
@@ -29,7 +29,7 @@
- +
diff --git a/UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.scss b/UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.scss index 936610164..89727299c 100644 --- a/UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.scss +++ b/UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.scss @@ -2,8 +2,12 @@ display: flex; flex-direction: row; width: 100%; - height: calc((var(--vh) *100) - 162px); + height: calc((var(--vh) *100) - 173px); margin-bottom: 10px; + + &.empty { + height: auto; + } } .content-container { @@ -85,12 +89,16 @@ .virtual-scroller, virtual-scroller { width: 100%; //height: calc(100vh - 160px); // 64 is a random number, 523 for me. - height: calc(var(--vh) * 100 - 160px); + height: calc(var(--vh) * 100 - 173px); //height: calc(100vh - 160px); //background-color: red; //max-height: calc(var(--vh)*100 - 170px); } +virtual-scroller.empty { + display: none; + } + h2 { display: inline-block; word-break: break-all; diff --git a/UI/Web/src/app/cards/card-item/card-item.component.ts b/UI/Web/src/app/cards/card-item/card-item.component.ts index 585a263fe..a564fa4b4 100644 --- a/UI/Web/src/app/cards/card-item/card-item.component.ts +++ b/UI/Web/src/app/cards/card-item/card-item.component.ts @@ -151,8 +151,13 @@ export class CardItemComponent implements OnInit, OnDestroy { if (this.utilityService.isChapter(this.entity)) { const chapterTitle = this.utilityService.asChapter(this.entity).titleName; - if (chapterTitle === '' || chapterTitle === null) { - this.tooltipTitle = (this.utilityService.asChapter(this.entity).volumeTitle + ' ' + this.title).trim(); + if (chapterTitle === '' || chapterTitle === null || chapterTitle === undefined) { + const volumeTitle = this.utilityService.asChapter(this.entity).volumeTitle + if (volumeTitle === '' || volumeTitle === null || volumeTitle === undefined) { + this.tooltipTitle = (this.title).trim(); + } else { + this.tooltipTitle = (this.utilityService.asChapter(this.entity).volumeTitle + ' ' + this.title).trim(); + } } else { this.tooltipTitle = chapterTitle; } diff --git a/UI/Web/src/app/collections/all-collections/all-collections.component.html b/UI/Web/src/app/collections/all-collections/all-collections.component.html index eb2c29a60..40f5c928e 100644 --- a/UI/Web/src/app/collections/all-collections/all-collections.component.html +++ b/UI/Web/src/app/collections/all-collections/all-collections.component.html @@ -13,4 +13,8 @@ + + + There are no collections. Try creating one . + \ No newline at end of file diff --git a/UI/Web/src/app/nav/nav-header/nav-header.component.html b/UI/Web/src/app/nav/nav-header/nav-header.component.html index c2ba5e7c8..fbc803bc3 100644 --- a/UI/Web/src/app/nav/nav-header/nav-header.component.html +++ b/UI/Web/src/app/nav/nav-header/nav-header.component.html @@ -179,7 +179,7 @@ NZ0ZV4zm4/L1dfnYNCrjTFq9G03rmj5D+Y4i0OHuL3GFPJytaM54AAAAAElFTkSuQmCC id="image71" x="34.013355" y="59.091763"/> - Kavita +