Unverified Commit 268c183b authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

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