From 32ac4be34a4a513e7955ecb90db64c15e49f7af8 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxOLI.org>
Date: Fri, 28 Apr 2023 20:04:19 +0000
Subject: [PATCH] LP#1977554: (follow-up) style tweaks

Deal with issues introduced by a merge conflict resolution
error and the Bootstrap 5 upgrade.

Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---
 .../src/eg2/src/app/staff/login.component.html     | 88 ++++++++++++----------
 1 file changed, 47 insertions(+), 41 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/login.component.html b/Open-ILS/src/eg2/src/app/staff/login.component.html
index dd4bbc9618..018adec974 100644
--- a/Open-ILS/src/eg2/src/app/staff/login.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/login.component.html
@@ -7,54 +7,60 @@
 
         <div class="row row-cols-auto">
           <label class="form-label col-form-label fw-bold col-4 text-end" for="username" i18n>Username</label>
-          <input
-            type="text"
-            class="form-control col-lg-8"
-            id="username"
-            name="username"
-            required
-            autocomplete="username"
-            i18n-placeholder
-            placeholder="Username"
-            [(ngModel)]="args.username"/>
+          <div class="col-8">
+            <input
+              type="text"
+              class="form-control"
+              id="username"
+              name="username"
+              required
+              autocomplete="username"
+              i18n-placeholder
+              placeholder="Username"
+              [(ngModel)]="args.username"/>
+          </div>
         </div>
 
-        <div class="row row-cols-auto">
-          <label class="col-lg-4 text-right font-weight-bold" for="password" i18n>Password</label>
-          <div class="input-group col-lg-8 p-0">
-          <input
-            [type]="passwordVisible ? 'text' : 'password'"
-            class="form-control"
-            id="password"
-            #password
-            name="password"
-            required
-            autocomplete="current-password"
-            i18n-placeholder
-            placeholder="Password"
-            spellcheck="false"
-            [attr.aria-description]="ariaDescription"
-            [(ngModel)]="args.password"/>
-          <button id="show_password" class="input-group-text pointer"
-                  type="button" aria-label="password visibility" aria-checked="false"
-                  (click)="togglePasswordVisibility()" >
-            <span class="material-icons">{{ passwordVisible ? 'visibility' : 'visibility_off' }}</span>
-          </button>
+        <div class="row row-cols-auto mt-3">
+          <label class="form-label col-form-label col-4 text-end fw-bold" for="password" i18n>Password</label>
+          <div class="col-8">
+            <div class="input-group p-0">
+              <input
+                [type]="passwordVisible ? 'text' : 'password'"
+                class="form-control"
+                id="password"
+                #password
+                name="password"
+                required
+                autocomplete="current-password"
+                i18n-placeholder
+                placeholder="Password"
+                spellcheck="false"
+                [attr.aria-description]="ariaDescription"
+                [(ngModel)]="args.password"/>
+              <button id="show_password" class="input-group-text pointer"
+                type="button" aria-label="password visibility" aria-checked="false"
+                (click)="togglePasswordVisibility()" >
+                <span class="material-icons">{{ passwordVisible ? 'visibility' : 'visibility_off' }}</span>
+              </button>
+            </div>
           </div>
         </div>
 
         <div class="row row-cols-auto mt-3" *ngIf="workstations && workstations.length">
           <label class="form-label col-form-label col-4 text-end fw-bold" for="workstation" i18n>Workstation</label>
-          <select
-            class="form-control col-lg-8"
-            id="workstation"
-            name="workstation"
-            required
-            [(ngModel)]="args.workstation">
-            <option *ngFor="let ws of workstations" [value]="ws.name">
-              {{ws.name}}
-            </option>
-          </select>
+          <div class="col-8">
+            <select
+              class="form-control"
+              id="workstation"
+              name="workstation"
+              required
+              [(ngModel)]="args.workstation">
+              <option *ngFor="let ws of workstations" [value]="ws.name">
+                {{ws.name}}
+              </option>
+            </select>
+          </div>
         </div>
 
         <div class="row row-cols-auto mt-3">
-- 
2.11.0