Commit f0814a53 authored by David O'Regan's avatar David O'Regan

Merge branch 'fix/alignment-issue-user-activities' into 'master'

Applied .container-fluid .container-limited classes

See merge request gitlab-org/gitlab!78676
parents 3f12febe 571516da
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
= _('There was an error loading users activity calendar.') = _('There was an error loading users activity calendar.')
%a.js-retry-load{ href: '#' } %a.js-retry-load{ href: '#' }
= s_('UserProfile|Retry') = s_('UserProfile|Retry')
.user-calendar-activities
- if @user.user_readme&.rich_viewer - if @user.user_readme&.rich_viewer
.row.justify-content-center .row.justify-content-center
.col-12.col-md-10.col-lg-8.gl-my-6 .col-12.col-md-10.col-lg-8.gl-my-6
...@@ -24,6 +23,8 @@ ...@@ -24,6 +23,8 @@
.gl-ml-auto .gl-ml-auto
= link_to _('Edit'), edit_blob_path(@user.user_project, @user.user_project.default_branch, @user.user_readme.path) = link_to _('Edit'), edit_blob_path(@user.user_project, @user.user_project.default_branch, @user.user_readme.path)
= render 'projects/blob/viewer', viewer: @user.user_readme.rich_viewer, load_async: false = render 'projects/blob/viewer', viewer: @user.user_readme.rich_viewer, load_async: false
.row
.col-12.user-calendar-activities
.row .row
%div{ class: activity_pane_class } %div{ class: activity_pane_class }
- if can?(current_user, :read_cross_project) - if can?(current_user, :read_cross_project)
......
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