diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-28 15:09:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-28 15:09:06 +0300 |
commit | 77031895573384d40d631ac215ff2a99a4740094 (patch) | |
tree | 0aea73aaa1acf377a95beca7c5061264b204f33e /app/assets/javascripts/sidebar | |
parent | 4a372de7753b16d254dc319a6bad08ecac0273af (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/sidebar')
-rw-r--r-- | app/assets/javascripts/sidebar/components/assignees/collapsed_assignee_list.vue | 6 | ||||
-rw-r--r-- | app/assets/javascripts/sidebar/components/reviewers/collapsed_reviewer_list.vue | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/app/assets/javascripts/sidebar/components/assignees/collapsed_assignee_list.vue b/app/assets/javascripts/sidebar/components/assignees/collapsed_assignee_list.vue index 856687c00ae..50b1955abcc 100644 --- a/app/assets/javascripts/sidebar/components/assignees/collapsed_assignee_list.vue +++ b/app/assets/javascripts/sidebar/components/assignees/collapsed_assignee_list.vue @@ -124,7 +124,11 @@ export default { :issuable-type="issuableType" /> <button v-if="hasMoreThanTwoAssignees" class="btn-link" type="button"> - <span class="avatar-counter sidebar-avatar-counter"> {{ sidebarAvatarCounter }} </span> + <span + class="avatar-counter sidebar-avatar-counter gl-display-flex gl-align-items-center gl-pl-3" + > + {{ sidebarAvatarCounter }} + </span> <gl-icon v-if="isMergeRequest && !allAssigneesCanMerge" name="warning-solid" diff --git a/app/assets/javascripts/sidebar/components/reviewers/collapsed_reviewer_list.vue b/app/assets/javascripts/sidebar/components/reviewers/collapsed_reviewer_list.vue index 60d8fb4d408..e09b5d913f7 100644 --- a/app/assets/javascripts/sidebar/components/reviewers/collapsed_reviewer_list.vue +++ b/app/assets/javascripts/sidebar/components/reviewers/collapsed_reviewer_list.vue @@ -96,7 +96,11 @@ export default { <gl-icon v-if="hasNoUsers" name="user" :aria-label="__('None')" /> <collapsed-reviewer v-for="user in collapsedUsers" :key="user.id" :user="user" /> <button v-if="hasMoreThanTwoReviewers" class="btn-link" type="button"> - <span class="avatar-counter sidebar-avatar-counter"> {{ sidebarAvatarCounter }} </span> + <span + class="avatar-counter sidebar-avatar-counter gl-display-flex gl-align-items-center gl-pl-3" + > + {{ sidebarAvatarCounter }} + </span> <gl-icon v-if="!allReviewersCanMerge" name="warning-solid" |