diff --git a/src/ui/nehubaContainer/nehubaContainer.style.css b/src/ui/nehubaContainer/nehubaContainer.style.css index 129bf46d642b9667c5d85b0acb4065e0caab1ea7..301c664de0d831b6e848e7f5af27422c27326749 100644 --- a/src/ui/nehubaContainer/nehubaContainer.style.css +++ b/src/ui/nehubaContainer/nehubaContainer.style.css @@ -153,6 +153,7 @@ div[mobileObliqueGuide] > * { background-color: rgba(50,50,50,0.8); + color: white; } div#scratch-pad diff --git a/src/ui/nehubaContainer/nehubaContainer.template.html b/src/ui/nehubaContainer/nehubaContainer.template.html index cad73a3d8e72af26813d62f5e7ab2e202d5a3c7a..83066042e55fd28269815978ba971520c65bdca9 100644 --- a/src/ui/nehubaContainer/nehubaContainer.template.html +++ b/src/ui/nehubaContainer/nehubaContainer.template.html @@ -97,7 +97,7 @@ </div> </div> </div> - <div mobileObliqueCtrl initiator> + <div (contextmenu)="$event.stopPropagation(); $event.preventDefaul();" mobileObliqueCtrl initiator> <i class="fas fa-globe"></i> </div> </mobile-overlay> \ No newline at end of file diff --git a/src/ui/signinBanner/signinBanner.components.ts b/src/ui/signinBanner/signinBanner.components.ts index 3feeb1b1936fedd68cfda1396e93b4d19efe6c0f..60f8ce728f760a834f9daf309c2c22c63f57509e 100644 --- a/src/ui/signinBanner/signinBanner.components.ts +++ b/src/ui/signinBanner/signinBanner.components.ts @@ -140,4 +140,7 @@ export class SigninBanner implements OnInit, OnDestroy{ get user() : User | null { return this.authService.user } + + public flexItemIsMobileClass = 'mt-2' + public flexItemIsDesktopClass = 'mr-2' } \ No newline at end of file diff --git a/src/ui/signinBanner/signinBanner.style.css b/src/ui/signinBanner/signinBanner.style.css index 03432c472aa19fab9c7579cb2a17539da1016012..126c598d6d8544ae5e1727d105ac6e20dd089c26 100644 --- a/src/ui/signinBanner/signinBanner.style.css +++ b/src/ui/signinBanner/signinBanner.style.css @@ -1,8 +1,3 @@ -:host -{ - -} - :host > * { flex: 0 0 0; @@ -61,14 +56,3 @@ dropdown-component outline: none; background-color: transparent; } - - -.selectTemplateDetailsMobile { - width: 100%; - margin-top: 5px; -} - - -.selectTemplateDetaiNoMobile { - margin: 0 3px; -} \ No newline at end of file diff --git a/src/ui/signinBanner/signinBanner.template.html b/src/ui/signinBanner/signinBanner.template.html index f43eccde7ce230929d915a891acef3f77cc3f856..56856ec3daebcd4f3dd2d01c9267b24e86d823e4 100644 --- a/src/ui/signinBanner/signinBanner.template.html +++ b/src/ui/signinBanner/signinBanner.template.html @@ -1,4 +1,6 @@ -<div [ngClass]="isMobile? 'whenMobile' : 'whenNotMobile'" > +<div + class="d-flex" + [ngClass]="{ 'flex-column w-100 align-items-stretch' : isMobile}" > <dropdown-component (itemSelected)="changeTemplate($event)" @@ -6,7 +8,7 @@ [selectedItem]="selectedTemplate$ | async" [inputArray]="loadedTemplates$ | async | filterNull" [isMobile] = "isMobile" - [ngClass]="isMobile ? 'selectTemplateDetailsMobile' : 'selectTemplateDetaiNoMobile'" + [ngClass]="isMobile ? flexItemIsMobileClass : flexItemIsDesktopClass" [darktheme] ="darktheme"> </dropdown-component> @@ -18,7 +20,7 @@ [selectedItem]="selectedParcellation" [inputArray]="selectedTemplate.parcellations" [isMobile] = "isMobile" - [ngClass]="isMobile ? 'selectTemplateDetailsMobile' : 'selectTemplateDetaiNoMobile'" + [ngClass]="isMobile ? flexItemIsMobileClass : flexItemIsDesktopClass" [darktheme] ="darktheme"> </dropdown-component> @@ -29,8 +31,9 @@ (clearAllRegions)="clearAllRegions()" [isMobile] = "isMobile" *ngIf="selectedParcellation$ | async as selectedParcellation" + class="h-0" [selectedParcellation]="selectedParcellation" - [ngClass]="isMobile ? 'selectTemplateDetailsMobile' : 'selectTemplateDetaiNoMobile'"> + [ngClass]="isMobile ? flexItemIsMobileClass : flexItemIsDesktopClass"> </region-hierarchy> </ng-container>