diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-30 21:08:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-30 21:08:31 +0300 |
| commit | 7510df057e6230ce3d6f20772b0460ca2eb4bd63 (patch) | |
| tree | 68a726ba9b534a51ec92a78be952fce286aead31 /app/assets/javascripts/notes | |
| parent | 4dd542c93535f21d0fde62080be2dd98e3926fb1 (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 | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/assets/javascripts/notes/components/discussion_counter.vue b/app/assets/javascripts/notes/components/discussion_counter.vue index 37935e9c3c6..6521b86edbb 100644 --- a/app/assets/javascripts/notes/components/discussion_counter.vue +++ b/app/assets/javascripts/notes/components/discussion_counter.vue @@ -81,18 +81,16 @@ export default { :class="{ 'gl-bg-orange-50': blocksMerge && !allResolved, 'gl-bg-gray-50': !blocksMerge || allResolved, + 'gl-pr-2': !allResolved, }" data-testid="discussions-counter-text" > <template v-if="allResolved"> {{ __('All threads resolved!') }} <gl-dropdown - v-gl-tooltip:discussionCounter.hover.bottom size="small" category="tertiary" right - :title="__('Thread options')" - :aria-label="__('Thread options')" toggle-class="btn-icon" class="gl-pt-0! gl-px-2 gl-h-full gl-ml-2" > @@ -135,12 +133,9 @@ export default { @click="jumpNext" /> <gl-dropdown - v-gl-tooltip:discussionCounter.hover.bottom size="small" category="tertiary" right - :title="__('Thread options')" - :aria-label="__('Thread options')" toggle-class="btn-icon" class="gl-pt-0! gl-px-2" > |