diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-01 06:13:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-01 06:13:24 +0300 |
| commit | e5f18589063c991e0fb20fb1566060cddb72f649 (patch) | |
| tree | 85b0eeaf5934c21d2a007cb4e5cdbfdbe1faea02 /app/assets/javascripts/notes | |
| parent | 0dc67904c1b8b01e7406fc510cf432c5bfc919fb (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
| -rw-r--r-- | app/assets/javascripts/notes/components/discussion_counter.vue | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/components/discussion_counter.vue b/app/assets/javascripts/notes/components/discussion_counter.vue index c15320cdfb8..d08f5e91cc5 100644 --- a/app/assets/javascripts/notes/components/discussion_counter.vue +++ b/app/assets/javascripts/notes/components/discussion_counter.vue @@ -86,8 +86,9 @@ export default { :class="{ 'gl-bg-orange-50': blocksMerge && !allResolved && !glFeatures.movedMrSidebar, 'gl-bg-gray-50': !blocksMerge || allResolved || glFeatures.movedMrSidebar, - 'gl-pr-4': allResolved && !glFeatures.movedMrSidebar, + 'gl-pr-4': allResolved && glFeatures.movedMrSidebar, 'gl-pr-2': !allResolved && !glFeatures.movedMrSidebar, + 'gl-min-h-7': glFeatures.movedMrSidebar, }" data-testid="discussions-counter-text" > |