This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, main has been updated via 9d15c6cfed1557cf637309b0c8b6c3c7b5aff6d7 (commit) via 7f2a24cde4dbb7bd0ae2e21f4595d936fa0088ac (commit) from 806866646fff176b1bec3487aa3668c2d8cadbba (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9d15c6cfed1557cf637309b0c8b6c3c7b5aff6d7 Author: Stephanie Leary <stephanie.leary@equinoxoli.org> Date: Mon Apr 7 22:47:05 2025 +0000 LP#2105906 Follow-up: CSS class cleanup Cleans up some extraneous CSS classes that created extra borders around form elements. Signed-off-by: Stephanie Leary <stephanie.leary@equinoxoli.org> diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/linked-circ-limit-sets.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/linked-circ-limit-sets.component.html index 0714e10d04..842c72f00e 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/linked-circ-limit-sets.component.html +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/linked-circ-limit-sets.component.html @@ -1,6 +1,6 @@ <div *ngIf="showLinkLimitSets"> - <div class="modal-header bg-info"><h4 class="modal-title" i18n>Linked Limit Sets</h4></div> + <div class="modal-header"><h2 class="modal-title" i18n>Linked Limit Sets</h2></div> <ng-container *ngIf="getObjectKeys().length > 0"> <ng-container *ngFor="let key of getObjectKeys(); let i = index"> <div *ngIf="!linkedSetList[i].isDeleted" class="col-lg-15 d-flex justify-content-center"> @@ -36,7 +36,7 @@ <div *ngIf="linkedSetList[i].created" class="col-lg-2 mt-3 mb-3 form-group form-check"> <button type="button" - class="btn btn-warning" + class="btn btn-destroy" ng-disabled="!linkedSet" (click)="removeLinkedSet(i)" i18n-title title="Remove" i18n>Remove @@ -46,13 +46,8 @@ </ng-container> </ng-container> <div class="form-group mt-3"> - <label for="limit-set-name" class="col-form-label" i18n>Circ Limit Set Name</label> - (<a target="_blank" href="/eg2/staff/admin/local/config/circ_limit_set" class="btn btn-link" i18n>Admin</a>) - <eg-help-popover - i18n-helpText - helpText="Use the Admin link or Local Admin -> Circulation Limit Sets to Create a Link Limit Set" - ></eg-help-popover> - <div class="input-group"> + <div class="hstack px-3 pt-2 gap-2"> + <label for="limit-set-name" class="col-form-label fw-bold" i18n>Circ Limit Set Name</label> <eg-combobox #combobox name="linkedLimitName" @@ -61,10 +56,9 @@ idlField="name" asyncSupportsEmptyTermClick="true" (onChange)="onChange($event)" - class="form-control" + class="flex-fill" > </eg-combobox> - <div class="input-group-append"> <button type="button" class="btn btn-info" @@ -72,10 +66,12 @@ i18n-title title="Add" i18n - > - Add + >Add </button> </div> - </div> + <p class="form-text w-100" i18n> + Use <a target="_blank" href="/eg2/staff/admin/local/config/circ_limit_set">Local Admin + → Circulation Limit Sets</a> to create a link limit set + </p> </div> </div> commit 7f2a24cde4dbb7bd0ae2e21f4595d936fa0088ac Author: Stephanie Leary <stephanie.leary@equinoxoli.org> Date: Mon Apr 7 22:47:01 2025 +0000 LP#2105906 Input Group Button Background Contrast When editing a circulation policy, the "Add" button for circ limit sets has insufficient contrast. This restricts gray backgrounds on input groups to the .btn class and .btn-outline classes to avoid contrast issues with other variants such as .btn-info. Signed-off-by: Dan Briem <dbriem@harrisonpl.org> Signed-off-by: Stephanie Leary <stephanie.leary@equinoxoli.org> diff --git a/Open-ILS/src/eg2/src/styles.css b/Open-ILS/src/eg2/src/styles.css index 7f04caf7e1..c9b071b9c8 100644 --- a/Open-ILS/src/eg2/src/styles.css +++ b/Open-ILS/src/eg2/src/styles.css @@ -591,7 +591,8 @@ button.input-group-text.text-danger { color: var(--bs-btn-color); } -.input-group .btn { +.input-group .btn:not([class*="btn-"]), +.input-group .btn[class*="btn-outline-"] { background-color: var(--btn-gray-bg); } ----------------------------------------------------------------------- Summary of changes: .../linked-circ-limit-sets.component.html | 24 +++++++++------------- Open-ILS/src/eg2/src/styles.css | 3 ++- 2 files changed, 12 insertions(+), 15 deletions(-) hooks/post-receive -- Evergreen ILS