Skip to content
Snippets Groups Projects
Commit d1e21cc7 authored by Xiao Gui's avatar Xiao Gui
Browse files

chore: cosmetic UI fixes

bugfix: category badges captures click event
parent 526099c2
No related branches found
No related tags found
No related merge requests found
...@@ -8,3 +8,5 @@ ...@@ -8,3 +8,5 @@
- fix the position of quick tour panel of slice view panels - fix the position of quick tour panel of slice view panels
- fix the atlas selection logic. This should reduce 4xx/5xx calls significantly - fix the atlas selection logic. This should reduce 4xx/5xx calls significantly
- minor update to parcellation chip appearance
- clicking on feature badge now properly selects the feature
...@@ -14,6 +14,11 @@ ...@@ -14,6 +14,11 @@
- [ ] Human multilevel atlas - [ ] Human multilevel atlas
- [ ] on click from home page, MNI152, Julich v2.9 loads without issue - [ ] on click from home page, MNI152, Julich v2.9 loads without issue
- [ ] on hover, show correct region name(s) - [ ] on hover, show correct region name(s)
- [ ] Parcellation smart chip
- [ ] show/hide parcellation toggle exists and works
- [ ] `q` is a shortcut to show/hide parcellation toggle
- [ ] info button exists and works
- [ ] info button shows desc, and link to KG
- [ ] regional is fine :: select hOC1 right - [ ] regional is fine :: select hOC1 right
- [ ] probabilistic map loads fine - [ ] probabilistic map loads fine
- [ ] segmentation layer hides - [ ] segmentation layer hides
......
...@@ -21,3 +21,14 @@ ...@@ -21,3 +21,14 @@
{ {
margin: 0.5rem; margin: 0.5rem;
} }
.icons-container
{
transform: scale(0.7);
margin-right: -1.5rem;
}
.icons-container > *
{
margin: auto 0.2rem;
}
...@@ -58,9 +58,25 @@ ...@@ -58,9 +58,25 @@
#menuTrigger="matMenuTrigger" #menuTrigger="matMenuTrigger"
> >
<div prefix class="sxplr-scale-70"> <div class="icons-container"
<button mat-mini-fab suffix
[color]="(parcellationVisibility$ | async) ? 'primary' : 'default'" iav-stop="mousedown click">
<ng-template #mainParcDesc>
<ng-template [ngTemplateOutlet]="parcDescTmpl"
[ngTemplateOutletContext]="{ parcellation: parcellation }">
</ng-template>
</ng-template>
<button mat-icon-button
color="default"
[sxplr-dialog]="mainParcDesc"
[sxplr-dialog-size]="null">
<i class="fas fa-info"></i>
</button>
<button mat-icon-button
color="default"
[matTooltip]="ARIA_LABELS.TOGGLE_DELINEATION" [matTooltip]="ARIA_LABELS.TOGGLE_DELINEATION"
iav-stop="mousedown click" iav-stop="mousedown click"
[iav-key-listener]="[{'type': 'keydown', 'key': 'q', 'capture': true, 'target': 'document' }]" [iav-key-listener]="[{'type': 'keydown', 'key': 'q', 'capture': true, 'target': 'document' }]"
...@@ -74,26 +90,10 @@ ...@@ -74,26 +90,10 @@
{{ ARIA_LABELS.TOGGLE_DELINEATION }} {{ ARIA_LABELS.TOGGLE_DELINEATION }}
</span> </span>
</button> </button>
</div>
<div class="sxplr-scale-70"
suffix
iav-stop="mousedown click">
<ng-template #mainParcDesc>
<ng-template [ngTemplateOutlet]="parcDescTmpl"
[ngTemplateOutletContext]="{ parcellation: parcellation }">
</ng-template>
</ng-template>
<button mat-mini-fab color="default"
[sxplr-dialog]="mainParcDesc"
[sxplr-dialog-size]="null">
<i class="fas fa-info"></i>
</button>
<button mat-mini-fab <button mat-mini-fab
*ngIf="!(parcellation | parcellationIsBaseLayer)" *ngIf="!(parcellation | parcellationIsBaseLayer)"
color="primary" color="default"
(click)="dismiss()"> (click)="dismiss()">
<spinner-cmp class="sxplr-w-100 sxplr-h-100" *ngIf="onDismissClicked$ | async; else defaultDismissIcon"></spinner-cmp> <spinner-cmp class="sxplr-w-100 sxplr-h-100" *ngIf="onDismissClicked$ | async; else defaultDismissIcon"></spinner-cmp>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<mat-chip-list <mat-chip-list
*ngIf="feature | featureBadgeFlag" *ngIf="feature | featureBadgeFlag"
class="sxplr-scale-80 transform-origin-left-center"> class="sxplr-scale-80 transform-origin-left-center sxplr-pe-none">
<mat-chip <mat-chip
[color]="feature | featureBadgeColour" [color]="feature | featureBadgeColour"
selected> selected>
......
...@@ -390,11 +390,6 @@ markdown-dom p ...@@ -390,11 +390,6 @@ markdown-dom p
height: 0px; height: 0px;
} }
.pe-none
{
pointer-events: none!important;
}
.h-2rem .h-2rem
{ {
height: 2rem!important; height: 2rem!important;
......
...@@ -284,3 +284,8 @@ a[mat-raised-button] ...@@ -284,3 +284,8 @@ a[mat-raised-button]
{ {
text-decoration: none; text-decoration: none;
} }
.#{$nsp}-pe-none
{
pointer-events: none!important;
}
...@@ -90,7 +90,7 @@ export class QuickTourService { ...@@ -90,7 +90,7 @@ export class QuickTourService {
height: '0px', height: '0px',
width: '0px', width: '0px',
hasBackdrop: true, hasBackdrop: true,
backdropClass: ['pe-none', 'cdk-overlay-dark-backdrop'], backdropClass: ['sxplr-pe-none', 'cdk-overlay-dark-backdrop'],
positionStrategy: this.overlay.position().global(), positionStrategy: this.overlay.position().global(),
}) })
} }
......
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
[attr.data-viewer-controller-visible]="visible" [attr.data-viewer-controller-visible]="visible"
[attr.data-viewer-controller-index]="panelIndex"> [attr.data-viewer-controller-index]="panelIndex">
<div class="position-absolute w-100 h-100 pe-none" <div class="position-absolute w-100 h-100 sxplr-pe-none"
*ngIf="panelIndex === 1" *ngIf="panelIndex === 1"
quick-tour quick-tour
[quick-tour-description]="quickTourIconsSlide.description" [quick-tour-description]="quickTourIconsSlide.description"
......
...@@ -123,3 +123,9 @@ mat-list[dense].contextual-block ...@@ -123,3 +123,9 @@ mat-list[dense].contextual-block
{ {
overflow: hidden auto; overflow: hidden auto;
} }
.region-chip-suffix
{
transform: scale(0.7);
margin-right: -0.25rem;
}
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="floating-ui"> <div class="floating-ui">
<div *ngIf="(media.mediaBreakPoint$ | async) < 2" <div *ngIf="(media.mediaBreakPoint$ | async) < 2"
class="fixed-bottom pe-none mb-2 d-flex justify-content-center"> class="fixed-bottom sxplr-pe-none mb-2 d-flex justify-content-center">
<logo-container></logo-container> <logo-container></logo-container>
</div> </div>
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
</mat-drawer> </mat-drawer>
<!-- master content --> <!-- master content -->
<mat-drawer-content class="visible pe-none position-relative"> <mat-drawer-content class="visible sxplr-pe-none position-relative">
<iav-layout-fourcorners> <iav-layout-fourcorners>
<!-- top left --> <!-- top left -->
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
<!-- bottom left --> <!-- bottom left -->
<div iavLayoutFourCornersBottomLeft class="ws-no-wrap d-inline-flex w-100vw pe-none align-items-center mb-4"> <div iavLayoutFourCornersBottomLeft class="ws-no-wrap d-inline-flex w-100vw sxplr-pe-none align-items-center mb-4">
<!-- special bottom left --> <!-- special bottom left -->
<ng-template [ngIf]="viewerMode$ | async" let-mode [ngIfElse]="localBottomLeftTmpl"></ng-template> <ng-template [ngIf]="viewerMode$ | async" let-mode [ngIfElse]="localBottomLeftTmpl"></ng-template>
...@@ -436,7 +436,7 @@ ...@@ -436,7 +436,7 @@
<div prefix> <div prefix>
</div> </div>
<div suffix class="sxplr-scale-70"> <div suffix class="region-chip-suffix">
<button mat-mini-fab <button mat-mini-fab
color="primary" color="primary"
iav-stop="mousedown click" iav-stop="mousedown click"
...@@ -545,7 +545,7 @@ ...@@ -545,7 +545,7 @@
<i class="fas fa-sitemap"></i> <i class="fas fa-sitemap"></i>
</button> </button>
<div class="w-100 h-100 position-absolute pe-none" *ngIf="showTour"> <div class="w-100 h-100 position-absolute sxplr-pe-none" *ngIf="showTour">
</div> </div>
</div> </div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment