Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/notes/components/discussion_counter.vue')
-rw-r--r--app/assets/javascripts/notes/components/discussion_counter.vue7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/components/discussion_counter.vue b/app/assets/javascripts/notes/components/discussion_counter.vue
index d8883f90eda..b392ad55fa2 100644
--- a/app/assets/javascripts/notes/components/discussion_counter.vue
+++ b/app/assets/javascripts/notes/components/discussion_counter.vue
@@ -71,6 +71,9 @@ export default {
return options;
},
+ isNotificationsTodosButtons() {
+ return this.glFeatures.notificationsTodosButtons && this.glFeatures.movedMrSidebar;
+ },
},
methods: {
...mapActions(['setExpandDiscussions']),
@@ -92,10 +95,12 @@ export default {
class="gl-display-flex discussions-counter"
>
<div
- class="gl-display-flex gl-align-items-center gl-pl-4 gl-rounded-base gl-mr-3 gl-min-h-7"
+ class="gl-display-flex gl-align-items-center gl-pl-4 gl-rounded-base gl-min-h-7"
:class="{
'gl-bg-orange-50': blocksMerge && !allResolved,
'gl-bg-gray-50': !blocksMerge || allResolved,
+ 'gl-mr-3': !isNotificationsTodosButtons,
+ 'gl-mr-5': isNotificationsTodosButtons,
}"
data-testid="discussions-counter-text"
>