diff options
Diffstat (limited to 'app/views/users/_overview.html.haml')
-rw-r--r-- | app/views/users/_overview.html.haml | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/app/views/users/_overview.html.haml b/app/views/users/_overview.html.haml index 5b6d1169b4b..294af53e35b 100644 --- a/app/views/users/_overview.html.haml +++ b/app/views/users/_overview.html.haml @@ -1,3 +1,5 @@ +- activity_pane_class = Feature.enabled?(:security_auto_fix) && @user.bot? ? "col-12" : "col-md-12 col-lg-6" + .row .col-12 .calendar-block.gl-mt-3.gl-mb-3 @@ -6,25 +8,26 @@ .spinner.spinner-md .user-calendar-activities.d-none.d-sm-block .row - .col-md-12.col-lg-6 + %div{ class: activity_pane_class } - if can?(current_user, :read_cross_project) .activities-block .gl-mt-5 - .d-flex.align-items-center.border-bottom - %h4.flex-grow - = s_('UserProfile|Activity') + .gl-display-flex.gl-align-items-center.gl-border-b-1.gl-border-b-gray-100.gl-border-b-solid + %h4.gl-flex-grow-1 + = Feature.enabled?(:security_auto_fix) && @user.bot? ? s_('UserProfile|Bot activity') : 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.spinner-md - .col-md-12.col-lg-6 - .projects-block - .gl-mt-5 - .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.spinner-md + - unless Feature.enabled?(:security_auto_fix) && @user.bot? + .col-md-12.col-lg-6 + .projects-block + .gl-mt-5 + .gl-display-flex.gl-align-items-center.gl-border-b-1.gl-border-b-gray-100.gl-border-b-solid + %h4.gl-flex-grow-1 + = 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.spinner-md |