diff options
Diffstat (limited to 'app/views')
4 files changed, 3 insertions, 7 deletions
diff --git a/app/views/admin/application_settings/_usage.html.haml b/app/views/admin/application_settings/_usage.html.haml index b4fe1bbf028..9421585b70c 100644 --- a/app/views/admin/application_settings/_usage.html.haml +++ b/app/views/admin/application_settings/_usage.html.haml @@ -26,7 +26,7 @@ %p.mb-2= s_('%{usage_ping_link_start}Learn more%{usage_ping_link_end} about what information is shared with GitLab Inc.').html_safe % { usage_ping_link_start: usage_ping_link_start, usage_ping_link_end: '</a>'.html_safe } %button.btn.js-usage-ping-payload-trigger{ type: 'button' } - .js-spinner.d-none= icon('spinner spin') + .spinner.js-spinner.d-none .js-text.d-inline= _('Preview payload') %pre.usage-data.js-usage-ping-payload.js-syntax-highlight.code.highlight.mt-2.d-none{ data: { endpoint: usage_data_admin_application_settings_path(format: :html) } } - else diff --git a/app/views/shared/milestones/_delete_button.html.haml b/app/views/shared/milestones/_delete_button.html.haml index e236c24b088..e00a10398d3 100644 --- a/app/views/shared/milestones/_delete_button.html.haml +++ b/app/views/shared/milestones/_delete_button.html.haml @@ -9,6 +9,6 @@ milestone_merge_request_count: @milestone.merge_requests.count }, disabled: true } = _('Delete') - = icon('spin spinner', class: 'js-loading-icon hidden' ) + .spinner.js-loading-icon.hidden #delete-milestone-modal diff --git a/app/views/shared/milestones/_sidebar.html.haml b/app/views/shared/milestones/_sidebar.html.haml index fbbcc4f3e68..a6fb8e6d4fc 100644 --- a/app/views/shared/milestones/_sidebar.html.haml +++ b/app/views/shared/milestones/_sidebar.html.haml @@ -98,10 +98,6 @@ human_time_estimate: @milestone.human_total_issue_time_estimate, human_time_spent: @milestone.human_total_issue_time_spent, limit_to_hours: Gitlab::CurrentSettings.time_tracking_limit_to_hours.to_s } } - // Fallback while content is loading - .title.hide-collapsed - = _('Time tracking') - = icon('spinner spin') = render_if_exists 'shared/milestones/weight', milestone: milestone diff --git a/app/views/shared/milestones/_tab_loading.html.haml b/app/views/shared/milestones/_tab_loading.html.haml index 68458c2d0aa..dfca6a184be 100644 --- a/app/views/shared/milestones/_tab_loading.html.haml +++ b/app/views/shared/milestones/_tab_loading.html.haml @@ -1,2 +1,2 @@ .text-center.prepend-top-default - = icon('spin spinner 2x', 'aria-hidden': 'true', 'aria-label': 'Loading tab content') + .spinner.spinner-md |