Commit 0d08ba3b authored by Martin Wortschack's avatar Martin Wortschack

Merge branch 'tz-replace-spinner-project-templates' into 'master'

Replaces 3 spinner Icons with new ones

See merge request gitlab-org/gitlab!47765
parents 718d747b d47933b6
......@@ -21,7 +21,7 @@
.form-actions
= button_tag class: 'btn gl-button btn-success btn-upload-file', id: 'submit-all', type: 'button' do
= icon('spin spinner', class: 'js-loading-icon hidden' )
.spinner.spinner-sm.gl-mr-2.js-loading-icon.hidden
= button_title
= link_to _("Cancel"), '#', class: "btn gl-button btn-cancel", "data-dismiss" => "modal"
......
......@@ -27,10 +27,10 @@
= render partial: 'projects/project_templates/template', collection: Gitlab::ProjectTemplate.all
.project-templates-buttons.import-buttons.tab-pane.js-custom-instance-project-templates-tab-content#custom-instance-project-templates{ data: {initial_templates: user_available_project_templates_path(current_user)} }
.text-center.m-4
= icon("spin spinner 2x")
.spinner.spinner-md
.project-templates-buttons.import-buttons.tab-pane.js-custom-group-project-templates-tab-content#custom-group-project-templates{ data: {initial_templates: user_available_group_templates_path(current_user, group_id: group_id)} }
.text-center.m-4
= icon("spin spinner 2x")
.spinner.spinner-md
.project-templates-buttons.import-buttons.tab-pane#sample-data-templates
= render partial: 'projects/project_templates/template', collection: Gitlab::SampleDataTemplate.all
......
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