Skip to content

G
gitlab-ce
Commit 0402a183 authored by Alfredo Sumaran's avatar Alfredo Sumaran
Browse files
Options

Replace loading text with spinner

parent 02bfb0ff
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
app/assets/stylesheets/pages/merge_conflicts.scss
View file @ 0402a183
...@@ -242,7 +242,7 @@ $colors: ( ...@@ -242,7 +242,7 @@ $colors: (
display: none; display: none;
} }
.loading-text { .loading {
display: block; display: block;
} }
} }
...@@ -262,7 +262,7 @@ $colors: ( ...@@ -262,7 +262,7 @@ $colors: (
} }
} }
.loading-text { .loading {
display: none; display: none;
} }
} }
......
app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml
View file @ 0402a183
%template{ id: "diff-file-editor" } %template{ id: "diff-file-editor" }
%div %div
.editor-wrap{ ":class" => "classObject" } .editor-wrap{ ":class" => "classObject" }
%p.loading-text Loading... .loading
%i.fa.fa-spinner.fa-spin
.editor .editor
%pre{ "style" => "height: 350px" } %pre{ "style" => "height: 350px" }
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7