Commit d28b651f authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'migrate-fa-spinner-to-spinner-in-single-file-diff-js' into 'master'

Migrate fa-spinner to spinner in single file diff js.

See merge request gitlab-org/gitlab!25192
parents 2c87c84d 4281d325
...@@ -9,7 +9,7 @@ import initImageDiffHelper from './image_diff/helpers/init_image_diff'; ...@@ -9,7 +9,7 @@ import initImageDiffHelper from './image_diff/helpers/init_image_diff';
import syntaxHighlight from './syntax_highlight'; import syntaxHighlight from './syntax_highlight';
const WRAPPER = '<div class="diff-content"></div>'; const WRAPPER = '<div class="diff-content"></div>';
const LOADING_HTML = '<i class="fa fa-spinner fa-spin"></i>'; const LOADING_HTML = '<span class="spinner"></span>';
const ERROR_HTML = const ERROR_HTML =
'<div class="nothing-here-block"><i class="fa fa-warning"></i> Could not load diff</div>'; '<div class="nothing-here-block"><i class="fa fa-warning"></i> Could not load diff</div>';
const COLLAPSED_HTML = const COLLAPSED_HTML =
......
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