github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-19 05:52:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

remove admin-loading in favor of spinner css

Browse Source
This commit is contained in:
Jeff Atwood 2014-10-11 03:46:42 -07:00
parent 4e1e977517
commit be43d51536
10 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/templates/email_preview_digest.hbs
View File

@ -19,7 +19,7 @@
</div>
{{#if loading}}
<div class='admin-loading'>{{i18n loading}}</div>
<div class='spinner'></div>
{{else}}
{{#if showHtml}}
{{{html_content}}}

4
app/assets/javascripts/admin/templates/flags.hbs
View File

@ -9,7 +9,7 @@
<div class="admin-container">
{{#if loading}}
<div class='admin-loading'>{{i18n loading}}</div>
<div class='spinner'></div>
{{else}}
{{#if length}}
<table class='admin-flags'>
@ -160,7 +160,7 @@
</tbody>
</table>
{{#if view.loading}}
<div class='admin-loading'>{{i18n loading}}</div>
<div class='spinner'></div>
{{/if}}
{{else}}

2
app/assets/javascripts/admin/templates/logs/screened_emails.hbs
View File

@ -1,7 +1,7 @@
<p>{{i18n admin.logs.screened_emails.description}}</p>
{{#if loading}}
<div class='admin-loading'>{{i18n loading}}</div>
<div class='spinner'></div>
{{else}}
{{#if model.length}}

2
app/assets/javascripts/admin/templates/logs/screened_ip_addresses.hbs
View File

@ -4,7 +4,7 @@
<br/>
{{#if loading}}
<div class='admin-loading'>{{i18n loading}}</div>
<div class='spinner'></div>
{{else}}
{{#if model.length}}

2
app/assets/javascripts/admin/templates/logs/screened_urls.hbs
View File

@ -1,7 +1,7 @@
<p>{{i18n admin.logs.screened_urls.description}}</p>
{{#if loading}}
<div class='admin-loading'>{{i18n loading}}</div>
<div class='spinner'></div>
{{else}}
{{#if model.length}}

2
app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs
View File

@ -45,7 +45,7 @@
{{#if loading}}
<br/>
<div class='admin-loading'>{{i18n loading}}</div>
<div class='spinner'></div>
{{else}}
{{#if model.length}}
{{view "staff-action-logs-list" content=controller}}

2
app/assets/javascripts/admin/templates/users_list.hbs
View File

@ -32,7 +32,7 @@
<br/>
{{#if loading}}
<div class='admin-loading'>{{i18n loading}}</div>
<div class='spinner'></div>
{{else}}
{{#if model.length}}
<table class='table'>

18
app/assets/stylesheets/common/admin/admin_base.scss
View File

@ -66,24 +66,6 @@ td.flaggers td {
}
}
.admin-loading {
width: 100px;
margin: 0 auto 30px auto;
background-color: #000;
@include border-radius-all(10px);
padding: 10px 10px 10px 30px;
font-size: 15px;
line-height: 23px;
text-align: center;
color: $secondary;
background: {
image: image-url("spinner_96_w.gif");
repeat: no-repeat;
position: 10px 8px;
size: 25px;
};
}
.ip-lookup {
position: relative;
display: inline-block;

2
app/assets/stylesheets/common/base/compose.scss
View File

@ -134,3 +134,5 @@ div.ac-wrap {
}
}
}

4
app/assets/stylesheets/desktop/compose.scss
View File

@ -181,7 +181,6 @@
.spinner {
position: absolute;
@include fades-in(0.25s);
@include border-radius-all(10px);
left: 250px;
top: 95px;
height: 100px;
@ -189,8 +188,7 @@
height: 70px;
text-indent: -9999em;
background: {
color: #000;
image: image-url("spinner_96_w.gif");
image: image-url("spinner_96.gif");
repeat: no-repeat;
size: 35px;
position: 17px 17px;