diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-21 03:13:46 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-21 03:13:46 +0300 |
commit | 4aa6fba6d825b88d23ff37668e78c851bec102b0 (patch) | |
tree | 2588fec6fc68f27fbfc23e89daf9b9af34d5466b /app/assets | |
parent | faf60c19a9a1a29ce07d1b51ea3a69466e7129f3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/pages/users/index.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/pages/users/user_tabs.js | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/page_bundles/issuable_list.scss | 19 | ||||
-rw-r--r-- | app/assets/stylesheets/page_bundles/profile.scss | 6 |
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; } |