From 486ef6f71366c52c8881970fe821aab5212d2cc7 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Thu, 12 Jan 2023 11:14:51 -0500
Subject: [PATCH] LP2000482 Bootstrap 5: org-family-select repairs

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 .../org-family-select.component.html               | 22 ++++++++++------------
 Open-ILS/src/eg2/src/styles.css                    |  2 +-
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/share/org-family-select/org-family-select.component.html b/Open-ILS/src/eg2/src/app/share/org-family-select/org-family-select.component.html
index 308199e800..3ec4167ec4 100644
--- a/Open-ILS/src/eg2/src/app/share/org-family-select/org-family-select.component.html
+++ b/Open-ILS/src/eg2/src/app/share/org-family-select/org-family-select.component.html
@@ -1,25 +1,23 @@
-<form class="form-inline" [formGroup]="familySelectors">
-  <div class="input-group">
-    <div class="input-group-prepend">
-      <span class="input-group-text">{{labelText}}</span>
-    </div>
-    <eg-org-select [domId]="domId"
-      (onChange)="orgOnChange($event)"
-      [limitPerms]="limitPerms"
-      [applyOrgId]="selectedOrgId">
-    </eg-org-select>
+<form class="d-flex" [formGroup]="familySelectors">
+  <div class="input-group-prepend">
+    <span class="input-group-text">{{labelText}}</span>
   </div>
+  <eg-org-select [domId]="domId"
+    (onChange)="orgOnChange($event)"
+    [limitPerms]="limitPerms"
+    [applyOrgId]="selectedOrgId">
+  </eg-org-select>
 
   <!-- stack the checkboxes -->
   <div class="ml-2 d-flex flex-column align-items-start">
-    <div class="form-check" *ngIf="!hideAncestorSelector">
+    <div class="form-check m-0 pb-0" style="min-height:.8rem" *ngIf="!hideAncestorSelector">
       <input type="checkbox"
         formControlName="includeAncestors"
         (blur)="propagateTouch()"
         class="form-check-input" id="{{domId}}-include-ancestors">
       <label class="form-check-label" for="{{domId}}-include-ancestors" i18n>+ Ancestors</label>
     </div>
-    <div class="form-check" *ngIf="!hideDescendantSelector">
+    <div class="form-check m-0 pt-0" style="min-height:.8rem" *ngIf="!hideDescendantSelector">
       <input type="checkbox"
         formControlName="includeDescendants"
         (blur)="propagateTouch()"
diff --git a/Open-ILS/src/eg2/src/styles.css b/Open-ILS/src/eg2/src/styles.css
index bdb79f41ef..6061fc76ba 100644
--- a/Open-ILS/src/eg2/src/styles.css
+++ b/Open-ILS/src/eg2/src/styles.css
@@ -182,7 +182,7 @@ a {
  * Invalid fields are left-border styled in red-ish.
  */
 .form-validated .ng-valid[required]:not(eg-combobox):not(eg-date-select), 
-.form-validated .ng-valid.required, input[formcontrolname].ng-valid {
+.form-validated .ng-valid.required, input[formcontrolname].ng-valid.required {
   border-left: 5px solid #78FA89;
 }
 .form-validated .ng-invalid:not(form):not(eg-combobox):not(eg-date-select),
-- 
2.11.0