Commit deffce3b authored by Phil Hughes's avatar Phil Hughes

Merge branch 'ig-faspinner-migration' into 'master'

Migrate fa-spinner to spinner in milestones directory

See merge request gitlab-org/gitlab!25067
parents 99f76f7c 2703c40d
...@@ -9,6 +9,6 @@ ...@@ -9,6 +9,6 @@
milestone_merge_request_count: @milestone.merge_requests.count }, milestone_merge_request_count: @milestone.merge_requests.count },
disabled: true } disabled: true }
= _('Delete') = _('Delete')
= icon('spin spinner', class: 'js-loading-icon hidden' ) .spinner.js-loading-icon.hidden
#delete-milestone-modal #delete-milestone-modal
...@@ -98,10 +98,6 @@ ...@@ -98,10 +98,6 @@
human_time_estimate: @milestone.human_total_issue_time_estimate, human_time_estimate: @milestone.human_total_issue_time_estimate,
human_time_spent: @milestone.human_total_issue_time_spent, human_time_spent: @milestone.human_total_issue_time_spent,
limit_to_hours: Gitlab::CurrentSettings.time_tracking_limit_to_hours.to_s } } 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 = render_if_exists 'shared/milestones/weight', milestone: milestone
......
.text-center.prepend-top-default .text-center.prepend-top-default
= icon('spin spinner 2x', 'aria-hidden': 'true', 'aria-label': 'Loading tab content') .spinner.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