Commit 96d5c999 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch...

Merge branch '353755-make-spinners-in-app-views-users-_overview-html-haml-pajamas-compliant' into 'master'

Make spinners in users/_overview partial Pajamas-compliant

See merge request gitlab-org/gitlab!82379
parents 87b41d2f 9a365876
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.row.d-none.d-sm-flex .row.d-none.d-sm-flex
.col-12.calendar-block.gl-my-3 .col-12.calendar-block.gl-my-3
.user-calendar.light{ data: { calendar_path: user_calendar_path(@user, :json), calendar_activities_path: user_calendar_activities_path, utc_offset: local_timezone_instance(@user.timezone).now.utc_offset } } .user-calendar.light{ data: { calendar_path: user_calendar_path(@user, :json), calendar_activities_path: user_calendar_activities_path, utc_offset: local_timezone_instance(@user.timezone).now.utc_offset } }
.gl-spinner.gl-spinner-md.gl-my-8 = gl_loading_icon(size: 'md', css_class: 'gl-my-8')
.user-calendar-error.invisible .user-calendar-error.invisible
= _('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: '#' }
...@@ -35,8 +35,7 @@ ...@@ -35,8 +35,7 @@
= Feature.enabled?(:security_auto_fix) && @user.bot? ? s_('UserProfile|Bot activity') : s_('UserProfile|Activity') = 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" = link_to s_('UserProfile|View all'), user_activity_path, class: "hide js-view-all"
.overview-content-list{ data: { href: user_activity_path, qa_selector: 'user_activity_content' } } .overview-content-list{ data: { href: user_activity_path, qa_selector: 'user_activity_content' } }
.center.light.loading = gl_loading_icon(size: 'md', css_class: 'loading')
.gl-spinner.gl-spinner-md
- unless Feature.enabled?(:security_auto_fix) && @user.bot? - unless Feature.enabled?(:security_auto_fix) && @user.bot?
.col-md-12.col-lg-6 .col-md-12.col-lg-6
...@@ -47,5 +46,4 @@ ...@@ -47,5 +46,4 @@
= s_('UserProfile|Personal projects') = s_('UserProfile|Personal projects')
= link_to s_('UserProfile|View all'), user_projects_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_projects_path } } .overview-content-list{ data: { href: user_projects_path } }
.center.light.loading = gl_loading_icon(size: 'md', css_class: 'loading')
.gl-spinner.gl-spinner-md
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