kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '56010-user-profile-page-horizonal-whitespace-between-overview-columns-breaks-two-column-layout' into 'master' 

Resolve "User profile page: Horizonal whitespace between Overview columns breaks two column layout"

Closes #56010

See merge request gitlab-org/gitlab-ce!24189
This commit is contained in:
Annabel Dunstone Gray 2019-01-08 19:30:16 +00:00
parent 5481419fd7 db995e22db
commit 1b3affafab
3 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/stylesheets/pages/profile.scss
View File

@ -249,6 +249,16 @@
.event-item {
padding-left: 40px;
}
@include media-breakpoint-up(lg) {
margin-right: 5px;
}
}
.projects-block {
@include media-breakpoint-up(lg) {
margin-left: 5px;
}
}
@include media-breakpoint-down(xs) {

30
app/views/users/_overview.html.haml
View File

@ -9,24 +9,22 @@
.col-md-12.col-lg-6
- if can?(current_user, :read_cross_project)
.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
.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 } }
= 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-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

5
changelogs/unreleased/56010-user-profile-page-horizonal-whitespace-between-overview-columns-breaks-two-column-layout.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Remove horizontal whitespace on user profile overview on small breakpoints
merge_request: 24189
author:
type: other