From 635370da24e9b2ed7da887e48045688a1e9443cb Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxOLI.org>
Date: Thu, 27 Apr 2023 11:23:04 +0000
Subject: [PATCH] LP#2000482: (follow-up) couple more layout tweaks

Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---
 .../eg2/src/app/share/multi-select/multi-select.component.html    | 8 +++++---
 Open-ILS/src/eg2/src/app/staff/nav.component.html                 | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/share/multi-select/multi-select.component.html b/Open-ILS/src/eg2/src/app/share/multi-select/multi-select.component.html
index 7ec8cf3e7c..d448d2eedf 100644
--- a/Open-ILS/src/eg2/src/app/share/multi-select/multi-select.component.html
+++ b/Open-ILS/src/eg2/src/app/share/multi-select/multi-select.component.html
@@ -15,7 +15,7 @@
           [applyDefault]="true"
           (onChange)="acplContextOrgId = $event.id()">
         </eg-org-select>
-        <label class="form-check-label" for="acplIncludeDescendants" i18n>Include descendants?</label>
+        <label class="form-label form-check-label me-1" for="acplIncludeDescendants" i18n>Include descendants?</label>
         <input type="checkbox"
           domId="acplIncludeDescendants"
           id="acplIncludeDescendants"
@@ -32,7 +32,9 @@
     <button class="btn btn-outline-dark" (click)="addSelectedValue()" [disabled]="!this.selected" i18n>Add</button>
   </div>
   <div class="row" *ngFor="let entry of entrylist">
-    <div class="col-lg-4">{{entry.label}}</div>
-    <button class="btn btn-sm btn-warning" (click)="removeValue(entry)" i18n>Remove</button>
+    <div class="col">{{entry.label}}</div>
+    <div class="col">
+      <button class="btn btn-sm btn-warning" (click)="removeValue(entry)" i18n>Remove</button>
+    </div>
   </div>
 </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/nav.component.html b/Open-ILS/src/eg2/src/app/staff/nav.component.html
index b4792f5432..e44a16c147 100644
--- a/Open-ILS/src/eg2/src/app/staff/nav.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html
@@ -484,7 +484,7 @@
       <span i18n>{{user()}} @ {{workstation()}}</span>
     </div>
     <div class="navbar-nav" *ngIf="locales.length > 1 && currentLocale">
-      <div ngbDropdown class="nav-item dropdown" placement="bottom-right">
+      <div ngbDropdown class="nav-item dropdown" display="dynamic">
         <a ngbDropdownToggle i18n i18n-title
           title="Select Locale"
           class="nav-link dropdown-toggle no-caret with-material-icon">
@@ -502,7 +502,7 @@
       </div>
     </div>
     <div class="navbar-nav" *ngIf="user()">
-      <div ngbDropdown class="nav-item dropdown" placement="bottom-right">
+      <div ngbDropdown class="nav-item dropdown" display="dynamic">
         <a ngbDropdownToggle i18n 
           i18n-title
           title="Log out and more..."
-- 
2.11.0