Commit 268c183b authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Replace gif animation with font icon spinner

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 883409b9
...@@ -173,12 +173,10 @@ table a code { ...@@ -173,12 +173,10 @@ table a code {
.loading { .loading {
margin: 20px auto; margin: 20px auto;
background: url(ajax_loader.gif) no-repeat center center;
width: 40px;
height: 40px; height: 40px;
&.loading-gray { color: #555;
background: url(ajax_loader_gray.gif) no-repeat center center; font-size: 32px;
} text-align: center;
} }
span.update-author { span.update-author {
......
...@@ -123,14 +123,9 @@ ...@@ -123,14 +123,9 @@
} }
.save-project-loader { .save-project-loader {
img { margin-top: 50px;
margin-top: 50px; margin-bottom: 50px;
margin-bottom: 50px; color: #555;
}
h3 {
@extend .page-title;
}
} }
ul.nav.nav-projects-tabs { ul.nav.nav-projects-tabs {
......
...@@ -236,4 +236,10 @@ module ApplicationHelper ...@@ -236,4 +236,10 @@ module ApplicationHelper
def render_markup(file_name, file_content) def render_markup(file_name, file_content)
GitHub::Markup.render(file_name, file_content).html_safe GitHub::Markup.render(file_name, file_content).html_safe
end end
def spinner(text = nil)
content_tag :div, class: 'loading hide' do
content_tag(:i, nil, class: 'icon-spinner icon-spin') + text
end
end
end end
...@@ -5,4 +5,5 @@ ...@@ -5,4 +5,5 @@
.content_list .content_list
- else - else
%p.nothing_here_message Projects activity will be displayed here %p.nothing_here_message Projects activity will be displayed here
.loading.hide
= spinner
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.content_list .content_list
- else - else
%p.nothing_here_message Project activity will be displayed here %p.nothing_here_message Project activity will be displayed here
.loading.hide = spinner
.side.col-md-4 .side.col-md-4
.light-well.append-bottom-20 .light-well.append-bottom-20
= image_tag group_icon(@group.path), class: "avatar s90" = image_tag group_icon(@group.path), class: "avatar s90"
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
%li.hidden-sm.hidden-xs %li.hidden-sm.hidden-xs
%a %a
%div.hide.turbolink-spinner %div.hide.turbolink-spinner
%i.icon-refresh.icon-spin %i.icon-spinner.icon-spin
Loading... Loading...
%li.hidden-sm.hidden-xs %li.hidden-sm.hidden-xs
= render "layouts/search" = render "layouts/search"
......
...@@ -19,5 +19,5 @@ ...@@ -19,5 +19,5 @@
%li %li
%a %a
%div.hide.turbolink-spinner %div.hide.turbolink-spinner
%i.icon-refresh.icon-spin %i.icon-spinner.icon-spin
Loading... Loading...
...@@ -50,7 +50,10 @@ ...@@ -50,7 +50,10 @@
%div %div
= f.text_field :username, required: true, class: 'form-control' = f.text_field :username, required: true, class: 'form-control'
&nbsp; &nbsp;
%span.loading-gif.hide= image_tag "ajax_loader.gif" .loading-gif.hide
%p
%i.icon-spinner.icon-spin
Saving new username
%p.light %p.light
= user_url(@user) = user_url(@user)
%div %div
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
%div{id: dom_id(@project)} %div{id: dom_id(@project)}
#commits-list= render "commits" #commits-list= render "commits"
.clear .clear
.loading{ style: "display:none;"} = spinner
- if @commits.count == @limit - if @commits.count == @limit
:javascript :javascript
......
...@@ -189,6 +189,7 @@ ...@@ -189,6 +189,7 @@
.save-project-loader.hide .save-project-loader.hide
%center %center
= image_tag "ajax_loader.gif" %h2
%h3 Saving project. %i.icon-spinner.icon-spin
Saving project.
%p Please wait a moment, this page will automatically refresh when ready. %p Please wait a moment, this page will automatically refresh when ready.
...@@ -3,8 +3,9 @@ ...@@ -3,8 +3,9 @@
- if @project.import? && !@project.imported - if @project.import? && !@project.imported
.save-project-loader .save-project-loader
%center %center
= image_tag "ajax_loader.gif" %h2
%h3 Importing repository. %i.icon-spinner.icon-spin
Importing repository.
%p.monospace git clone --bare #{@project.import_url} %p.monospace git clone --bare #{@project.import_url}
%p Please wait while we import the repository for you. Refresh at will. %p Please wait while we import the repository for you. Refresh at will.
:javascript :javascript
......
.loading-graph .loading-graph
%center %center
.loading %h3.page-title
%h3.page-title Building repository graph. %i.icon-spinner.icon-spin
Building repository graph.
%p Please wait a moment, this page will automatically refresh when ready. %p Please wait a moment, this page will automatically refresh when ready.
.stat-graph .stat-graph
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
.automerge_widget.unchecked .automerge_widget.unchecked
.bs-callout.bs-callout-warning .bs-callout.bs-callout-warning
%strong %strong
%i.icon-refresh.icon-spin %i.icon-spinner.icon-spin
Checking for ability to automatically merge… Checking for ability to automatically merge…
.automerge_widget.already_cannot_be_merged.hide .automerge_widget.already_cannot_be_merged.hide
...@@ -64,6 +64,6 @@ ...@@ -64,6 +64,6 @@
.merge-in-progress.hide .merge-in-progress.hide
.bs-callout.bs-callout-success .bs-callout.bs-callout-success
%i.icon-refresh.icon-spin %i.icon-spinner.icon-spin
&nbsp; &nbsp;
Merge is in progress. Please wait. Page will be automatically reloaded. &nbsp; Merge is in progress. Please wait. Page will be automatically reloaded. &nbsp;
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
.ci_widget .ci_widget
.alert.alert-warning .alert.alert-warning
%strong %strong
%i.icon-refresh %i.icon-spinner
Checking for CI status for #{@merge_request.last_commit_short_sha} Checking for CI status for #{@merge_request.last_commit_short_sha}
.ci_widget.ci-error{style: "display:none"} .ci_widget.ci-error{style: "display:none"}
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.tip .tip
You can move around the graph by using the arrow keys. You can move around the graph by using the arrow keys.
.network-graph .network-graph
.loading.loading-gray = spinner
:javascript :javascript
new Network({ new Network({
......
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
.save-project-loader.hide .save-project-loader.hide
%center %center
= image_tag "ajax_loader.gif" %h2
%h3 Creating project &amp; repository. %i.icon-spinner.icon-spin
Creating project &amp; repository.
%p Please wait a moment, this page will automatically refresh when ready. %p Please wait a moment, this page will automatically refresh when ready.
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
= render "events/event_last_push", event: @last_push = render "events/event_last_push", event: @last_push
= render 'shared/event_filter' = render 'shared/event_filter'
.content_list .content_list
.loading.hide = spinner
.col-md-3.project-side.hidden-sm .col-md-3.project-side.hidden-sm
.clearfix .clearfix
- if @project.archived? - if @project.archived?
......
...@@ -4,7 +4,5 @@ ...@@ -4,7 +4,5 @@
%span.str-truncated %span.str-truncated
= link_to blob_item.name, project_blob_path(@project, tree_join(@id || @commit.id, blob_item.name)) = link_to blob_item.name, project_blob_path(@project, tree_join(@id || @commit.id, blob_item.name))
%td.tree_time_ago.cgray %td.tree_time_ago.cgray
%span.log_loading.hide = render 'spinner'
Loading commit data...
= image_tag "ajax_loader_tree.gif", width: 14
%td.tree_commit{ colspan: 2 } %td.tree_commit{ colspan: 2 }
%span.log_loading.hide
%i.icon-spinner.icon-spin
Loading commit data...
...@@ -4,7 +4,5 @@ ...@@ -4,7 +4,5 @@
%span.str-truncated %span.str-truncated
= link_to tree_item.name, project_tree_path(@project, tree_join(@id || @commit.id, tree_item.name)) = link_to tree_item.name, project_tree_path(@project, tree_join(@id || @commit.id, tree_item.name))
%td.tree_time_ago.cgray %td.tree_time_ago.cgray
%span.log_loading.hide = render 'spinner'
Loading commit data...
= image_tag "ajax_loader_tree.gif", width: 14
%td.tree_commit{ colspan: 2 } %td.tree_commit{ colspan: 2 }
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