Merge branch...

Merge branch '227865-positioning-of-mr-and-issue-counter-on-epic-trees-and-board-headers' into 'master'

Fix positioning of mr and issue counter on epic trees and board headers

Closes #227865

See merge request gitlab-org/gitlab!36621

app/assets/javascripts/boards/components/board_list_header.vue

@@ -281,7 +281,7 @@ export default {
       </board-delete>
       <div
         v-if="showBoardListAndBoardInfo"
-        class="issue-count-badge gl-pr-0 no-drag text-secondary"
+        class="issue-count-badge gl-display-inline-flex gl-pr-0 no-drag text-secondary"
         :class="{ 'gl-display-none': !list.isExpanded && isSwimlanesHeader }"
       >
         <span class="gl-display-inline-flex">

changelogs/unreleased/227865-positioning-of-mr-and-issue-counter-on-epic-trees-and-board-header.yml

+---
+title: Fix positioning of mr/issue count
+merge_request: 36621
+author:
+type: fixed

ee/app/assets/javascripts/related_items_tree/components/related_items_tree_header.vue

@@ -90,7 +90,10 @@ export default {
           </span>
         </p>
       </gl-tooltip>
-      <div ref="countBadge" class="issue-count-badge text-secondary p-0 pr-3">
+      <div
+        ref="countBadge"
+        class="issue-count-badge gl-display-inline-flex text-secondary p-0 pr-3"
+      >
         <span v-if="allowSubEpics" class="d-inline-flex align-items-center">
           <gl-icon name="epic" class="mr-1" />
           {{ totalEpicsCount }}

ee/app/assets/javascripts/related_items_tree/components/tree_item_body.vue

@@ -219,7 +219,7 @@ export default {
             <div
               v-if="isEpic"
               ref="countBadge"
-              class="issue-count-badge text-secondary py-0 p-lg-0"
+              class="issue-count-badge gl-display-inline-flex text-secondary py-0 p-lg-0"
             >
               <span v-if="allowSubEpics" class="d-inline-flex align-items-center mr-2">
                 <gl-icon name="epic" class="mr-1" />