diff --git a/apps/ftu-ui-small-wc/src/app/app.component.scss b/apps/ftu-ui-small-wc/src/app/app.component.scss index 0d592f89c..f81152c5e 100644 --- a/apps/ftu-ui-small-wc/src/app/app.component.scss +++ b/apps/ftu-ui-small-wc/src/app/app.component.scss @@ -75,6 +75,10 @@ position: initial !important; } +::ng-deep .fullscreen-on ftu-biomarker-details { + grid-template-columns: 0.5fr 0.5fr 1fr; +} + ::ng-deep .mat-mdc-tab-body { height: 30rem; } diff --git a/apps/ftu-ui/src/app/app.component.scss b/apps/ftu-ui/src/app/app.component.scss index 3663edc70..787fbd632 100644 --- a/apps/ftu-ui/src/app/app.component.scss +++ b/apps/ftu-ui/src/app/app.component.scss @@ -5,7 +5,7 @@ width: 100%; height: 100%; grid-template-columns: 21rem calc(100% - 21rem); - grid-template-rows: 5rem auto; + grid-template-rows: 5rem max(100% - 5rem); grid-template-areas: 'header header' 'sidebar content'; diff --git a/apps/ftu-ui/src/app/pages/ftu-page/ftu.component.scss b/apps/ftu-ui/src/app/pages/ftu-page/ftu.component.scss index b98ecf576..4bd889392 100644 --- a/apps/ftu-ui/src/app/pages/ftu-page/ftu.component.scss +++ b/apps/ftu-ui/src/app/pages/ftu-page/ftu.component.scss @@ -1,10 +1,11 @@ :host { display: block; height: 100%; + overflow-y: hidden; .content-container { display: flex; - height: calc(100vh - 5rem - 5rem); + height: calc(100% - 5rem - 1px); .illustration { flex-grow: 1; @@ -31,7 +32,7 @@ } .fullscreen-on::ng-deep { ftu-biomarker-details { - grid-template-columns: 33.5rem 33.5rem auto; + grid-template-columns: 0.5fr 0.5fr 1fr; hra-source-list { width: unset !important; hra-label-box { diff --git a/apps/ftu-ui/src/assets/TEMP/2d-ftu-illustrations.jsonld b/apps/ftu-ui/src/assets/TEMP/2d-ftu-illustrations.jsonld index cf12c11b1..293852c67 100644 --- a/apps/ftu-ui/src/assets/TEMP/2d-ftu-illustrations.jsonld +++ b/apps/ftu-ui/src/assets/TEMP/2d-ftu-illustrations.jsonld @@ -1625,7 +1625,7 @@ "representation_of": "UBERON:0001984", "label": "crypt of Lieberkuhn of large intestine", "organ_id": "UBERON:0000059", - "organ_label": "LargeIntestine", + "organ_label": "Large intestine", "illustration_files": [ { "@id": "https://purl.humanatlas.io/2d-ftu/large-intestine-crypt-lieberkuhn#svg_file", @@ -17039,4 +17039,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/apps/ftu-ui/src/assets/links.yml b/apps/ftu-ui/src/assets/links.yml index 0d56abb10..629b3c91f 100644 --- a/apps/ftu-ui/src/assets/links.yml +++ b/apps/ftu-ui/src/assets/links.yml @@ -9,6 +9,7 @@ FTU: About: type: external url: https://humanatlas.io/ + target: _blank ExploreFTU: type: internal commands: diff --git a/libs/components/behavioral/src/lib/biomarker-details/biomarker-details.component.html b/libs/components/behavioral/src/lib/biomarker-details/biomarker-details.component.html index ac34b0f35..f4e7e47ad 100644 --- a/libs/components/behavioral/src/lib/biomarker-details/biomarker-details.component.html +++ b/libs/components/behavioral/src/lib/biomarker-details/biomarker-details.component.html @@ -5,7 +5,7 @@ - + -
- +
+
diff --git a/libs/components/molecules/src/lib/source-list/source-list.component.scss b/libs/components/molecules/src/lib/source-list/source-list.component.scss index 23e9632b5..b508fc81d 100644 --- a/libs/components/molecules/src/lib/source-list/source-list.component.scss +++ b/libs/components/molecules/src/lib/source-list/source-list.component.scss @@ -3,49 +3,44 @@ :host { display: block; - - @include utils.define-flex-filler(); - - h1 { - margin: 0; - } - - .mat-mdc-cell { - vertical-align: top; - border: none; - padding: 0.25rem 0.875rem; - font-size: 1rem; - } - - .filler { - width: 30rem; - } + height: 100%; .sr-only { @include utils.sr-only(); } - .table-content { - height: calc(100vh - 25rem); - overflow: auto; - } - .toggle { - margin-bottom: 1rem; display: flex; align-items: center; - width: 43rem; height: 3.5rem; grid-area: source-list-header; color: var(--dark-primary-text); border-top: 0.063rem solid #d3d3d3; border-bottom: 0.063rem solid #d3d3d3; - .mat-icon { - margin-left: 32rem; - } } - .hidden { - display: none; + .table-content { + height: calc(100% - 3.5rem); + overflow: auto; + + &.hidden { + display: none; + } + + table { + height: 100%; + } + + .mat-mdc-cell { + vertical-align: top; + border: none; + padding: 0.25rem 0.875rem; + font-size: 1rem; + } + + ::ng-deep .mdc-data-table__content { + display: block; + padding: 1rem 0rem; + } } } diff --git a/libs/components/molecules/src/lib/tissue-tree-list/tissue-tree-list.component.html b/libs/components/molecules/src/lib/tissue-tree-list/tissue-tree-list.component.html index b50cd8dff..05a38d7f3 100644 --- a/libs/components/molecules/src/lib/tissue-tree-list/tissue-tree-list.component.html +++ b/libs/components/molecules/src/lib/tissue-tree-list/tissue-tree-list.component.html @@ -27,7 +27,7 @@ -
+
Source List Table with Title and Links