Fixed trashcan icon (#950)

uhawaii-system-its-ti-iam · Jul 5, 2024 · e986e01 · e986e01
1 parent a219428
commit e986e01
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/src/main/resources/templates/fragments/exclude.html b/src/main/resources/templates/fragments/exclude.html
@@ -78,25 +78,22 @@ <h1 class="font-weight-bold text-dark pt-2 mb-0 d-inline-block">Exclude
                                ng-click="toggleSingleCheckbox('Exclude', member, $event.keyCode)">
                     </td>
                     <td class="overflow-auto py-1 px-3">
-                        <div class="d-flex">
                             {{member.name}}
-                            <div ng-if="member.uid == member.uhUuid">
+                            <span ng-if="member.uid == member.uhUuid">
                                 <i class="d-inline rounded-circle blue-bg text-light fa fa-school fa-xs p-1 ml-1"
                                    role="button"
                                    aria-hidden="true"
                                    tooltip data-placement="right"
                                    th:title="#{screen.message.common.tooltip.isDepartmentalAccount}">
                                 </i>
-                            </div>
-
+                            </span>
                             <span class="far fa-trash-alt fa-pull-right pt-1" role="button"
                                   tooltip data-placement="top"
                                   tabindex="0" aria-label="Remove {{member.name}} from the Exclude list"
                                   th:title="#{screen.message.common.tooltip.remove.exclude}"
                                   ng-keypress="$event.keyCode === 13 ? removeMemberWithTrashcan('Exclude', currentPageExclude, $index) : null"
                                   ng-click="removeMemberWithTrashcan('Exclude', currentPageExclude, $index)">
-                    </span>
-                        </div>
+                            </span>
                     </td>
                     <td class="overflow-auto py-1 px-3">{{member.uhUuid}}</td>
                     <td class="overflow-auto py-1 px-3">

diff --git a/src/main/resources/templates/fragments/include.html b/src/main/resources/templates/fragments/include.html
@@ -78,24 +78,22 @@ <h1 class="font-weight-bold text-dark pt-2 mb-0 d-inline-block">Include
                                ng-click="toggleSingleCheckbox('Include', member, $event.keyCode)">
                     </td>
                     <td class="overflow-auto py-1 px-3">
-                        <div class="d-flex">
                             {{member.name}}
-                            <div ng-if="member.uid == member.uhUuid">
+                            <span ng-if="member.uid == member.uhUuid">
                                 <i class="d-inline rounded-circle blue-bg text-light fa fa-school fa-xs p-1 ml-1"
                                    role="button"
                                    aria-hidden="true"
                                    tooltip data-placement="right"
                                    th:title="#{screen.message.common.tooltip.isDepartmentalAccount}">
                                 </i>
-                            </div>
+                            </span>
                             <span class="far fa-trash-alt fa-pull-right clickable pt-1" role="button"
                                   tooltip data-placement="top"
                                   tabindex="0" aria-label="Remove {{member.name}} from the Include list"
                                   th:title="#{screen.message.common.tooltip.remove.include}"
                                   ng-keypress="$event.keyCode === 13 ? removeMemberWithTrashcan('Include', currentPageInclude, $index) : null"
                                   ng-click="removeMemberWithTrashcan('Include', currentPageInclude, $index)">
-                        </span>
-                        </div>
+                            </span>
                     </td>
                     <td class="overflow-auto py-1 px-3">{{member.uhUuid}}</td>
                     <td class="overflow-auto py-1 px-3">

diff --git a/src/main/resources/templates/fragments/owners.html b/src/main/resources/templates/fragments/owners.html
@@ -39,16 +39,15 @@ <h1 class="font-weight-bold text-dark pt-2 mb-0 d-inline-block">Owners ({{groupi
                 <tbody>
                 <tr ng-repeat="owner in pagedItemsOwners[currentPageOwners]" class="table table-sm">
                     <td class="overflow-auto py-1 px-3" aria-label="{{owner.name}}">
-                        <div class="d-flex">
                             {{owner.name}}
-                            <div ng-if="owner.uid == owner.uhUuid">
+                            <span ng-if="owner.uid == owner.uhUuid">
                                 <i class="d-inline rounded-circle blue-bg text-light fa fa-school fa-xs p-1 ml-1"
                                    role="button"
                                    aria-hidden="true"
                                    tooltip data-placement="right"
                                    th:title="#{screen.message.common.tooltip.isDepartmentalAccount}">
                                 </i>
-                            </div>
+                            </span>
                             <span ng-if="groupingOwners.length > 1">
                                 <span class="far fa-trash-alt fa-pull-right pt-1" role="button"
                                       tooltip data-placement="top"
@@ -65,7 +64,6 @@ <h1 class="font-weight-bold text-dark pt-2 mb-0 d-inline-block">Owners ({{groupi
                                       th:title="#{screen.message.common.tooltip.remove.warning}">
                                 </span>
                             </span>
-                        </div>
                     </td>
                     <td class="overflow-auto py-1 px-3">
                         {{owner.uid}}