From 28930da115e6c335247f1d24cbef3a2bf3b7bfe2 Mon Sep 17 00:00:00 2001 From: "jason.wall" Date: Wed, 22 Dec 2021 12:02:34 -0500 Subject: [PATCH] fix modal scroll issue --- .../strongs/card/strongs-card.component.html | 1 + .../strongs/modal/strongs-modal.component.scss | 1 + .../app/components/strongs/strongs.component.html | 4 +++- .../app/components/strongs/strongs.component.scss | 13 +++++++++++-- src/src/app/components/strongs/strongs.component.ts | 3 +++ src/src/styles/app.scss | 1 + 6 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/src/app/components/strongs/card/strongs-card.component.html b/src/src/app/components/strongs/card/strongs-card.component.html index fa2b4025..22bdb4f6 100644 --- a/src/src/app/components/strongs/card/strongs-card.component.html +++ b/src/src/app/components/strongs/card/strongs-card.component.html @@ -15,6 +15,7 @@
diff --git a/src/src/app/components/strongs/modal/strongs-modal.component.scss b/src/src/app/components/strongs/modal/strongs-modal.component.scss index 44212eed..33772233 100644 --- a/src/src/app/components/strongs/modal/strongs-modal.component.scss +++ b/src/src/app/components/strongs/modal/strongs-modal.component.scss @@ -22,3 +22,4 @@ mat-toolbar { padding: 0px 16px 0px 16px; width: auto; } + diff --git a/src/src/app/components/strongs/strongs.component.html b/src/src/app/components/strongs/strongs.component.html index a773bf1f..c6ba2a24 100644 --- a/src/src/app/components/strongs/strongs.component.html +++ b/src/src/app/components/strongs/strongs.component.html @@ -1,4 +1,5 @@ +

{{ data.def.tr }} @@ -25,7 +26,7 @@

Cross References

   Translated as {{ data.crossrefs.ss.length }} word(s) -
+
{{ wrd.w }}, {{ wrd.rs.length }}
+
diff --git a/src/src/app/components/strongs/strongs.component.scss b/src/src/app/components/strongs/strongs.component.scss index cfe3ca18..5f31240e 100644 --- a/src/src/app/components/strongs/strongs.component.scss +++ b/src/src/app/components/strongs/strongs.component.scss @@ -1,4 +1,13 @@ -.strongs-crossrefs { - max-height: 20em; + +.strongs-container { + display: flex; + flex-flow: column; + align-items: stretch; +} + + +.card-strongs-crossrefs { + max-height: 20rem; overflow-y: auto; } + diff --git a/src/src/app/components/strongs/strongs.component.ts b/src/src/app/components/strongs/strongs.component.ts index d8f7fe05..788081a2 100644 --- a/src/src/app/components/strongs/strongs.component.ts +++ b/src/src/app/components/strongs/strongs.component.ts @@ -12,6 +12,9 @@ export class StrongsComponent { @Input() data: StrongsResult; + @Input() + isCard = false; + @Output() onOpenPassage = new EventEmitter(); diff --git a/src/src/styles/app.scss b/src/src/styles/app.scss index 13bb0bd7..bb2ead0f 100644 --- a/src/src/styles/app.scss +++ b/src/src/styles/app.scss @@ -185,6 +185,7 @@ p { } .mat-dialog-container { padding: 0 !important; + overflow: hidden !important; } .mat-dialog-content { padding: 0 12px !important;