diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 15:08:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 15:08:59 +0300 |
| commit | 7351a484d79236b7e9d47c86f2fcc970b7ae10b0 (patch) | |
| tree | 651b5fca7ea0460e3ce7c687cfa9e3a3b37eefc8 /app/views/users | |
| parent | b4ded0ba7b4d2cdbed5b1f331cf2083a25ee4d7c (diff) | |
Add latest changes from gitlab-org/gitlab@master
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 b5bc1180290..7bd2d30a35c 100644 --- a/app/views/users/_overview.html.haml +++ b/app/views/users/_overview.html.haml @@ -3,7 +3,7 @@ .calendar-block.prepend-top-default.append-bottom-default .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 nil, true + .spinner.spinner-md .user-calendar-activities.d-none.d-sm-block .row .col-md-12.col-lg-6 @@ -16,7 +16,7 @@ = 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 + .spinner.spinner-md .col-md-12.col-lg-6 .projects-block @@ -27,4 +27,4 @@ = 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 + .spinner.spinner-md diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index e10dad8aa8d..3c164588b13 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -130,7 +130,8 @@ %h4.prepend-top-20 = s_('UserProfile|Most Recent Activity') .content_list{ data: { href: user_path } } - = spinner + .loading + .spinner.spinner-md - if profile_tab?(:groups) #groups.tab-pane @@ -152,8 +153,8 @@ #snippets.tab-pane -# This tab is always loaded via AJAX - .loading-status - = spinner + .loading.hide + .spinner.spinner-md - if profile_tabs.empty? .row |