Commit 06ceb597 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'add-horizontal-whitespace-to-profile-page' into 'master'

Resolve "User profile page: Enhance horizonal whitespace between Overview columns"

Closes #55252

See merge request gitlab-org/gitlab-ce!23803
parents 32b6129d 6062a25f
...@@ -9,22 +9,24 @@ ...@@ -9,22 +9,24 @@
.col-md-12.col-lg-6 .col-md-12.col-lg-6
- if can?(current_user, :read_cross_project) - if can?(current_user, :read_cross_project)
.activities-block .activities-block
.append-right-5
.prepend-top-16
.d-flex.align-items-center.border-bottom
%h4.flex-grow
= s_('UserProfile|Activity')
= link_to s_('UserProfile|View all'), user_activity_path, class: "hide js-view-all"
.overview-content-list{ data: { href: user_path } }
.center.light.loading
= spinner nil, true
.col-md-12.col-lg-6
.projects-block
.prepend-left-5
.prepend-top-16 .prepend-top-16
.d-flex.align-items-center.border-bottom .d-flex.align-items-center.border-bottom
%h4.flex-grow %h4.flex-grow
= s_('UserProfile|Activity') = s_('UserProfile|Personal projects')
= link_to s_('UserProfile|View all'), user_activity_path, class: "hide js-view-all" = link_to s_('UserProfile|View all'), user_projects_path, class: "hide js-view-all"
.overview-content-list{ data: { href: user_path } } .overview-content-list{ data: { href: user_projects_path } }
.center.light.loading .center.light.loading
= spinner nil, true = spinner nil, true
.col-md-12.col-lg-6
.projects-block
.prepend-top-16
.d-flex.align-items-center.border-bottom
%h4.flex-grow
= s_('UserProfile|Personal projects')
= link_to s_('UserProfile|View all'), user_projects_path, class: "hide js-view-all"
.overview-content-list{ data: { href: user_projects_path } }
.center.light.loading
= spinner nil, true
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment