From cfb3e52d9963d88efa204df0ec8776969697391c Mon Sep 17 00:00:00 2001 From: edlu77 Date: Wed, 29 Nov 2023 03:12:42 -0500 Subject: [PATCH 1/8] Adjustments for left and right sides --- apps/ftu-ui/src/app/app.component.scss | 2 ++ apps/ftu-ui/src/app/pages/ftu-page/ftu.component.scss | 11 +++++++++-- apps/ftu-ui/src/styles.scss | 1 + .../footer-behavior/footer-behavior.component.scss | 4 ++++ .../header-behavior/header-behavior.component.scss | 1 + .../lib/fullscreen/fullscreen-content.component.ts | 6 +----- .../tissue-tree-list/tissue-tree-list.component.scss | 9 ++++----- .../tissue-tree-list/tissue-tree-list.component.ts | 2 +- 8 files changed, 23 insertions(+), 13 deletions(-) diff --git a/apps/ftu-ui/src/app/app.component.scss b/apps/ftu-ui/src/app/app.component.scss index 432c30d59..1382663b4 100644 --- a/apps/ftu-ui/src/app/app.component.scss +++ b/apps/ftu-ui/src/app/app.component.scss @@ -13,6 +13,7 @@ .header { grid-area: header; border-bottom: 0.0625rem solid rgba(vars.$dark-dividers); + width: 100%; } .sidebar { @@ -23,6 +24,7 @@ .page-content::ng-deep { grid-area: content; overflow-y: hidden; + width: fit-content; ftu-landing { max-height: 100%; overflow-y: auto; 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 abc42d1b5..7debe2878 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,15 +1,18 @@ :host { display: flex; flex-direction: column; - height: 100%; + height: calc(100% - 4.5rem); overflow-y: hidden; .content-container { display: flex; height: 100%; + min-width: calc(100vw - 21rem); .illustration { - width: 50%; + max-width: calc(100% - 40rem); + min-width: 24rem; + width: 100%; } .fullscreen-content-container { @@ -45,4 +48,8 @@ max-width: none; } } + + ftu-footer-behavior { + width: calc(100% - 21rem); + } } diff --git a/apps/ftu-ui/src/styles.scss b/apps/ftu-ui/src/styles.scss index 1a4f3dcbd..80f2463b8 100644 --- a/apps/ftu-ui/src/styles.scss +++ b/apps/ftu-ui/src/styles.scss @@ -8,6 +8,7 @@ html, body { height: 100%; overflow-y: hidden; + overflow: visible; } body { margin: 0; diff --git a/libs/components/behavioral/src/lib/footer-behavior/footer-behavior.component.scss b/libs/components/behavioral/src/lib/footer-behavior/footer-behavior.component.scss index 5d4e87f30..bf014e304 100644 --- a/libs/components/behavioral/src/lib/footer-behavior/footer-behavior.component.scss +++ b/libs/components/behavioral/src/lib/footer-behavior/footer-behavior.component.scss @@ -1,3 +1,7 @@ :host { display: block; + position: absolute; + bottom: 0; + width: 100%; + min-width: 67rem; } diff --git a/libs/components/behavioral/src/lib/header-behavior/header-behavior.component.scss b/libs/components/behavioral/src/lib/header-behavior/header-behavior.component.scss index 5d4e87f30..827c4a883 100644 --- a/libs/components/behavioral/src/lib/header-behavior/header-behavior.component.scss +++ b/libs/components/behavioral/src/lib/header-behavior/header-behavior.component.scss @@ -1,3 +1,4 @@ :host { display: block; + position: fixed; } diff --git a/libs/components/molecules/src/lib/fullscreen/fullscreen-content.component.ts b/libs/components/molecules/src/lib/fullscreen/fullscreen-content.component.ts index 543a54ac4..57c78ca90 100644 --- a/libs/components/molecules/src/lib/fullscreen/fullscreen-content.component.ts +++ b/libs/components/molecules/src/lib/fullscreen/fullscreen-content.component.ts @@ -13,16 +13,12 @@ import { animate, state, style, transition, trigger } from '@angular/animations' 'true', style({ width: '100%', - position: 'absolute', - right: 0, }) ), state( 'false', style({ - width: '50%', - position: 'absolute', - right: 0, + width: '43rem', }) ), transition('true <=> false', [animate('0.5s ease')]), diff --git a/libs/components/molecules/src/lib/tissue-tree-list/tissue-tree-list.component.scss b/libs/components/molecules/src/lib/tissue-tree-list/tissue-tree-list.component.scss index 897db836b..390cc4457 100644 --- a/libs/components/molecules/src/lib/tissue-tree-list/tissue-tree-list.component.scss +++ b/libs/components/molecules/src/lib/tissue-tree-list/tissue-tree-list.component.scss @@ -2,13 +2,11 @@ :host { display: block; - height: calc(100% - 5rem); + height: calc(100% - 3.5rem); overflow-y: auto; .row { - min-height: 2rem; - &.child { - padding: 5px 0 5px 64px; - } + min-height: unset; + &.selected { background-color: vars.$accent-lighter-rgb; } @@ -30,6 +28,7 @@ cursor: pointer; text-decoration: none; color: rgba(vars.$dark-primary-text); + line-height: normal; } } diff --git a/libs/components/molecules/src/lib/tissue-tree-list/tissue-tree-list.component.ts b/libs/components/molecules/src/lib/tissue-tree-list/tissue-tree-list.component.ts index 572ad3aaa..a2133bd7b 100644 --- a/libs/components/molecules/src/lib/tissue-tree-list/tissue-tree-list.component.ts +++ b/libs/components/molecules/src/lib/tissue-tree-list/tissue-tree-list.component.ts @@ -124,7 +124,7 @@ export class TissueTreeListComponent> im ngOnChanges(changes: SimpleChanges): void { if ('nodes' in changes) { this.dataSource.data = this.findRootNodes(); - this.selected = this.control.dataNodes[0].data; + this.control.expandAll(); } if ('selected' in changes) { const path = this.selected ? this.dfsFindPath(this.findRootNodes(), this.selected) : []; From 551c618819fd64ad95de60819eaaa161b829f61b Mon Sep 17 00:00:00 2001 From: edlu77 Date: Wed, 29 Nov 2023 03:13:20 -0500 Subject: [PATCH 2/8] Fix illustration annotation font --- .../2d-ftu-kidney-descending-thin-loop-of-henle.svg | 2 +- .../assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg | 2 +- .../TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg | 2 +- .../TEMP/temp-svgs/2d-ftu-liver-liver-lobule.svg | 2 +- .../2d-ftu-lung-bronchial-submucosal-gland.svg | 2 +- .../temp-svgs/2d-ftu-pancreas-islets-langerhans.svg | 2 +- .../temp-svgs/2d-ftu-pancreas-pancreatic-acinus.svg | 2 +- .../2d-ftu-prostate-prostate-glandular-acinus.svg | 10 +--------- .../TEMP/temp-svgs/2d-ftu-skin-epidermal-ridge.svg | 2 +- .../TEMP/temp-svgs/2d-ftu-small-intestine-villus.svg | 2 +- .../2d-ftu-kidney-descending-thin-loop-of-henle.svg | 2 +- .../assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg | 2 +- .../TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg | 2 +- .../TEMP/temp-svgs/2d-ftu-liver-liver-lobule.svg | 2 +- .../2d-ftu-lung-bronchial-submucosal-gland.svg | 2 +- .../temp-svgs/2d-ftu-pancreas-islets-langerhans.svg | 2 +- .../temp-svgs/2d-ftu-pancreas-pancreatic-acinus.svg | 2 +- .../2d-ftu-prostate-prostate-glandular-acinus.svg | 12 +----------- .../TEMP/temp-svgs/2d-ftu-skin-epidermal-ridge.svg | 2 +- .../TEMP/temp-svgs/2d-ftu-small-intestine-villus.svg | 2 +- .../2d-ftu-kidney-descending-thin-loop-of-henle.svg | 2 +- .../assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg | 2 +- .../TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg | 2 +- .../TEMP/temp-svgs/2d-ftu-liver-liver-lobule.svg | 2 +- .../2d-ftu-lung-bronchial-submucosal-gland.svg | 2 +- .../temp-svgs/2d-ftu-pancreas-islets-langerhans.svg | 2 +- .../temp-svgs/2d-ftu-pancreas-pancreatic-acinus.svg | 2 +- .../2d-ftu-prostate-prostate-glandular-acinus.svg | 2 +- .../TEMP/temp-svgs/2d-ftu-skin-epidermal-ridge.svg | 2 +- .../TEMP/temp-svgs/2d-ftu-small-intestine-villus.svg | 2 +- 30 files changed, 30 insertions(+), 48 deletions(-) diff --git a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.svg b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.svg index bd1745b45..7ecd4e806 100644 --- a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.svg +++ b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.svg @@ -291,7 +291,7 @@ } .cls-70 { - font-family: InterV, InterV; + font-family: Arial; font-size: 16px; font-variation-settings: '; } diff --git a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg index de2ffe1dd..0a6b9088c 100644 --- a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg +++ b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg @@ -852,7 +852,7 @@ } .cls-99 { - font-family: InterV, InterV; + font-family: Arial; font-variation-settings: '; } diff --git a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg index a2d581f54..cd0f21fdb 100644 --- a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg +++ b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg @@ -928,7 +928,7 @@ } .cls-200 { - font-family: InterV, InterV; + font-family: Arial; font-variation-settings: '; } diff --git a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-liver-liver-lobule.svg b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-liver-liver-lobule.svg index 38c3d832c..907494b7b 100644 --- a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-liver-liver-lobule.svg +++ b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-liver-liver-lobule.svg @@ -448,7 +448,7 @@ } .cls-109 { - font-family: Inter-Regular, 'Inter Regular'; + font-family: Arial; } .cls-109, .cls-89 { diff --git a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-lung-bronchial-submucosal-gland.svg b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-lung-bronchial-submucosal-gland.svg index 5f1ec2d41..371c96989 100644 --- a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-lung-bronchial-submucosal-gland.svg +++ b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-lung-bronchial-submucosal-gland.svg @@ -356,7 +356,7 @@ } .cls-82 { - font-family: Inter-Regular, 'Inter Regular'; + font-family: Arial; font-size: 16px; font-variation-settings: '; } diff --git a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-pancreas-islets-langerhans.svg b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-pancreas-islets-langerhans.svg index 64cfa4acf..de8c0e2cf 100644 --- a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-pancreas-islets-langerhans.svg +++ b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-pancreas-islets-langerhans.svg @@ -375,7 +375,7 @@ } .cls-94 { - font-family: Inter-Regular, 'Inter Regular'; + font-family: Arial; font-size: 16px; } diff --git a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-pancreas-pancreatic-acinus.svg b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-pancreas-pancreatic-acinus.svg index 68d50042e..909982dc5 100644 --- a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-pancreas-pancreatic-acinus.svg +++ b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-pancreas-pancreatic-acinus.svg @@ -203,7 +203,7 @@ .st194{fill:none;stroke:#666666;stroke-width:3;stroke-miterlimit:10;} .st195{fill:none;stroke:#FFFFFF;stroke-miterlimit:10;} .st196{fill:none;stroke:#000000;stroke-miterlimit:10;} - .st197{font-family:'InterV';} + .st197{font-family:'Arial';} .st198{font-size:16px;} .st199{fill:none;stroke:#000000;stroke-width:1.5;stroke-miterlimit:10;} .st200{fill:url(#SVGID_1_);stroke:#231F20;stroke-width:0.9396;stroke-miterlimit:10;} diff --git a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-prostate-prostate-glandular-acinus.svg b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-prostate-prostate-glandular-acinus.svg index 24017de0d..95b8de62a 100644 --- a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-prostate-prostate-glandular-acinus.svg +++ b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-prostate-prostate-glandular-acinus.svg @@ -359,10 +359,6 @@ fill: #a4a4a4; } - .cls-93 { - letter-spacing: -.03em; - } - .cls-94 { fill: #dedede; } @@ -631,10 +627,6 @@ fill: #d5d5d5; } - .cls-159 { - letter-spacing: -.03em; - } - .cls-160 { fill: #4f4f4f; } @@ -884,7 +876,7 @@ } .cls-222 { - font-family: InterV, InterV; + font-family: Arial; font-variation-settings: '; } diff --git a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-skin-epidermal-ridge.svg b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-skin-epidermal-ridge.svg index 281c19a05..5ced91894 100644 --- a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-skin-epidermal-ridge.svg +++ b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-skin-epidermal-ridge.svg @@ -2685,7 +2685,7 @@ .st2675{display:inline;} .st2676{display:inline;fill:#FFFBFA;} .st2677{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;} - .st2678{font-family:'Inter-Regular';} + .st2678{font-family:'Arial';} .st2679{font-size:16px;} .st2680{fill:none;stroke:#FFFFFF;stroke-miterlimit:10;} .st2681{fill:none;stroke:#000000;stroke-miterlimit:10;} diff --git a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-small-intestine-villus.svg b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-small-intestine-villus.svg index b399f33a9..fb68e83de 100644 --- a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-small-intestine-villus.svg +++ b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-small-intestine-villus.svg @@ -208,7 +208,7 @@ .st200{fill:#535353;} .st201{fill:#505050;} .st202{fill:#666666;} - .st203{font-family:'Inter';} + .st203{font-family:'Arial';} .st204{font-size:16px;} .st205{fill:none;stroke:#000000;stroke-width:1.5;stroke-miterlimit:10;} .st206{fill:url(#SVGID_1_);stroke:#231F20;stroke-width:0.9396;stroke-miterlimit:10;} diff --git a/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.svg b/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.svg index bd1745b45..7ecd4e806 100644 --- a/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.svg +++ b/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.svg @@ -291,7 +291,7 @@ } .cls-70 { - font-family: InterV, InterV; + font-family: Arial; font-size: 16px; font-variation-settings: '; } diff --git a/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg b/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg index de2ffe1dd..0a6b9088c 100644 --- a/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg +++ b/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg @@ -852,7 +852,7 @@ } .cls-99 { - font-family: InterV, InterV; + font-family: Arial; font-variation-settings: '; } diff --git a/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg b/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg index a2d581f54..cd0f21fdb 100644 --- a/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg +++ b/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg @@ -928,7 +928,7 @@ } .cls-200 { - font-family: InterV, InterV; + font-family: Arial; font-variation-settings: '; } diff --git a/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-liver-liver-lobule.svg b/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-liver-liver-lobule.svg index 38c3d832c..907494b7b 100644 --- a/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-liver-liver-lobule.svg +++ b/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-liver-liver-lobule.svg @@ -448,7 +448,7 @@ } .cls-109 { - font-family: Inter-Regular, 'Inter Regular'; + font-family: Arial; } .cls-109, .cls-89 { diff --git a/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-lung-bronchial-submucosal-gland.svg b/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-lung-bronchial-submucosal-gland.svg index 5f1ec2d41..371c96989 100644 --- a/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-lung-bronchial-submucosal-gland.svg +++ b/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-lung-bronchial-submucosal-gland.svg @@ -356,7 +356,7 @@ } .cls-82 { - font-family: Inter-Regular, 'Inter Regular'; + font-family: Arial; font-size: 16px; font-variation-settings: '; } diff --git a/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-pancreas-islets-langerhans.svg b/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-pancreas-islets-langerhans.svg index 64cfa4acf..de8c0e2cf 100644 --- a/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-pancreas-islets-langerhans.svg +++ b/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-pancreas-islets-langerhans.svg @@ -375,7 +375,7 @@ } .cls-94 { - font-family: Inter-Regular, 'Inter Regular'; + font-family: Arial; font-size: 16px; } diff --git a/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-pancreas-pancreatic-acinus.svg b/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-pancreas-pancreatic-acinus.svg index 68d50042e..909982dc5 100644 --- a/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-pancreas-pancreatic-acinus.svg +++ b/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-pancreas-pancreatic-acinus.svg @@ -203,7 +203,7 @@ .st194{fill:none;stroke:#666666;stroke-width:3;stroke-miterlimit:10;} .st195{fill:none;stroke:#FFFFFF;stroke-miterlimit:10;} .st196{fill:none;stroke:#000000;stroke-miterlimit:10;} - .st197{font-family:'InterV';} + .st197{font-family:'Arial';} .st198{font-size:16px;} .st199{fill:none;stroke:#000000;stroke-width:1.5;stroke-miterlimit:10;} .st200{fill:url(#SVGID_1_);stroke:#231F20;stroke-width:0.9396;stroke-miterlimit:10;} diff --git a/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-prostate-prostate-glandular-acinus.svg b/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-prostate-prostate-glandular-acinus.svg index 24017de0d..cbacd605c 100644 --- a/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-prostate-prostate-glandular-acinus.svg +++ b/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-prostate-prostate-glandular-acinus.svg @@ -359,10 +359,6 @@ fill: #a4a4a4; } - .cls-93 { - letter-spacing: -.03em; - } - .cls-94 { fill: #dedede; } @@ -631,9 +627,6 @@ fill: #d5d5d5; } - .cls-159 { - letter-spacing: -.03em; - } .cls-160 { fill: #4f4f4f; @@ -655,9 +648,6 @@ fill: #999; } - .cls-165 { - letter-spacing: -.02em; - } .cls-166 { fill: #535353; @@ -884,7 +874,7 @@ } .cls-222 { - font-family: InterV, InterV; + font-family: Arial; font-variation-settings: '; } diff --git a/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-skin-epidermal-ridge.svg b/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-skin-epidermal-ridge.svg index 281c19a05..5ced91894 100644 --- a/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-skin-epidermal-ridge.svg +++ b/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-skin-epidermal-ridge.svg @@ -2685,7 +2685,7 @@ .st2675{display:inline;} .st2676{display:inline;fill:#FFFBFA;} .st2677{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;} - .st2678{font-family:'Inter-Regular';} + .st2678{font-family:'Arial';} .st2679{font-size:16px;} .st2680{fill:none;stroke:#FFFFFF;stroke-miterlimit:10;} .st2681{fill:none;stroke:#000000;stroke-miterlimit:10;} diff --git a/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-small-intestine-villus.svg b/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-small-intestine-villus.svg index b399f33a9..fb68e83de 100644 --- a/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-small-intestine-villus.svg +++ b/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-small-intestine-villus.svg @@ -208,7 +208,7 @@ .st200{fill:#535353;} .st201{fill:#505050;} .st202{fill:#666666;} - .st203{font-family:'Inter';} + .st203{font-family:'Arial';} .st204{font-size:16px;} .st205{fill:none;stroke:#000000;stroke-width:1.5;stroke-miterlimit:10;} .st206{fill:url(#SVGID_1_);stroke:#231F20;stroke-width:0.9396;stroke-miterlimit:10;} diff --git a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.svg b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.svg index bd1745b45..7ecd4e806 100644 --- a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.svg +++ b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.svg @@ -291,7 +291,7 @@ } .cls-70 { - font-family: InterV, InterV; + font-family: Arial; font-size: 16px; font-variation-settings: '; } diff --git a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg index de2ffe1dd..0a6b9088c 100644 --- a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg +++ b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg @@ -852,7 +852,7 @@ } .cls-99 { - font-family: InterV, InterV; + font-family: Arial; font-variation-settings: '; } diff --git a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg index a2d581f54..cd0f21fdb 100644 --- a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg +++ b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg @@ -928,7 +928,7 @@ } .cls-200 { - font-family: InterV, InterV; + font-family: Arial; font-variation-settings: '; } diff --git a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-liver-liver-lobule.svg b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-liver-liver-lobule.svg index 38c3d832c..907494b7b 100644 --- a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-liver-liver-lobule.svg +++ b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-liver-liver-lobule.svg @@ -448,7 +448,7 @@ } .cls-109 { - font-family: Inter-Regular, 'Inter Regular'; + font-family: Arial; } .cls-109, .cls-89 { diff --git a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-lung-bronchial-submucosal-gland.svg b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-lung-bronchial-submucosal-gland.svg index 5f1ec2d41..371c96989 100644 --- a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-lung-bronchial-submucosal-gland.svg +++ b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-lung-bronchial-submucosal-gland.svg @@ -356,7 +356,7 @@ } .cls-82 { - font-family: Inter-Regular, 'Inter Regular'; + font-family: Arial; font-size: 16px; font-variation-settings: '; } diff --git a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-pancreas-islets-langerhans.svg b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-pancreas-islets-langerhans.svg index 64cfa4acf..de8c0e2cf 100644 --- a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-pancreas-islets-langerhans.svg +++ b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-pancreas-islets-langerhans.svg @@ -375,7 +375,7 @@ } .cls-94 { - font-family: Inter-Regular, 'Inter Regular'; + font-family: Arial; font-size: 16px; } diff --git a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-pancreas-pancreatic-acinus.svg b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-pancreas-pancreatic-acinus.svg index 68d50042e..909982dc5 100644 --- a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-pancreas-pancreatic-acinus.svg +++ b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-pancreas-pancreatic-acinus.svg @@ -203,7 +203,7 @@ .st194{fill:none;stroke:#666666;stroke-width:3;stroke-miterlimit:10;} .st195{fill:none;stroke:#FFFFFF;stroke-miterlimit:10;} .st196{fill:none;stroke:#000000;stroke-miterlimit:10;} - .st197{font-family:'InterV';} + .st197{font-family:'Arial';} .st198{font-size:16px;} .st199{fill:none;stroke:#000000;stroke-width:1.5;stroke-miterlimit:10;} .st200{fill:url(#SVGID_1_);stroke:#231F20;stroke-width:0.9396;stroke-miterlimit:10;} diff --git a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-prostate-prostate-glandular-acinus.svg b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-prostate-prostate-glandular-acinus.svg index 24017de0d..c3866f3af 100644 --- a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-prostate-prostate-glandular-acinus.svg +++ b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-prostate-prostate-glandular-acinus.svg @@ -884,7 +884,7 @@ } .cls-222 { - font-family: InterV, InterV; + font-family: Arial; font-variation-settings: '; } diff --git a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-skin-epidermal-ridge.svg b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-skin-epidermal-ridge.svg index 281c19a05..5ced91894 100644 --- a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-skin-epidermal-ridge.svg +++ b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-skin-epidermal-ridge.svg @@ -2685,7 +2685,7 @@ .st2675{display:inline;} .st2676{display:inline;fill:#FFFBFA;} .st2677{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;} - .st2678{font-family:'Inter-Regular';} + .st2678{font-family:'Arial';} .st2679{font-size:16px;} .st2680{fill:none;stroke:#FFFFFF;stroke-miterlimit:10;} .st2681{fill:none;stroke:#000000;stroke-miterlimit:10;} diff --git a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-small-intestine-villus.svg b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-small-intestine-villus.svg index b399f33a9..fb68e83de 100644 --- a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-small-intestine-villus.svg +++ b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-small-intestine-villus.svg @@ -208,7 +208,7 @@ .st200{fill:#535353;} .st201{fill:#505050;} .st202{fill:#666666;} - .st203{font-family:'Inter';} + .st203{font-family:'Arial';} .st204{font-size:16px;} .st205{fill:none;stroke:#000000;stroke-width:1.5;stroke-miterlimit:10;} .st206{fill:url(#SVGID_1_);stroke:#231F20;stroke-width:0.9396;stroke-miterlimit:10;} From 73834c3766d00d5597d2b020ec2080fcace5c069 Mon Sep 17 00:00:00 2001 From: edlu77 Date: Wed, 29 Nov 2023 03:19:47 -0500 Subject: [PATCH 3/8] Adjust letter spacing in about button --- libs/components/molecules/src/lib/header/header.component.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/components/molecules/src/lib/header/header.component.scss b/libs/components/molecules/src/lib/header/header.component.scss index c1acd8d15..69c02b52a 100644 --- a/libs/components/molecules/src/lib/header/header.component.scss +++ b/libs/components/molecules/src/lib/header/header.component.scss @@ -43,6 +43,7 @@ text-decoration: none; span { border-bottom: 1px solid var(--palette-primary-500-rgb); + letter-spacing: normal; } .icon { width: 1.5rem; From dab15af58bb7cc441929b554223c611c89e6aecf Mon Sep 17 00:00:00 2001 From: edlu77 Date: Wed, 29 Nov 2023 03:21:11 -0500 Subject: [PATCH 4/8] Remove exclamation marks in help text --- .../atoms/src/lib/email-input/email-input.component.html | 2 +- .../atoms/src/lib/required-input/required-input.component.html | 2 +- .../src/lib/required-textbox/required-textbox.component.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/components/atoms/src/lib/email-input/email-input.component.html b/libs/components/atoms/src/lib/email-input/email-input.component.html index 47f174076..093892f60 100644 --- a/libs/components/atoms/src/lib/email-input/email-input.component.html +++ b/libs/components/atoms/src/lib/email-input/email-input.component.html @@ -5,5 +5,5 @@ Please enter a valid email address - Email is required! + Email is required diff --git a/libs/components/atoms/src/lib/required-input/required-input.component.html b/libs/components/atoms/src/lib/required-input/required-input.component.html index 0e679ed9f..ec2946b1e 100644 --- a/libs/components/atoms/src/lib/required-input/required-input.component.html +++ b/libs/components/atoms/src/lib/required-input/required-input.component.html @@ -1,5 +1,5 @@ {{ label }} - {{ label }} is required! + {{ label }} is required diff --git a/libs/components/atoms/src/lib/required-textbox/required-textbox.component.html b/libs/components/atoms/src/lib/required-textbox/required-textbox.component.html index 185e15c7b..15d99dce7 100644 --- a/libs/components/atoms/src/lib/required-textbox/required-textbox.component.html +++ b/libs/components/atoms/src/lib/required-textbox/required-textbox.component.html @@ -8,5 +8,5 @@ [formControl]="control" [placeholder]="placeholder" > - {{ label }} is required! + {{ label }} is required From 87205ef19da46d1683636c92840fc6791d8c6eb9 Mon Sep 17 00:00:00 2001 From: edlu77 Date: Wed, 29 Nov 2023 04:15:57 -0500 Subject: [PATCH 5/8] Update illustration --- .../2d-ftu-prostate-prostate-glandular-acinus.svg | 5 +---- .../2d-ftu-prostate-prostate-glandular-acinus.svg | 2 +- .../2d-ftu-prostate-prostate-glandular-acinus.svg | 12 +----------- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-prostate-prostate-glandular-acinus.svg b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-prostate-prostate-glandular-acinus.svg index 95b8de62a..cd6aac425 100644 --- a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-prostate-prostate-glandular-acinus.svg +++ b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-prostate-prostate-glandular-acinus.svg @@ -647,9 +647,6 @@ fill: #999; } - .cls-165 { - letter-spacing: -.02em; - } .cls-166 { fill: #535353; @@ -18036,7 +18033,7 @@ class="cls-165" x="0" y="0" - id="tspan8214">Prostate perictye + id="tspan8214">Prostate pericyte Prostate perictye + id="tspan8214">Prostate pericyte Prostate perictye + id="tspan8214">Prostate pericyte Date: Wed, 29 Nov 2023 04:16:30 -0500 Subject: [PATCH 6/8] Fix fullscreen toggle --- apps/ftu-ui/src/app/app.component.scss | 3 ++- apps/ftu-ui/src/app/pages/ftu-page/ftu.component.scss | 2 +- .../src/lib/fullscreen/fullscreen-content.component.scss | 6 +----- .../src/lib/fullscreen/fullscreen-content.component.ts | 4 ++++ .../src/lib/tissue-tree-list/tissue-tree-list.component.ts | 3 +++ 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/apps/ftu-ui/src/app/app.component.scss b/apps/ftu-ui/src/app/app.component.scss index 1382663b4..98713ea51 100644 --- a/apps/ftu-ui/src/app/app.component.scss +++ b/apps/ftu-ui/src/app/app.component.scss @@ -4,7 +4,7 @@ display: grid; width: 100%; height: 100%; - grid-template-columns: 21rem calc(100% - 21rem); + grid-template-columns: 21rem max(100% - 21rem, 67rem); grid-template-rows: 4.5rem max(100% - 4.5rem); grid-template-areas: 'header header' @@ -14,6 +14,7 @@ grid-area: header; border-bottom: 0.0625rem solid rgba(vars.$dark-dividers); width: 100%; + z-index: 1; } .sidebar { 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 7debe2878..a44b6aac7 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 @@ -10,7 +10,7 @@ min-width: calc(100vw - 21rem); .illustration { - max-width: calc(100% - 40rem); + max-width: calc(100% - 43rem); min-width: 24rem; width: 100%; } diff --git a/libs/components/molecules/src/lib/fullscreen/fullscreen-content.component.scss b/libs/components/molecules/src/lib/fullscreen/fullscreen-content.component.scss index e82aef7dc..8e36abc20 100644 --- a/libs/components/molecules/src/lib/fullscreen/fullscreen-content.component.scss +++ b/libs/components/molecules/src/lib/fullscreen/fullscreen-content.component.scss @@ -1,9 +1,5 @@ :host { display: block; overflow-y: hidden; - - &.fullscreen-on { - z-index: 100; - background: #f8f9fa; - } + background: white; } diff --git a/libs/components/molecules/src/lib/fullscreen/fullscreen-content.component.ts b/libs/components/molecules/src/lib/fullscreen/fullscreen-content.component.ts index 57c78ca90..8fd6e52d7 100644 --- a/libs/components/molecules/src/lib/fullscreen/fullscreen-content.component.ts +++ b/libs/components/molecules/src/lib/fullscreen/fullscreen-content.component.ts @@ -13,12 +13,16 @@ import { animate, state, style, transition, trigger } from '@angular/animations' 'true', style({ width: '100%', + position: 'absolute', + right: '0', }) ), state( 'false', style({ width: '43rem', + position: 'absolute', + right: '0', }) ), transition('true <=> false', [animate('0.5s ease')]), diff --git a/libs/components/molecules/src/lib/tissue-tree-list/tissue-tree-list.component.ts b/libs/components/molecules/src/lib/tissue-tree-list/tissue-tree-list.component.ts index a2133bd7b..01762be2b 100644 --- a/libs/components/molecules/src/lib/tissue-tree-list/tissue-tree-list.component.ts +++ b/libs/components/molecules/src/lib/tissue-tree-list/tissue-tree-list.component.ts @@ -127,6 +127,9 @@ export class TissueTreeListComponent> im this.control.expandAll(); } if ('selected' in changes) { + if (!this.selected) { + this.control.expandAll(); + } const path = this.selected ? this.dfsFindPath(this.findRootNodes(), this.selected) : []; const node = this.control.dataNodes.find((n) => n.data === changes['selected'].currentValue); if (!node?.expandable) { From d37ed72fa969dfcd0bb55010ee4ba44897d2c2d5 Mon Sep 17 00:00:00 2001 From: edlu77 Date: Wed, 29 Nov 2023 14:57:59 -0500 Subject: [PATCH 7/8] Styling and font adjustments --- apps/ftu-ui-small-wc/src/app/app.component.scss | 2 +- ...d-ftu-kidney-descending-thin-loop-of-henle.svg | 4 +--- .../TEMP/temp-svgs/2d-ftu-kidney-nephron.svg | 4 ++-- .../temp-svgs/2d-ftu-kidney-renal-corpuscle.svg | 6 +++--- .../TEMP/temp-svgs/2d-ftu-liver-liver-lobule.svg | 2 +- .../2d-ftu-lung-bronchial-submucosal-gland.svg | 2 +- .../2d-ftu-pancreas-islets-langerhans.svg | 2 +- .../2d-ftu-pancreas-pancreatic-acinus.svg | 2 +- .../2d-ftu-prostate-prostate-glandular-acinus.svg | 15 +++++++++++++-- .../temp-svgs/2d-ftu-skin-epidermal-ridge.svg | 2 +- .../temp-svgs/2d-ftu-small-intestine-villus.svg | 2 +- apps/ftu-ui/src/app/app.component.scss | 4 +--- .../src/app/pages/ftu-page/ftu.component.scss | 10 +--------- ...d-ftu-kidney-descending-thin-loop-of-henle.svg | 4 +--- .../TEMP/temp-svgs/2d-ftu-kidney-nephron.svg | 4 ++-- .../temp-svgs/2d-ftu-kidney-renal-corpuscle.svg | 6 +++--- .../TEMP/temp-svgs/2d-ftu-liver-liver-lobule.svg | 2 +- .../2d-ftu-lung-bronchial-submucosal-gland.svg | 2 +- .../2d-ftu-pancreas-islets-langerhans.svg | 2 +- .../2d-ftu-pancreas-pancreatic-acinus.svg | 2 +- .../2d-ftu-prostate-prostate-glandular-acinus.svg | 14 ++++++++++++-- .../temp-svgs/2d-ftu-skin-epidermal-ridge.svg | 2 +- .../temp-svgs/2d-ftu-small-intestine-villus.svg | 2 +- .../src/assets/resources/landing-page/more.svg | 8 ++++---- .../src/assets/resources/landing-page/welcome.svg | 2 +- apps/ftu-ui/src/styles.scss | 1 - ...d-ftu-kidney-descending-thin-loop-of-henle.svg | 4 +--- .../TEMP/temp-svgs/2d-ftu-kidney-nephron.svg | 4 ++-- .../temp-svgs/2d-ftu-kidney-renal-corpuscle.svg | 6 +++--- .../TEMP/temp-svgs/2d-ftu-liver-liver-lobule.svg | 2 +- .../2d-ftu-lung-bronchial-submucosal-gland.svg | 2 +- .../2d-ftu-pancreas-islets-langerhans.svg | 2 +- .../2d-ftu-pancreas-pancreatic-acinus.svg | 2 +- .../2d-ftu-prostate-prostate-glandular-acinus.svg | 14 ++++++++++++-- .../temp-svgs/2d-ftu-skin-epidermal-ridge.svg | 2 +- .../temp-svgs/2d-ftu-small-intestine-villus.svg | 2 +- .../src/lib/label-box/label-box.component.scss | 1 - .../atoms/src/lib/tooltip/tooltip.component.scss | 2 +- .../biomarker-details-wc.component.scss | 2 +- .../footer-behavior.component.scss | 4 ---- .../contact-modal/contact-modal.component.scss | 2 +- .../src/lib/metrics/metrics.component.scss | 1 + .../screen-size-notice.component.scss | 2 +- 43 files changed, 86 insertions(+), 76 deletions(-) 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 0ccfe49bd..993d8259d 100644 --- a/apps/ftu-ui-small-wc/src/app/app.component.scss +++ b/apps/ftu-ui-small-wc/src/app/app.component.scss @@ -2,7 +2,7 @@ :host { height: 100%; - font-family: 'Inter'; + font-family: Inter; ::ng-deep .product-title { width: max-content; diff --git a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.svg b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.svg index 7ecd4e806..06a7585d1 100644 --- a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.svg +++ b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.svg @@ -291,8 +291,6 @@ } .cls-70 { - font-family: Arial; - font-size: 16px; font-variation-settings: '; } @@ -486,7 +484,7 @@ Descendingthin limb cell - Descending vasa recta + Descending vasa recta 10 μm diff --git a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg index 0a6b9088c..2faa60e63 100644 --- a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg +++ b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg @@ -396,7 +396,7 @@ } .cls-97 { - font-family: InterV-Italic, 'InterV Italic'; + font-family: Inter; font-style: italic; font-variation-settings: '; } @@ -852,7 +852,7 @@ } .cls-99 { - font-family: Arial; + font-family: Inter; font-variation-settings: '; } diff --git a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg index cd0f21fdb..425c46a36 100644 --- a/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg +++ b/apps/ftu-ui-small-wc/src/assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg @@ -928,7 +928,7 @@ } .cls-200 { - font-family: Arial; + font-family: Inter; font-variation-settings: '; } @@ -17649,10 +17649,10 @@ y="19.2" id="tspan8270">endothelial cell Descendingthin limb cell - Descending vasa recta + Descending vasa recta 10 μm diff --git a/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg b/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg index 0a6b9088c..2faa60e63 100644 --- a/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg +++ b/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg @@ -396,7 +396,7 @@ } .cls-97 { - font-family: InterV-Italic, 'InterV Italic'; + font-family: Inter; font-style: italic; font-variation-settings: '; } @@ -852,7 +852,7 @@ } .cls-99 { - font-family: Arial; + font-family: Inter; font-variation-settings: '; } diff --git a/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg b/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg index cd0f21fdb..425c46a36 100644 --- a/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg +++ b/apps/ftu-ui/src/assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg @@ -928,7 +928,7 @@ } .cls-200 { - font-family: Arial; + font-family: Inter; font-variation-settings: '; } @@ -17649,10 +17649,10 @@ y="19.2" id="tspan8270">endothelial cell 50 μm - + @@ -12715,7 +12715,7 @@ - + @@ -12732,7 +12732,7 @@ C546.8,445.5,555.6,440.1,550.2,441.2z"/> - + diff --git a/apps/ftu-ui/src/assets/resources/landing-page/welcome.svg b/apps/ftu-ui/src/assets/resources/landing-page/welcome.svg index 0dffda51c..8a944e263 100644 --- a/apps/ftu-ui/src/assets/resources/landing-page/welcome.svg +++ b/apps/ftu-ui/src/assets/resources/landing-page/welcome.svg @@ -328,7 +328,7 @@ } .cls-82 { - font-family: Inter-Regular, 'Inter Regular'; + font-family: Inter; font-size: 16px; font-variation-settings: '; } diff --git a/apps/ftu-ui/src/styles.scss b/apps/ftu-ui/src/styles.scss index 80f2463b8..1a4f3dcbd 100644 --- a/apps/ftu-ui/src/styles.scss +++ b/apps/ftu-ui/src/styles.scss @@ -8,7 +8,6 @@ html, body { height: 100%; overflow-y: hidden; - overflow: visible; } body { margin: 0; diff --git a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.svg b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.svg index 7ecd4e806..06a7585d1 100644 --- a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.svg +++ b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.svg @@ -291,8 +291,6 @@ } .cls-70 { - font-family: Arial; - font-size: 16px; font-variation-settings: '; } @@ -486,7 +484,7 @@ Descendingthin limb cell - Descending vasa recta + Descending vasa recta 10 μm diff --git a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg index 0a6b9088c..2faa60e63 100644 --- a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg +++ b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-kidney-nephron.svg @@ -396,7 +396,7 @@ } .cls-97 { - font-family: InterV-Italic, 'InterV Italic'; + font-family: Inter; font-style: italic; font-variation-settings: '; } @@ -852,7 +852,7 @@ } .cls-99 { - font-family: Arial; + font-family: Inter; font-variation-settings: '; } diff --git a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg index cd0f21fdb..425c46a36 100644 --- a/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg +++ b/apps/medical-illustration/src/assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg @@ -928,7 +928,7 @@ } .cls-200 { - font-family: Arial; + font-family: Inter; font-variation-settings: '; } @@ -17649,10 +17649,10 @@ y="19.2" id="tspan8270">endothelial cell Date: Wed, 29 Nov 2023 15:05:25 -0500 Subject: [PATCH 8/8] Fix test --- .../tissue-tree-list.component.spec.ts | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/libs/components/molecules/src/lib/tissue-tree-list/tissue-tree-list.component.spec.ts b/libs/components/molecules/src/lib/tissue-tree-list/tissue-tree-list.component.spec.ts index 0423d5372..c72c75d81 100644 --- a/libs/components/molecules/src/lib/tissue-tree-list/tissue-tree-list.component.spec.ts +++ b/libs/components/molecules/src/lib/tissue-tree-list/tissue-tree-list.component.spec.ts @@ -80,18 +80,6 @@ describe('TissueTreeListComponent', () => { return { selected: new SimpleChange(undefined, value, true) }; } - it('selects default entry if set to undefined', async () => { - const { instance } = await shallow.render({ bind: { nodes } }); - const spy = jest.spyOn(instance.control, 'expand'); - instance.ngOnChanges(createChangeSet(undefined)); - expect(spy).toHaveBeenCalledWith({ - label: 'Kidney', - expandable: true, - level: 0, - data: { label: 'Kidney', children: ['id2', 'id3'] }, - }); - }); - it('expands all parent nodes and itself', async () => { const { instance } = await shallow.render({ bind: { nodes } }); const spy = jest.spyOn(instance.control, 'expand');