LP2000482 Bootstrap 5: Modal/dialog close button classes

Signed-off-by: Stephanie Leary <stephanie.leary@equinoxOLI.org>

diff --git a/Open-ILS/src/eg2/src/app/share/accesskey/accesskey-info.component.html b/Open-ILS/src/eg2/src/app/share/accesskey/accesskey-info.component.html
index 8396ea5..6710db9 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/accesskey/accesskey-info.component.html
+++ b/Open-ILS/src/eg2/src/app/share/accesskey/accesskey-info.component.html
@@ -1,26 +1,24 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title" i18n>Access Key Assignments</h4>
-    <button type="button" class="close" 
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white" 
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
-    <div class="row border-bottom">
-      <div class="col-lg-2 p-1 border-right text-center" i18n>Command</div>
-      <div class="col-lg-6 p-1 border-right" i18n>Action</div>
-      <div class="col-lg-2 p-1" i18n>Context</div>
-      <div class="col-lg-2 p-1" i18n>Active?</div>
+    <div class="row row-cols-auto border-bottom">
+      <div class="col-2 p-1 border-end text-center" i18n>Command</div>
+      <div class="col-6 p-1 border-end" i18n>Action</div>
+      <div class="col-2 p-1" i18n>Context</div>
+      <div class="col-2 p-1" i18n>Active?</div>
     </div>
-    <div class="row border-bottom" *ngFor="let a of assignments()">
-      <div class="col-lg-2 p-1 border-right text-center">{{a.key}}</div>
-      <div class="col-lg-6 p-1 border-right">{{a.desc}}</div>
-      <div class="col-lg-2 p-1 border-right">{{a.ctx}}</div>
-      <div class="col-lg-2 p-1"><eg-bool [value]="!a.shadowed"></eg-bool></div>
+    <div class="row row-cols-auto border-bottom" *ngFor="let a of assignments()">
+      <div class="col-2 p-1 border-end text-center">{{a.key}}</div>
+      <div class="col-6 p-1 border-end">{{a.desc}}</div>
+      <div class="col-2 p-1 border-end">{{a.ctx}}</div>
+      <div class="col-2 p-1"><eg-bool [value]="!a.shadowed"></eg-bool></div>
     </div>
-    <div class="row mt-2">
-      <div class="col-lg-12 font-italic" i18n>
+    <div class="row row-cols-auto mt-2">
+      <div class="col-12 fst-italic" i18n>
         If an assignment is not active, it means it was superseded by
         an assignment from a different context using the same keyboard 
         shortcut.

diff --git a/Open-ILS/src/eg2/src/app/share/clipboard/clipboard-dialog.component.html b/Open-ILS/src/eg2/src/app/share/clipboard/clipboard-dialog.component.html
index c4c4d03..9037847 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/clipboard/clipboard-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/share/clipboard/clipboard-dialog.component.html
@@ -1,10 +1,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title" i18n>Copy Data to Clipboard</h4>
-    <button type="button" class="close" 
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white" 
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body common-form striped-odd">
     <div class="row" *ngFor="let value of values">

diff --git a/Open-ILS/src/eg2/src/app/share/dialog/confirm.component.html b/Open-ILS/src/eg2/src/app/share/dialog/confirm.component.html
index 05cf562..fcb5f2f 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/dialog/confirm.component.html
+++ b/Open-ILS/src/eg2/src/app/share/dialog/confirm.component.html
@@ -1,10 +1,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title">{{dialogTitle}}</h4>
-    <button type="button" class="close" 
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white" 
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <ng-container *ngIf="!dialogBodyTemplate">

diff --git a/Open-ILS/src/eg2/src/app/share/dialog/progress.component.html b/Open-ILS/src/eg2/src/app/share/dialog/progress.component.html
index c1fdf20..14d6aa4 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/dialog/progress.component.html
+++ b/Open-ILS/src/eg2/src/app/share/dialog/progress.component.html
@@ -1,11 +1,9 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 *ngIf="dialogTitle" class="modal-title">{{dialogTitle}}</h4>
-    <button type="button" class="close" 
+    <button type="button" class="btn-close btn-close-white" 
       i18n-aria-label aria-label="Close" 
