Add latest changes from gitlab-org/gitlab@master

4 files changed, 15 insertions, 14 deletions

diff --git a/app/assets/javascripts/pages/users/index.js b/app/assets/javascripts/pages/users/index.js
index d2c31314bba..134962721d2 100644
--- a/app/assets/javascripts/pages/users/index.js
+++ b/app/assets/javascripts/pages/users/index.js
@@ -8,7 +8,7 @@ import UserTabs from './user_tabs';
 function initUserProfile(action) {
   // TODO: Remove both Vue and legacy JS tabs code/feature flag uses with the
   // removal of the old navigation.
-  // See https://gitlab.com/groups/gitlab-org/-/epics/11875.
+  // See https://gitlab.com/gitlab-org/gitlab/-/issues/435899.
 
   if (gon.features?.profileTabsVue) {
     initProfileTabs();
diff --git a/app/assets/javascripts/pages/users/user_tabs.js b/app/assets/javascripts/pages/users/user_tabs.js
index 79eb3902116..f9e22808b0d 100644
--- a/app/assets/javascripts/pages/users/user_tabs.js
+++ b/app/assets/javascripts/pages/users/user_tabs.js
@@ -1,5 +1,5 @@
 // TODO: Remove this with the removal of the old navigation.
-// See https://gitlab.com/groups/gitlab-org/-/epics/11875.
+// See https://gitlab.com/gitlab-org/gitlab/-/issues/435899.
 
 import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils';
 import $ from 'jquery';
diff --git a/app/assets/stylesheets/page_bundles/issuable_list.scss b/app/assets/stylesheets/page_bundles/issuable_list.scss
index 1ca0c5e7ce6..9084bffa951 100644
--- a/app/assets/stylesheets/page_bundles/issuable_list.scss
+++ b/app/assets/stylesheets/page_bundles/issuable_list.scss
@@ -90,12 +90,19 @@
 .issuable-list li,
 .issuable-info-container .controls {
   .avatar-counter {
-    display: inline-block;
-    vertical-align: middle;
-    min-width: 16px;
+    @include gl-pl-1
+    @include gl-pr-2;
+    @include gl-h-5;
+    @include gl-min-w-5;
     line-height: 14px;
-    height: 16px;
-    padding-left: 2px;
-    padding-right: 2px;
+  }
+}
+
+.merge-request {
+  .issuable-info-container .controls {
+    .avatar-counter {
+      @include gl-line-height-normal;
+      border: 0;
+    }
   }
 }
diff --git a/app/assets/stylesheets/page_bundles/profile.scss b/app/assets/stylesheets/page_bundles/profile.scss
index 9a8eeb9c9d6..912f0145bf1 100644
--- a/app/assets/stylesheets/page_bundles/profile.scss
+++ b/app/assets/stylesheets/page_bundles/profile.scss
@@ -164,12 +164,6 @@
 
 .user-profile {
   .profile-header {
-    margin: 0 $gl-padding;
-
-    &.with-no-profile-tabs {
-      margin-bottom: $gl-padding-24;
-    }
-
     .avatar-holder {
       margin: 0 auto 10px;
     }