diff --git a/src/atlasViewer/atlasViewer.constantService.service.ts b/src/atlasViewer/atlasViewer.constantService.service.ts index 2c13b1ab7c1d4ff4f1f04ce03850e6d88c25e01c..47f220b7b59260a642d44bac283a1b8b704b12b3 100644 --- a/src/atlasViewer/atlasViewer.constantService.service.ts +++ b/src/atlasViewer/atlasViewer.constantService.service.ts @@ -259,6 +259,9 @@ Interactive atlas viewer requires **webgl2.0**, and the \`EXT_color_buffer_float }) } + /** + * TODO deprecate + */ const meta = 'res/json/allAggregatedData.json' fetch(meta) diff --git a/src/atlasViewer/atlasViewer.template.html b/src/atlasViewer/atlasViewer.template.html index e6f5ac669baa096ca1e84ee760fa608514b856e3..aff1c05c70a4f41d8355a9d54188b323f47306af 100644 --- a/src/atlasViewer/atlasViewer.template.html +++ b/src/atlasViewer/atlasViewer.template.html @@ -81,7 +81,7 @@ </cookie-agreement> </div> </tab> - <tab heading="KG ToS"> + <tab heading="Terms of Use"> <div class="mt-2"> <kgtos-component> </kgtos-component> diff --git a/src/components/toast/toast.template.html b/src/components/toast/toast.template.html index 6d1450269366772b1c96930e0178436bbad5d81e..95032c74b9fbc154f0bd1e7aa9542f3453bf4fa0 100644 --- a/src/components/toast/toast.template.html +++ b/src/components/toast/toast.template.html @@ -15,8 +15,9 @@ </div> <div (click)="dismiss($event)" + class="ml-2" *ngIf="dismissable" close> - <i class="fas fa-remove"></i> + <i class="fas fa-times"></i> </div> <timer-component *ngIf="timeout > 0" diff --git a/src/res/css/extra_styles.css b/src/res/css/extra_styles.css index a498518957812668c31c71a62e0ae47a88569cc5..1f176a851b20e3cf30cd70b363cc1c2730eefa4c 100644 --- a/src/res/css/extra_styles.css +++ b/src/res/css/extra_styles.css @@ -262,6 +262,11 @@ markdown-dom pre code border-bottom-color: rgba(0, 0, 0, 0.8); } +.darktheme.popover.popover-right>.arrow::after +{ + border-right-color: rgba(0, 0, 0, 0.8); +} + .r-90 { transform: rotate(90deg)!important; diff --git a/src/ui/databrowserModule/databrowser/databrowser.template.html b/src/ui/databrowserModule/databrowser/databrowser.template.html index 890576252a034b478ac5b63a642461b46da53349..515a94d8331c6235c7ef253d927c7d159ba597ea 100644 --- a/src/ui/databrowserModule/databrowser/databrowser.template.html +++ b/src/ui/databrowserModule/databrowser/databrowser.template.html @@ -29,7 +29,7 @@ <!-- modality picker --> <div> <span - placement="bottom" + placement="right" container="body" [popover]="countedDataM.length > 0 ? modalityPicker : null" [outsideClick]="true" diff --git a/src/ui/nehubaContainer/nehubaViewer/nehubaViewer.component.ts b/src/ui/nehubaContainer/nehubaViewer/nehubaViewer.component.ts index 28a41e61f18a9c4a9873aff725154a14be03dfab..a15fd44271abe3d06b0db3fcd667ce6ae0a6b6b2 100644 --- a/src/ui/nehubaContainer/nehubaViewer/nehubaViewer.component.ts +++ b/src/ui/nehubaContainer/nehubaViewer/nehubaViewer.component.ts @@ -480,7 +480,6 @@ export class NehubaViewerUnit implements OnDestroy{ } private filterLayers(l:any,layerObj:any):boolean{ - debugger /** * if selector is an empty object, select all layers */ diff --git a/src/ui/signinBanner/signinBanner.components.ts b/src/ui/signinBanner/signinBanner.components.ts index e3870a457c8225554a9c2e124b0f560b6d318345..798b5f1f157af82ca00c17f265ae55379bf7ede7 100644 --- a/src/ui/signinBanner/signinBanner.components.ts +++ b/src/ui/signinBanner/signinBanner.components.ts @@ -97,6 +97,7 @@ export class SigninBanner implements OnInit, OnDestroy{ }) } + // TODO handle mobile handleRegionClick({ mode = 'single', region }){ if (!region) return diff --git a/src/util/directives/toastContainer.directive.ts b/src/util/directives/toastContainer.directive.ts index 162e3c6d776fa64dea6dff58ab6e3cf9e7e0c4fc..f32c5346226341b32e88d1ecacfcb658589871a2 100644 --- a/src/util/directives/toastContainer.directive.ts +++ b/src/util/directives/toastContainer.directive.ts @@ -17,11 +17,12 @@ export class ToastContainerDirective{ ){ const toastComponentFactory = this.cfr.resolveComponentFactory(ToastComponent) - this.toastService.showToast = (message, config) => { + this.toastService.showToast = (message, config = {}) => { - const _config = Object.assign({}, defaultToastConfig, config - ? config - : {}) + const _config = { + ...defaultToastConfig, + ...config + } const toastComponent = this.viewContainerRef.createComponent(toastComponentFactory) if(typeof message === 'string') toastComponent.instance.message = message