-      (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+      (click)="close()"></button>
   </div>
 
   <div class="modal-body eg-progress-dialog">

diff --git a/Open-ILS/src/eg2/src/app/share/dialog/prompt.component.html b/Open-ILS/src/eg2/src/app/share/dialog/prompt.component.html
index 7375633..f010de8 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/dialog/prompt.component.html
+++ b/Open-ILS/src/eg2/src/app/share/dialog/prompt.component.html
@@ -1,10 +1,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title">{{dialogTitle}}</h4>
-    <button type="button" class="close" 
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white" 
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <p>{{dialogBody}}</p>

diff --git a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html
index 518125c..98e46f0 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html
+++ b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html
@@ -13,10 +13,8 @@
   <div class="modal-header bg-info" *ngIf="!hideBanner">
     <h4 class="modal-title" i18n>Record Editor: {{recordLabel}}</h4>
     <ng-container *ngIf="isDialog()">
-      <button type="button" class="close" 
-        i18n-aria-label aria-label="Close" (click)="closeEditor()">
-        <span aria-hidden="true">&times;</span>
-      </button>
+      <button type="button" class="btn-close btn-close-white" 
+        i18n-aria-label aria-label="Close" (click)="closeEditor()"></button>
     </ng-container>
   </div>
   <div class="modal-body">

diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-column-config.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid-column-config.component.html
index be3b2b1..1983ebd 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/grid/grid-column-config.component.html
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid-column-config.component.html
@@ -1,10 +1,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title" i18n>Grid Columns Configuration</h4>
-    <button type="button" class="close" 
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white" 
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body eg-grid-column-config-dialog">
 

diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar-actions-editor.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar-actions-editor.component.html
index 26d7bc6..c6be1fa 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar-actions-editor.component.html
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar-actions-editor.component.html
@@ -1,10 +1,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title" i18n>Grid Menu Configuration</h4>
-    <button type="button" class="close" 
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white" 
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <div class="row">

diff --git a/Open-ILS/src/eg2/src/app/share/translate/translate.component.html b/Open-ILS/src/eg2/src/app/share/translate/translate.component.html
index 1302391..86b9cea 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/translate/translate.component.html
+++ b/Open-ILS/src/eg2/src/app/share/translate/translate.component.html
@@ -3,10 +3,8 @@
     <h4 class="modal-title" i18n>
       {{idlClassDef.label}}
     </h4>
-    <button type="button" class="close" 
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white" 
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body form-common form-validated" *ngIf="idlObj">
     <div class="form-group row">

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/add-copies-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/add-copies-dialog.component.html
index 29d1b3e..1356681 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/add-copies-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/add-copies-dialog.component.html
@@ -2,10 +2,8 @@
   <form class="form-validated">
     <div class="modal-header bg-info">
       <h3 class="modal-title" i18n>Add Items to Selected Line Items</h3>
-      <button type="button" class="close"
-        i18n-aria-label aria-label="Close" (click)="close()">
-        <span aria-hidden="true">&times;</span>
-      </button>
+      <button type="button" class="btn-close btn-close-white"
+        i18n-aria-label aria-label="Close" (click)="close()"></button>
     </div>
     <div class="modal-body">
       <h4 i18n>Line Item(s) selected:

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/add-to-po-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/add-to-po-dialog.component.html
index 9567e2e..aaf6c45 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/add-to-po-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/add-to-po-dialog.component.html
@@ -2,10 +2,8 @@
   <form class="form-validated">
     <div class="modal-header bg-info">
       <h3 class="modal-title" i18n>Add Line Items to Purchase order</h3>
-      <button type="button" class="close"
-        i18n-aria-label aria-label="Close" (click)="close()">
-        <span aria-hidden="true">&times;</span>
-      </button>
+      <button type="button" class="btn-close btn-close-white"
+        i18n-aria-label aria-label="Close" (click)="close()"></button>
     </div>
     <div class="modal-body">
       <h4 i18n *ngIf="liIds && liIds.length">Line Item(s) selected:

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-update-copies-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-update-copies-dialog.component.html
index 864c486..89c1148 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-update-copies-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-update-copies-dialog.component.html
@@ -13,10 +13,8 @@
   <form class="form-validated">
     <div class="modal-header bg-info">
       <h3 class="modal-title" i18n>Batch Update Items on Selected Line Items</h3>
-      <button type="button" class="close"
-        i18n-aria-label aria-label="Close" (click)="close()">
-        <span aria-hidden="true">&times;</span>
-      </button>
+      <button type="button" class="btn-close btn-close-white"
+        i18n-aria-label aria-label="Close" (click)="close()"></button>
     </div>
     <div class="modal-body">
       <h4 i18n>Line Item(s) selected:

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/bib-finder-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/bib-finder-dialog.component.html
index f1e1dbc..a4bd011 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/bib-finder-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/bib-finder-dialog.component.html
@@ -2,10 +2,8 @@
   <form class="form-validated">
     <div class="modal-header bg-info">
       <h3 class="modal-title" i18n>Link Line Item to Catalog</h3>
-      <button type="button" class="close"
-        i18n-aria-label aria-label="Close" (click)="close()">
-        <span aria-hidden="true">&times;</span>
-      </button>
+      <button type="button" class="btn-close btn-close-white"
+        i18n-aria-label aria-label="Close" (click)="close()"></button>
     </div>
     <div class="modal-body">
       <h4 i18n>Line Item: {{liId}}</h4>

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/cancel-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/cancel-dialog.component.html
index a8e7dd1..b56ee63 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/cancel-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/cancel-dialog.component.html
@@ -4,10 +4,8 @@
       <h3 class="modal-title" *ngIf="recordType === 'po'" i18n>Confirm Order Cancellation</h3>
       <h3 class="modal-title" *ngIf="recordType === 'li'" i18n>Confirm Line Item Cancellation</h3>
       <h3 class="modal-title" *ngIf="recordType === 'lid'" i18n>Confirm Item Cancellation</h3>
-      <button type="button" class="close"
-        i18n-aria-label aria-label="Close" (click)="close()">
-        <span aria-hidden="true">&times;</span>
-      </button>
+      <button type="button" class="btn-close btn-close-white"
+        i18n-aria-label aria-label="Close" (click)="close()"></button>
     </div>
     <div class="modal-body">
       <h4 *ngIf="recordType === 'po'" i18n>Please select a cancel reason and click "Apply" to cancel the order,

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/claim-policy-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/claim-policy-dialog.component.html
index c295f32..52a08e7 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/claim-policy-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/claim-policy-dialog.component.html
@@ -2,10 +2,8 @@
   <form class="form-validated">
     <div class="modal-header bg-info">
       <h3 class="modal-title" i18n>Apply Claim Policy</h3>
-      <button type="button" class="close"
-        i18n-aria-label aria-label="Close" (click)="close()">
-        <span aria-hidden="true">&times;</span>
-      </button>
+      <button type="button" class="btn-close btn-close-white"
+        i18n-aria-label aria-label="Close" (click)="close()"></button>
     </div>
     <div class="modal-body">
       <h4 i18n>Line Item(s) selected:

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/delete-lineitems-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/delete-lineitems-dialog.component.html
index 6b7e645..dfc8779 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/delete-lineitems-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/delete-lineitems-dialog.component.html
@@ -2,10 +2,8 @@
   <form class="form-validated">
     <div class="modal-header bg-info">
       <h3 class="modal-title" i18n>Confirm Deletion of Line Items</h3>
-      <button type="button" class="close"
-        i18n-aria-label aria-label="Close" (click)="close()">
-        <span aria-hidden="true">&times;</span>
-      </button>
+      <button type="button" class="btn-close btn-close-white"
+        i18n-aria-label aria-label="Close" (click)="close()"></button>
     </div>
     <div class="modal-body">
       <h4 i18n>Line Item(s) selected:

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/export-attributes-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/export-attributes-dialog.component.html
index c45d199..6f74186 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/export-attributes-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/export-attributes-dialog.component.html
@@ -2,10 +2,8 @@
   <form class="form-validated">
     <div class="modal-header bg-info">
       <h3 class="modal-title" i18n>Export Single Attribute List for Selected Line Items</h3>
-      <button type="button" class="close"
-        i18n-aria-label aria-label="Close" (click)="close()">
-        <span aria-hidden="true">&times;</span>
-      </button>
+      <button type="button" class="btn-close btn-close-white"
+        i18n-aria-label aria-label="Close" (click)="close()"></button>
     </div>
     <div class="modal-body">
       <h4 i18n>Line Item(s) selected:

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/link-invoice-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/link-invoice-dialog.component.html
index 1f0c5ef..592a632 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/link-invoice-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/link-invoice-dialog.component.html
@@ -2,10 +2,8 @@
   <form class="form-validated">
     <div class="modal-header bg-info">
       <h3 class="modal-title" i18n>Link Invoice</h3>
-      <button type="button" class="close"
-        i18n-aria-label aria-label="Close" (click)="close()">
-        <span aria-hidden="true">&times;</span>
-      </button>
+      <button type="button" class="btn-close btn-close-white"
+        i18n-aria-label aria-label="Close" (click)="close()"></button>
     </div>
     <div class="modal-body">
       <h4 i18n *ngIf="liIds && liIds.length">Line Item(s) selected:

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/manage-claims-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/manage-claims-dialog.component.html
index 4b30bd5..4120d2f 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/manage-claims-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/manage-claims-dialog.component.html
@@ -2,10 +2,8 @@
   <form class="form-validated">
     <div class="modal-header bg-info">
       <h3 class="modal-title" i18n>Manage Claims</h3>
-      <button type="button" class="close"
-        i18n-aria-label aria-label="Close" (click)="close()">
-        <span aria-hidden="true">&times;</span>
-      </button>
+      <button type="button" class="btn-close btn-close-white"
+        i18n-aria-label aria-label="Close" (click)="close()"></button>
     </div>
     <div class="modal-body">
       <h4 i18n>Claims</h4>

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/po/disencumber-charge-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/po/disencumber-charge-dialog.component.html
index 03a6cc4..4320bbb 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/po/disencumber-charge-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/po/disencumber-charge-dialog.component.html
@@ -2,10 +2,8 @@
   <form class="form-validated">
     <div class="modal-header bg-info">
       <h3 class="modal-title" i18n>Disencumber Direct Charge</h3>
-      <button type="button" class="close"
-        i18n-aria-label aria-label="Close" (click)="close()">
-        <span aria-hidden="true">&times;</span>
-      </button>
+      <button type="button" class="btn-close btn-close-white"
+        i18n-aria-label aria-label="Close" (click)="close()"></button>
     </div>
     <div class="modal-body">
       <div class="d-flex">

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-clone-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-clone-dialog.component.html
index 662aaca..2377163 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-clone-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-clone-dialog.component.html
@@ -2,10 +2,8 @@
 <form class="form-validated">
   <div class="modal-header bg-info">
     <h3 class="modal-title" i18n>Clone Selection List: {{leadListName}}</h3>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <h4 i18n>Selection list name:</h4>

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-create-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-create-dialog.component.html
index 0f36ab7..61c3896 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-create-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-create-dialog.component.html
@@ -2,10 +2,8 @@
 <form class="form-validated">
   <div class="modal-header bg-info">
     <h3 class="modal-title" i18n>Create New Selection List</h3>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <h4 i18n>Selection list name:</h4>

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-delete-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-delete-dialog.component.html
index bd30a9d..ee47efc 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-delete-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-delete-dialog.component.html
@@ -1,10 +1,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h3 class="modal-title" i18n>Confirm Delete</h3>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <h4 i18n>Delete the following selection lists?</h4>

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-merge-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-merge-dialog.component.html
index 6cdf54e..9040f46 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-merge-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-merge-dialog.component.html
@@ -2,10 +2,8 @@
 <form class="form-validated">
   <div class="modal-header bg-info">
     <h3 class="modal-title" i18n>Merge Selection Lists</h3>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <h4 i18n>Lead Selection List:</h4>

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/currency/exchange-rates-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/currency/exchange-rates-dialog.component.html
index 1459072..680150c 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/currency/exchange-rates-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/currency/exchange-rates-dialog.component.html
@@ -5,10 +5,8 @@
   <div class="modal-header bg-info" *ngIf="doneLoading">
     <h3 *ngIf="canUpdate" class="modal-title" i18n>Manage Exchange Rates for {{currency.code()}}: {{currency.label()}}</h3>
     <h3 *ngIf="!canUpdate" class="modal-title" i18n>View Exchange Rates for {{currency.code()}}: {{currency.label()}}</h3>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body" [hidden]="!doneLoading">
     <h4 i18n>Exchange rates to other currencies: 1 {{currency?.label()}} is equal to:</h4>

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/distribution_formula/distribution-formula-edit-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/distribution_formula/distribution-formula-edit-dialog.component.html
index 78d3ac2..7c0330f 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/distribution_formula/distribution-formula-edit-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/distribution_formula/distribution-formula-edit-dialog.component.html
@@ -3,10 +3,8 @@
     <h3 *ngIf="mode === 'create'" class="modal-title" i18n>New Distribution Formula</h3>
     <h3 *ngIf="mode === 'update'" class="modal-title" i18n>Modify Distribution Formula</h3>
     <h3 *ngIf="mode === 'clone'" class="modal-title" i18n>Clone Distribution Formula (from {{clonedLabel}})</h3>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <form #myForm="ngForm" role="form" class="form-validated">

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/edi_attr_set/edi-attr-set-edit-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/edi_attr_set/edi-attr-set-edit-dialog.component.html
index f5cb3e9..629f828 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/edi_attr_set/edi-attr-set-edit-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/edi_attr_set/edi-attr-set-edit-dialog.component.html
@@ -3,10 +3,8 @@
     <h3 *ngIf="mode === 'create'" class="modal-title" i18n>New EDI Attribute Set</h3>
     <h3 *ngIf="mode === 'update'" class="modal-title" i18n>Modify EDI Attribute Set</h3>
     <h3 *ngIf="mode === 'clone'" class="modal-title" i18n>Clone EDI Attribute Set (from {{clonedLabel}})</h3>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <form #myForm="ngForm" role="form" class="form-validated">

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/edi_attr_set/edi-attr-set-providers-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/edi_attr_set/edi-attr-set-providers-dialog.component.html
index 6fe8524..832889a 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/edi_attr_set/edi-attr-set-providers-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/edi_attr_set/edi-attr-set-providers-dialog.component.html
@@ -1,10 +1,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h3 class="modal-title" i18n>Attribute Set {{attrSet?.label()}}: Providers</h3>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <eg-edi-attr-set-providers [attrSetId]="attrSetId"></eg-edi-attr-set-providers>

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.html
index 1a4d87e..434f461 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.html
@@ -14,10 +14,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h3 class="modal-title" i18n>Fund Details - {{fund?.name()}} ({{fund?.code()}} ({{fund?.year()}}) ({{fund?.org().shortname()}}))</h3>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <div class="row mt-3">

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-rollover-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-rollover-dialog.component.html
index eb98caf..e243a80 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-rollover-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-rollover-dialog.component.html
@@ -4,11 +4,9 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info" *ngIf="doneLoading">
     <h3 class="modal-title" i18n>Fund Propagation and Rollover</h3>
-    <button type="button" class="close"
+    <button type="button" class="btn-close btn-close-white"
       [disabled]="isProcessing"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body" [hidden]="!doneLoading">
     <form #rolloverForm="ngForm" role="form" class="form-validated">

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-transfer-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-transfer-dialog.component.html
index fda3976..f4b82c7 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-transfer-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-transfer-dialog.component.html
@@ -4,10 +4,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info" *ngIf="doneLoading">
     <h3 class="modal-title" i18n>Transfer from Fund {{sourceFund?.name()}} ({{sourceFund?.code()}} ({{sourceFund?.year()}}) ({{sourceFund?.org().shortname()}}))</h3>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body" [hidden]="!doneLoading">
     <form #xfrForm="ngForm" role="form" class="form-validated common-form striped-odd">

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/funding-source-transactions-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/funding-source-transactions-dialog.component.html
index 5e9e998..9d847fe 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/funding-source-transactions-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/funding-source-transactions-dialog.component.html
@@ -14,10 +14,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h3 class="modal-title" i18n>Funding Source: {{fundingSource?.name()}}</h3>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body" *ngIf="fundingSource">
     <ul ngbNav #fundingSourceTransactionsNav="ngbNav" [(activeId)]="activeTab" class="nav-tabs" [keyboard]="true" [roles]="false" role="tablist">

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html
index 195255c..ca2536b 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html
@@ -23,9 +23,7 @@
   <div class="modal-header bg-info" [ngClass]="isDialog() ? 'modal-header' : 'alert mt-3'">
     <h4 class="modal-title" i18n>Course Materials</h4>
     <ng-container *ngIf="isDialog()">
-      <button type="button" class="close" i18n-aria-label aria-label="Close" (click)="close()">
-        <span aria-hidden="true">&times;</span>
-      </button>
+      <button type="button" class="btn-close btn-close-white" i18n-aria-label aria-label="Close" (click)="close()">      </button>
     </ng-container>
   </div>
   <div [ngClass]="isDialog() ? 'modal-body' : ''">

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.html
index 92324aa..7571b14 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.html
@@ -13,10 +13,8 @@
   [ngClass]="isDialog() ? 'modal-header' : 'alert mt-3'">
   <h4 class="modal-title" i18n>Course Users</h4>
   <ng-container *ngIf="isDialog()">
-  <button type="button" class="close"
-    i18n-aria-label aria-label="Close" (click)="close()">
-    <span aria-hidden="true">&times;</span>
-  </button>
+  <button type="button" class="btn-close btn-close-white"
+    i18n-aria-label aria-label="Close" (click)="close()"></button>
   </ng-container>
 </div>
 <div [ngClass]="isDialog() ? 'modal-body' : ''">

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.html
index bfa2c0e..3493643 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.html
@@ -1,10 +1,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title" i18n>Edit Setting</h4>
-    <button type="button" class="close" 
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white" 
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <div class="row justify-content-center">

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-setting-history-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-setting-history-dialog.component.html
index eec119e..b3b54df 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-setting-history-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-setting-history-dialog.component.html
@@ -1,10 +1,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title" i18n>History</h4>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <div class="row">

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-setting-json-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-setting-json-dialog.component.html
index 2158174..44da6a5 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-setting-json-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-setting-json-dialog.component.html
@@ -2,10 +2,8 @@
   <div class="modal-header bg-info">
     <h4 class="modal-title" *ngIf="isExport" i18n>Export</h4>
     <h4 class="modal-title" *ngIf="!isExport" i18n>Import</h4>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <div class="row">

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/search-filter/query-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/search-filter/query-dialog.component.html
index 5e84926..69f6af8 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/search-filter/query-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/search-filter/query-dialog.component.html
@@ -2,11 +2,9 @@
   <form #queryEditForm="ngForm" role="form" class="form-validated common-form striped-odd">
     <div class="modal-header bg-info">
         <h4 class="modal-title" i18n>New Query</h4>
-        <button type="button" class="close"
+        <button type="button" class="btn-close btn-close-white"
             i18n-aria-label aria-label="Close"
-            (click)="closeAndReset()">
-            <span aria-hidden="true">&times;</span>
-        </button>
+            (click)="closeAndReset()"></button>
     </div>
     <div class="modal-body"> 
         <div class="row">

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/staff_portal_page/clone-portal-entries-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/staff_portal_page/clone-portal-entries-dialog.component.html
index 322c036..6975fbc 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/staff_portal_page/clone-portal-entries-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/staff_portal_page/clone-portal-entries-dialog.component.html
@@ -1,10 +1,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h3 class="modal-title" i18n>Clone a Library's Portal Page Entries</h3>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <form #cloneForm="ngForm" role="form" class="form-validated common-form striped-odd">

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-map-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-map-dialog.component.html
index 1c2422f..8893086 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-map-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-map-dialog.component.html
@@ -1,11 +1,9 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title" i18n>Add New Permission Group Mapping</h4>
-    <button type="button" class="close" 
+    <button type="button" class="btn-close btn-close-white" 
       i18n-aria-label aria-label="Close" 
-      (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+      (click)="close()"></button>
   </div>
   <div class="modal-body">
     <div class="row">

diff --git a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.html
index 4d8e2ec..5e736ce 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.html
@@ -3,11 +3,9 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h3 class="modal-title" i18n>Confirm Reservation Details</h3>
-    <button type="button" class="close"
+    <button type="button" class="btn-close btn-close-white"
       i18n-aria-label aria-label="Close"
-      (click)="dismiss('cross_click')">
-      <span aria-hidden="true">&times;</span>
-    </button>
+      (click)="dismiss('cross_click')"></button>
   </div>
   <form class="modal-body form-common" [formGroup]="create">
     <div class="form-group row">

diff --git a/Open-ILS/src/eg2/src/app/staff/booking/no-timezone-set.component.html b/Open-ILS/src/eg2/src/app/staff/booking/no-timezone-set.component.html
index 9d8e646..614d766 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/booking/no-timezone-set.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/no-timezone-set.component.html
@@ -1,11 +1,9 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title" i18n>Timezone not set for your library</h4>
-    <button type="button" class="close"
+    <button type="button" class="btn-close btn-close-white"
       i18n-aria-label aria-label="Close"
-      (click)="dismiss('cross_click')">
-      <span aria-hidden="true">&times;</span>
-    </button>
+      (click)="dismiss('cross_click')"></button>
   </div>
   <div class="modal-body" i18n><p>Please make sure that <i>lib.timezone</i> has a valid value in the Library Settings Editor.</p></div>
   <div class="modal-footer">

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/authority/merge-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/cat/authority/merge-dialog.component.html
index cccf2ee..d0cb551 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/cat/authority/merge-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/authority/merge-dialog.component.html
@@ -9,10 +9,8 @@
     <h4 class="modal-title">
       <span i18n>Merge Authority Records</span>
     </h4>
-    <button type="button" class="close" 
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white" 
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <div class="row d-flex justify-content-center">

diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/add-to-carousel-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/record/add-to-carousel-dialog.component.html
index 4f9c920..42b0421 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/catalog/record/add-to-carousel-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/add-to-carousel-dialog.component.html
@@ -6,10 +6,8 @@
     <h4 class="modal-title">
       <span i18n>Add to Carousel</span>
     </h4>
-    <button type="button" class="close"
-    i18n-aria-label aria-label="Close" (click)="close(false)">
-    <span aria-hidden="true">&times;</span>
-  </button>
+    <button type="button" class="btn-close btn-close-white"
+    i18n-aria-label aria-label="Close" (click)="close(false)"></button>
 </div>
 <div class="modal-body">
   <div *ngIf="!carousels.length">

diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/part-merge-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/record/part-merge-dialog.component.html
index 0beeefc..db75789 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/catalog/record/part-merge-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/part-merge-dialog.component.html
@@ -1,10 +1,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title" i18n>Merge Monograph Parts</h4>
-    <button type="button" class="close" 
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white" 
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <h5 i18n>Select a Lead Part</h5>

diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/upload-jacket-image-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/record/upload-jacket-image-dialog.component.html
index 1c7612d..cd48d21 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/catalog/record/upload-jacket-image-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/upload-jacket-image-dialog.component.html
@@ -3,10 +3,8 @@
     <h4 class="modal-title">
       <span i18n>Upload Cover Image</span>
     </h4>
-    <button type="button" class="close"
-    i18n-aria-label aria-label="Close" (click)="clearErrors(); close(false)">
-    <span aria-hidden="true">&times;</span>
-  </button>
+    <button type="button" class="btn-close btn-close-white"
+    i18n-aria-label aria-label="Close" (click)="clearErrors(); close(false)"></button>
 </div>
 <div class="modal-body">
     <!--<form method="POST" enctype="multipart/form-data" action="/jacket-upload">

diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/search-templates.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/search-templates.component.html
index 21f6123..22fad6c 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/catalog/search-templates.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/search-templates.component.html
@@ -75,10 +75,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title" i18n>Save Template</h4>
-    <button type="button" class="close" 
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white" 
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <div class="row">

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/barcodes.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/barcodes.component.html
index 70eb6de..848f032 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/barcodes.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/barcodes.component.html
@@ -4,10 +4,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title" i18n>Patron Barcodes</h4>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <div class="row">

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/hold-notify-update.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/hold-notify-update.component.html
index e337889..748b39d 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/hold-notify-update.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/hold-notify-update.component.html
@@ -1,10 +1,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title" i18n>Update Hold Notification Info?</h4>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <div class="row mt-2" *ngFor="let mod of mods">

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/secondary-groups.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/secondary-groups.component.html
index f13447a..1d02987 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/secondary-groups.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/secondary-groups.component.html
@@ -4,10 +4,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title" i18n>Secondary Permission Groups</h4>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <h5 i18n>

diff --git a/Open-ILS/src/eg2/src/app/staff/share/barcodes/barcode-select.component.html b/Open-ILS/src/eg2/src/app/staff/share/barcodes/barcode-select.component.html
index 4397674..8d10f39 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/barcodes/barcode-select.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/barcodes/barcode-select.component.html
@@ -4,10 +4,8 @@
     <h4 class="modal-title">
       <span i18n>Select Barcode</span>
     </h4>
-    <button type="button" class="close" 
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white" 
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <div class="alert alert-primary m-1 mb-3" i18n>Select the desired barcode.</div>

diff --git a/Open-ILS/src/eg2/src/app/staff/share/billing/billing-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/billing/billing-dialog.component.html
index 34c485a..5b20ae8 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/billing/billing-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/billing/billing-dialog.component.html
@@ -15,10 +15,8 @@
         {{patron.first_given_name()}} : 
         {{patron.card().barcode()}}
     </h4>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
 

diff --git a/Open-ILS/src/eg2/src/app/staff/share/billing/credit-card-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/billing/credit-card-dialog.component.html
index 583d032..28f3bb4 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/billing/credit-card-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/billing/credit-card-dialog.component.html
@@ -1,10 +1,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title" i18n>Credit Card Information</h4>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body" *ngIf="args">
 

diff --git a/Open-ILS/src/eg2/src/app/staff/share/booking/make-bookable-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/booking/make-bookable-dialog.component.html
index aa77935..e5c992e 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/booking/make-bookable-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/booking/make-bookable-dialog.component.html
@@ -10,10 +10,8 @@
       <h4 class="modal-title">
         <span i18n>Make Items Bookable</span>
       </h4>
-      <button type="button" class="close" 
-        i18n-aria-label aria-label="Close" (click)="close()">
-        <span aria-hidden="true">&times;</span>
-      </button>
+      <button type="button" class="btn-close btn-close-white" 
+        i18n-aria-label aria-label="Close" (click)="close()"></button>
     </div>
     <div class="modal-body">
       <div class="row" *ngIf="!updateComplete">

diff --git a/Open-ILS/src/eg2/src/app/staff/share/buckets/bucket-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/buckets/bucket-dialog.component.html
index d55eaba..8eb0db7 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/buckets/bucket-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/buckets/bucket-dialog.component.html
@@ -12,10 +12,8 @@
       </ng-container>
       <span *ngIf="fromBibQueue" i18n>Add Records from queue #{{fromBibQueue}} to Bucket</span>
     </h4>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <ul ngbNav #bucketDialogTabs="ngbNav" class="nav-tabs" [keyboard]="true" [roles]="false" role="tablist">

diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/backdate-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/circ/backdate-dialog.component.html
index d4dc7e3..0cef39d 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/circ/backdate-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/circ/backdate-dialog.component.html
@@ -8,10 +8,8 @@
       <span i18n>Backdate Already Checked-In Circulations
       </span>
     </h4>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <h5 i18n>Backdating {{circIds.length}} circulaion(s)</h5>

diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/bad-barcode-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/circ/bad-barcode-dialog.component.html
index 4e8e36c..08df05a 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/circ/bad-barcode-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/circ/bad-barcode-dialog.component.html
@@ -1,10 +1,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 i18n>Bad Barcode</h4>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <img src="/images/bad_barcode.png" alt="" />

diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/cancel-transit-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/circ/cancel-transit-dialog.component.html
index 7519b5c..478c268 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/circ/cancel-transit-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/circ/cancel-transit-dialog.component.html
@@ -6,10 +6,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 i18n>Cancel Transits</h4>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <strong i18n>Cancel {{numTransits}} transits?</strong>

diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/claims-returned-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/circ/claims-returned-dialog.component.html
index c8719f6..cf473e8 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/circ/claims-returned-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/circ/claims-returned-dialog.component.html
@@ -7,10 +7,8 @@
     <h4 class="modal-title">
       <span i18n>Mark Claims Returned</span>
     </h4>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <h5 i18n>Marking Claims Returned for {{barcodes.length}} Item(s)</h5>

diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/due-date-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/circ/due-date-dialog.component.html
index 04b8709..be7f4ee 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/circ/due-date-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/circ/due-date-dialog.component.html
@@ -6,10 +6,8 @@
     <h4 class="modal-title">
       <span i18n>Modify Due Date</span>
     </h4>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <h5 i18n>Modifying Due Date For {{circs.length}} Circulation(s)</h5>

diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/events-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/circ/events-dialog.component.html
index 00173a7..fecb7be 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/circ/events-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/circ/events-dialog.component.html
@@ -8,10 +8,8 @@
     <h4 class="modal-title">
       <span i18n>Action Blocked</span>
     </h4>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <h5 i18n>Exceptions occurred during {{modeLabel}}.</h5>

diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/in-transit-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/circ/in-transit-dialog.component.html
index 5af1141..49eb97b 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/circ/in-transit-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/circ/in-transit-dialog.component.html
@@ -1,10 +1,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 i18n>Item In Transit</h4>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <strong i18n>There is an open transit on item {{checkout.copy.barcode()}}</strong>

diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/open-circ-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/circ/open-circ-dialog.component.html
index 258a4cb..4391cd3 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/circ/open-circ-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/circ/open-circ-dialog.component.html
@@ -3,10 +3,8 @@
     <h4 class="modal-title">
       <span i18n>Open Circulation</span>
     </h4>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <h5 class="fw-bold" i18n>

diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/precat-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/circ/precat-dialog.component.html
index 5d1182c..40a1c49 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/circ/precat-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/circ/precat-dialog.component.html
@@ -1,10 +1,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 i18n>Barcode "{{barcode}}" was mis-scanned or is a non-cataloged item.</h4>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
 

diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/route-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/circ/route-dialog.component.html
index 22f3a65..ccf062e 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/circ/route-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/circ/route-dialog.component.html
@@ -139,10 +139,8 @@
         <img class="p-2" src="/images/transit.png" i18n-alt alt="transit van icon"/>
       </ng-container>
     </h4>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <ng-container *ngIf="slip === 'hold_shelf_slip'">

diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/conjoined-items-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holdings/conjoined-items-dialog.component.html
index bb6cc4d..7133f7b 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/conjoined-items-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/conjoined-items-dialog.component.html
@@ -10,10 +10,8 @@
       <h4 class="modal-title">
         <span i18n>Attach/Modify {{copyIds.length}} Conjoined Item(s)</span>
       </h4>
-      <button type="button" class="close" 
-        i18n-aria-label aria-label="Close" (click)="close()">
-        <span aria-hidden="true">&times;</span>
-      </button>
+      <button type="button" class="btn-close btn-close-white" 
+        i18n-aria-label aria-label="Close" (click)="close()"></button>
     </div>
     <div class="modal-body">
       <div class="row form-validated">

diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alert-manager.component.html b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alert-manager.component.html
index 990dca3..2f0df0f 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alert-manager.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alert-manager.component.html
@@ -55,10 +55,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title" i18n>Item Alerts</h4>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
 

diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.html
index b351d0d..939a3aa 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.html
@@ -12,10 +12,8 @@
       </ng-container>
       <span i18n></span>
     </h4>
-    <button type="button" class="close" 
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white" 
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body p-4 form-validated">
     <div class="row mt-2 p-2 rounded border border-success">

diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-notes-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-notes-dialog.component.html
index 34f545f..d359c0a 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-notes-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-notes-dialog.component.html
@@ -12,10 +12,8 @@
       </ng-container>
       <span i18n></span>
     </h4>
-    <button type="button" class="close" 
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white" 
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body p-4 form-validated">
 

diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-tags-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-tags-dialog.component.html
index 7b42aee..d78866f 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-tags-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-tags-dialog.component.html
@@ -12,10 +12,8 @@
       </ng-container>
       <span i18n></span>
     </h4>
-    <button type="button" class="close" 
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white" 
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body p-4 form-validated">
 

diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/delete-volcopy-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holdings/delete-volcopy-dialog.component.html
index a56a19e..27e3dbd 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/delete-volcopy-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/delete-volcopy-dialog.component.html
@@ -14,10 +14,8 @@
     <h4 class="modal-title">
       <span i18n>Delete Holdings</span>
     </h4>
-    <button type="button" class="close" 
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white" 
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <p i18n>Delete {{numCallNums}} call numbers and {{numCopies}} copies?</p>

diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-damaged-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-damaged-dialog.component.html
index 3d3527c..dc00f9c 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-damaged-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-damaged-dialog.component.html
@@ -6,10 +6,8 @@
     <h4 class="modal-title">
       <span i18n>Mark Item Damaged</span>
     </h4>
-    <button type="button" class="close" 
-      i18n-aria-label aria-label="Close" (click)="close(false)">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white" 
+      i18n-aria-label aria-label="Close" (click)="close(false)"> </button>
   </div>
   <div class="modal-body">
     <div class="row">

diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-discard-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-discard-dialog.component.html
index b93dfeb..d1c1b4d 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-discard-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-discard-dialog.component.html
@@ -10,10 +10,8 @@
       <h4 class="modal-title">
         <span i18n>Mark Item Discard</span>
       </h4>
-      <button type="button" class="close" 
-        i18n-aria-label aria-label="Close" (click)="close()">
-        <span aria-hidden="true">&times;</span>
-      </button>
+      <button type="button" class="btn-close btn-close-white" 
+        i18n-aria-label aria-label="Close" (click)="close()"></button>
     </div>
     <div class="modal-body">
       <div class="row d-flex justify-content-center">

diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-missing-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-missing-dialog.component.html
index ea6b7d7..5b3e49c 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-missing-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-missing-dialog.component.html
@@ -10,10 +10,8 @@
       <h4 class="modal-title">
         <span i18n>Mark Item Missing</span>
       </h4>
-      <button type="button" class="close" 
-        i18n-aria-label aria-label="Close" (click)="close()">
-        <span aria-hidden="true">&times;</span>
-      </button>
+      <button type="button" class="btn-close btn-close-white" 
+        i18n-aria-label aria-label="Close" (click)="close()"></button>
     </div>
     <div class="modal-body">
       <div class="row d-flex justify-content-center">

diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/replace-barcode-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holdings/replace-barcode-dialog.component.html
index 7d2b051..b0aa180 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/replace-barcode-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/replace-barcode-dialog.component.html
@@ -10,10 +10,8 @@
       <h4 class="modal-title">
         <span i18n>Replace Item Barcode</span>
       </h4>
-      <button type="button" class="close" 
-        i18n-aria-label aria-label="Close" (click)="close()">
-        <span aria-hidden="true">&times;</span>
-      </button>
+      <button type="button" class="btn-close btn-close-white" 
+        i18n-aria-label aria-label="Close" (click)="close()"></button>
     </div>
     <div class="modal-body">
       <div class="row">

diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/cancel-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holds/cancel-dialog.component.html
index d100760..49ad6d2 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/holds/cancel-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holds/cancel-dialog.component.html
@@ -8,10 +8,8 @@
       <h4 class="modal-title">
         <span i18n>Cancel Hold</span>
       </h4>
-      <button type="button" class="close"
-        i18n-aria-label aria-label="Close" (click)="close()">
-        <span aria-hidden="true">&times;</span>
-      </button>
+      <button type="button" class="btn-close btn-close-white"
+        i18n-aria-label aria-label="Close" (click)="close()"></button>
     </div>
     <div class="modal-body">
       <div class="row d-flex justify-content-center">

diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/manage-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holds/manage-dialog.component.html
index 656429c..12e64b0 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/holds/manage-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holds/manage-dialog.component.html
@@ -6,10 +6,8 @@
       <ng-container *ngIf="holdIds.length > 1">
         <h4 class="modal-title">Batch Modify {{holdIds.length}} Holds</h4>
       </ng-container>
-      <button type="button" class="close"
-        i18n-aria-label aria-label="Close" (click)="close()">
-        <span aria-hidden="true">&times;</span>
-      </button>
+      <button type="button" class="btn-close btn-close-white"
+        i18n-aria-label aria-label="Close" (click)="close()"> </button>
     </div>
     <div class="modal-body">
       <eg-hold-manage [holdIds]="holdIds" (onComplete)="onComplete($event)">

diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/note-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holds/note-dialog.component.html
index c3aa59b..5e915ec 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/holds/note-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holds/note-dialog.component.html
@@ -1,10 +1,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title">Add Hold Note for Hold #{{holdId}}</h4>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body form-validated">
     <div class="form-group form-check">

diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/notify-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holds/notify-dialog.component.html
index 4b3a370..d28a25c 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/holds/notify-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holds/notify-dialog.component.html
@@ -1,10 +1,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title">Create Record of Hold Notification</h4>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body form-validated">
     <div class="form-group">

diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/retarget-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holds/retarget-dialog.component.html
index 76cd9f7..ea3e7e2 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/holds/retarget-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holds/retarget-dialog.component.html
@@ -8,10 +8,8 @@
       <h4 class="modal-title">
         <span i18n>Retarget Hold</span>
       </h4>
-      <button type="button" class="close"
-        i18n-aria-label aria-label="Close" (click)="close()">
-        <span aria-hidden="true">&times;</span>
-      </button>
+      <button type="button" class="btn-close btn-close-white"
+        i18n-aria-label aria-label="Close" (click)="close()"></button>
     </div>
     <div class="modal-body">
       <div class="row d-flex justify-content-center">

diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/transfer-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holds/transfer-dialog.component.html
index 9046836..3401922 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/holds/transfer-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holds/transfer-dialog.component.html
@@ -10,10 +10,8 @@
       <h4 class="modal-title">
         <span i18n>Transfer Hold(s) To Marked Target</span>
       </h4>
-      <button type="button" class="close"
-        i18n-aria-label aria-label="Close" (click)="close()">
-        <span aria-hidden="true">&times;</span>
-      </button>
+      <button type="button" class="btn-close btn-close-white"
+        i18n-aria-label aria-label="Close" (click)="close()"></button>
     </div>
     <div class="modal-body">
       <div class="row d-flex justify-content-center">

diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/authority-linking-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/authority-linking-dialog.component.html
index c30b2c5..1448ce6 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/authority-linking-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/authority-linking-dialog.component.html
@@ -32,10 +32,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title" i18n>Manage Authority Links</h4>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <div class="row border-bottom border-secondary p-2 d-flex">

diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-dialog.component.html
index 1fc6efa..7835680 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-dialog.component.html
@@ -2,10 +2,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title" i18n>MARC Editor</h4>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <eg-marc-editor #marcEditor (recordSaved)="handleRecordSaved($event)" 

diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/phys-char-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/phys-char-dialog.component.html
index 161388a..9cd50bc 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/phys-char-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/phys-char-dialog.component.html
@@ -2,10 +2,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title" i18n>Physical Characteristics Wizard</h4>
-    <button type="button" class="close"
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white"
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
 

diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html
index 377acf4..871bcf7 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html
@@ -64,7 +64,7 @@
 </ng-template>
 
 <ng-container *ngIf="dataLoaded">
-  <div class="mt-3 text-monospace"
+  <div class="mt-3 font-monospace"
     (contextmenu)="$event.preventDefault()">
     <div class="row pb-2 mb-2 border-bottom border-muted">
       <div class="col-lg-9 fixed-fields-container">

diff --git a/Open-ILS/src/eg2/src/app/staff/share/op-change/op-change.component.html b/Open-ILS/src/eg2/src/app/staff/share/op-change/op-change.component.html
index e1aa01d..6dcbe31 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/op-change/op-change.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/op-change/op-change.component.html
@@ -1,10 +1,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title" i18n>Change Operator</h4>
-    <button type="button" class="close" 
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white" 
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
 

diff --git a/Open-ILS/src/eg2/src/app/staff/share/patron/merge-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/patron/merge-dialog.component.html
index a569563..1adc07d 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/patron/merge-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/patron/merge-dialog.component.html
@@ -1,10 +1,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title"><span i18n>Merge Patrons</span></h4>
-    <button type="button" class="close" 
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white" 
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <div class="row" *ngIf="loading">

diff --git a/Open-ILS/src/eg2/src/app/staff/share/patron/penalty-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/patron/penalty-dialog.component.html
index 56b2a42..bdbb348 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/patron/penalty-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/patron/penalty-dialog.component.html
@@ -6,10 +6,8 @@
     <h4 class="modal-title">
       <span i18n>Apply Standing Penalty / Message</span>
     </h4>
-    <button type="button" class="close" 
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white" 
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <div class="row d-flex p-3" *ngIf="dataLoaded">

diff --git a/Open-ILS/src/eg2/src/app/staff/share/patron/search-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/patron/search-dialog.component.html
index 1006a63..931ba61 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/patron/search-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/patron/search-dialog.component.html
@@ -1,10 +1,8 @@
 <ng-template #dialogContent>
   <div class="modal-header bg-info">
     <h4 class="modal-title"><span i18n>Patron Search</span></h4>
-    <button type="button" class="close" 
-      i18n-aria-label aria-label="Close" (click)="close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <button type="button" class="btn-close btn-close-white" 
+      i18n-aria-label aria-label="Close" (click)="close()"></button>
   </div>
   <div class="modal-body">
     <eg-patron-search #searchForm (patronsSelected)="patronsSelected($event)">