diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
| commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
| tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /app/views/users | |
| parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) | |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'app/views/users')
| -rw-r--r-- | app/views/users/_overview.html.haml | 6 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/app/views/users/_overview.html.haml b/app/views/users/_overview.html.haml index 7bd2d30a35c..5b6d1169b4b 100644 --- a/app/views/users/_overview.html.haml +++ b/app/views/users/_overview.html.haml @@ -1,6 +1,6 @@ .row .col-12 - .calendar-block.prepend-top-default.append-bottom-default + .calendar-block.gl-mt-3.gl-mb-3 .user-calendar.d-none.d-sm-block{ data: { calendar_path: user_calendar_path(@user, :json), calendar_activities_path: user_calendar_activities_path, utc_offset: Time.zone.utc_offset } } %h4.center.light .spinner.spinner-md @@ -9,7 +9,7 @@ .col-md-12.col-lg-6 - if can?(current_user, :read_cross_project) .activities-block - .prepend-top-16 + .gl-mt-5 .d-flex.align-items-center.border-bottom %h4.flex-grow = s_('UserProfile|Activity') @@ -20,7 +20,7 @@ .col-md-12.col-lg-6 .projects-block - .prepend-top-16 + .gl-mt-5 .d-flex.align-items-center.border-bottom %h4.flex-grow = s_('UserProfile|Personal projects') diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index dc151a61ee1..d2f7ff91f0d 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -85,12 +85,13 @@ - if @user.bio.present? .cover-desc.cgray %p.profile-user-bio - = @user.bio + = markdown(@user.bio_html) + - unless profile_tabs.empty? .scrolling-tabs-container - .fade-left= icon('angle-left') - .fade-right= icon('angle-right') + .fade-left= sprite_icon('chevron-lg-left', size: 12) + .fade-right= sprite_icon('chevron-lg-right', size: 12) %ul.nav-links.user-profile-nav.scrolling-tabs.nav.nav-tabs - if profile_tab?(:overview) %li.js-overview-tab |