diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-09-19 11:04:52 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-13 14:16:34 -0500 |
| commit | 0402a18367a7a08d3f40f8b63b961a0e1abb345a (patch) | |
| tree | d025a6846579cf91b125bb4bc76f9abe386c8ec5 | |
| parent | 02bfb0ff1bf53abf44c50d8310ad0856d26860cf (diff) | |
| download | gitlab-ce-0402a18367a7a08d3f40f8b63b961a0e1abb345a.tar.gz | |
Replace loading text with spinner
| -rw-r--r-- | app/assets/stylesheets/pages/merge_conflicts.scss | 4 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/merge_conflicts.scss b/app/assets/stylesheets/pages/merge_conflicts.scss index c851bd52b1a..d447ca53c16 100644 --- a/app/assets/stylesheets/pages/merge_conflicts.scss +++ b/app/assets/stylesheets/pages/merge_conflicts.scss @@ -242,7 +242,7 @@ $colors: ( display: none; } - .loading-text { + .loading { display: block; } } @@ -262,7 +262,7 @@ $colors: ( } } - .loading-text { + .loading { display: none; } } diff --git a/app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml b/app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml index 940558e02e0..9965bdf9028 100644 --- a/app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml +++ b/app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml @@ -1,6 +1,7 @@ %template{ id: "diff-file-editor" } %div .editor-wrap{ ":class" => "classObject" } - %p.loading-text Loading... + .loading + %i.fa.fa-spinner.fa-spin .editor %pre{ "style" => "height: 350px" } |