diff --git a/src/src/app/components/add-to-page-modal/add-to-page-modal.component.html b/src/src/app/components/add-to-page-modal/add-to-page-modal.component.html index 4d180f7b..2708272e 100644 --- a/src/src/app/components/add-to-page-modal/add-to-page-modal.component.html +++ b/src/src/app/components/add-to-page-modal/add-to-page-modal.component.html @@ -5,20 +5,21 @@ - - - {{ page.title }} - +
+ + + {{ page.title }} + - - -

+ + +
-

Create New Page

+

Or create a New Page

Title add
+
+ + +
-
- - -
diff --git a/src/src/app/components/add-to-page-modal/add-to-page-modal.component.scss b/src/src/app/components/add-to-page-modal/add-to-page-modal.component.scss index 0cbe52ca..d834350c 100644 --- a/src/src/app/components/add-to-page-modal/add-to-page-modal.component.scss +++ b/src/src/app/components/add-to-page-modal/add-to-page-modal.component.scss @@ -13,13 +13,25 @@ .content { min-width: 60vw; - min-height: 50vh; + min-height: 80vh; max-height: 80vh; + display: flex; + flex-flow: column; + align-content: flex-start; + align-items: stretch; } .add-page-form { padding-left: 16px; + margin-top: 2rem; } .page-title { width: calc(100% - 42px); } +.page-list { + overflow-y: auto; + height: calc(80vh - 195px); +} +.mat-dialog-content { + padding: 0 !important; +} diff --git a/src/src/app/components/page-edit-modal/page-edit-modal.component.html b/src/src/app/components/page-edit-modal/page-edit-modal.component.html index 2b374b7b..38097e68 100644 --- a/src/src/app/components/page-edit-modal/page-edit-modal.component.html +++ b/src/src/app/components/page-edit-modal/page-edit-modal.component.html @@ -11,8 +11,9 @@ + +
+ + +
-
- - -
diff --git a/src/src/app/components/page-edit-modal/page-edit-modal.component.scss b/src/src/app/components/page-edit-modal/page-edit-modal.component.scss index 16a44874..6dc670f9 100644 --- a/src/src/app/components/page-edit-modal/page-edit-modal.component.scss +++ b/src/src/app/components/page-edit-modal/page-edit-modal.component.scss @@ -18,4 +18,11 @@ .page-title { min-width: 50vw; + padding-top: 12px; +} + +.mat-dialog-content { + min-width: 60vw; + min-height: 20vh; + max-height: 80vh; } 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..3036e6fb 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; @@ -194,6 +195,11 @@ p { margin: 0 0 2px !important; } +.mat-dialog-actions { + margin-bottom: 0px; + justify-content: end; +} + @media screen and (max-width: 500px) { .cdk-overlay-pane { max-width: 95vw !important;