drop text from loading spinner

This commit is contained in:
Jeff Atwood 2014-10-02 14:50:13 -07:00
parent e7bc896210
commit 5fe1f99bf5
14 changed files with 24 additions and 33 deletions

View File

@ -7,7 +7,7 @@
</div> </div>
{{#if loading}} {{#if loading}}
<div class='spinner'>{{i18n loading}}</div> <div class='spinner'></div>
{{else}} {{else}}
<div class='admin-container user-badges'> <div class='admin-container user-badges'>
<h2>{{i18n admin.badges.grant_badge}}</h2> <h2>{{i18n admin.badges.grant_badge}}</h2>

View File

@ -486,7 +486,7 @@ export default ObjectController.extend(Discourse.SelectedPostsCount, {
}.property('isPrivateMessage'), }.property('isPrivateMessage'),
loadingHTML: function() { loadingHTML: function() {
return "<div class='spinner'>" + I18n.t('loading') + "</div>"; return "<div class='spinner'></div>";
}.property(), }.property(),
recoverTopic: function() { recoverTopic: function() {

View File

@ -36,11 +36,11 @@
{{/each}} {{/each}}
</div> </div>
{{#if canLoadMore}} {{#if canLoadMore}}
<div class='spinner'>{{i18n loading}}</div> <div class='spinner'></div>
{{/if}} {{/if}}
{{else}} {{else}}
{{#unless userBadgesLoaded}} {{#unless userBadgesLoaded}}
<div class='spinner'>{{i18n loading}}</div> <div class='spinner'></div>
{{/unless}} {{/unless}}
{{/if}} {{/if}}
</div> </div>

View File

@ -60,7 +60,5 @@
</div> </div>
{{/if}} {{/if}}
{{else}} {{else}}
<div class='spinner'> <div class='spinner'></div>
{{i18n loading}}
</div>
{{/if}} {{/if}}

View File

@ -33,13 +33,13 @@
<dd>{{location.phone}}</dd> <dd>{{location.phone}}</dd>
{{/if}} {{/if}}
{{else}} {{else}}
<div class="spinner">{{i18n loading}}</div> <div class="spinner"></div>
{{/if}} {{/if}}
<dt>{{i18n ip_lookup.other_accounts}}</dt> <dt>{{i18n ip_lookup.other_accounts}}</dt>
<dd> <dd>
{{#if other_accounts_loading}} {{#if other_accounts_loading}}
<div class="spinner">{{i18n loading}}</div> <div class="spinner"></div>
{{else}} {{else}}
{{#each other_accounts}} {{#each other_accounts}}
{{#link-to "adminUser" this}}{{avatar this usernamePath="user.username" imageSize="small"}}{{/link-to}} {{#link-to "adminUser" this}}{{avatar this usernamePath="user.username" imageSize="small"}}{{/link-to}}

View File

@ -1,4 +1,4 @@
<div class='spinner'>{{i18n composer.uploading}}</div> <div class='spinner'></div>
<div class='contents'> <div class='contents'>

View File

@ -11,7 +11,7 @@
</div> </div>
<div {{bind-attr class="loadingSpinner::hidden"}}> <div {{bind-attr class="loadingSpinner::hidden"}}>
<div class='spinner'>{{i18n loading}}</div> <div class='spinner'></div>
</div> </div>

View File

@ -53,5 +53,5 @@
</div> </div>
{{/if}} {{/if}}
{{else}} {{else}}
<div class='spinner'>{{i18n loading}}</div> <div class='spinner'></div>
{{/if}} {{/if}}

View File

@ -75,7 +75,7 @@
{{render 'topic-progress'}} {{render 'topic-progress'}}
{{#if postStream.loadingAbove}} {{#if postStream.loadingAbove}}
<div class='spinner'>{{i18n loading}}</div> <div class='spinner'></div>
{{/if}} {{/if}}
{{#unless postStream.loadingFilter}} {{#unless postStream.loadingFilter}}
@ -92,13 +92,13 @@
{{/unless}} {{/unless}}
{{#if postStream.loadingBelow}} {{#if postStream.loadingBelow}}
<div class='spinner'>{{i18n loading}}</div> <div class='spinner'></div>
{{/if}} {{/if}}
</div> </div>
<div id='topic-bottom'></div> <div id='topic-bottom'></div>
{{#if postStream.loadingFilter}} {{#if postStream.loadingFilter}}
<div class='spinner small'>{{i18n loading}}</div> <div class='spinner small'></div>
{{else}} {{else}}
{{#if postStream.loadedAllPosts}} {{#if postStream.loadedAllPosts}}
@ -140,13 +140,13 @@
{{/if}} {{/if}}
</div> </div>
{{#if retrying}} {{#if retrying}}
<div class='spinner'>{{i18n loading}}</div> <div class='spinner'></div>
{{/if}} {{/if}}
{{/if}} {{/if}}
</div> </div>
{{else}} {{else}}
<div class='container'> <div class='container'>
<div class='spinner'>{{i18n loading}}</div> <div class='spinner'></div>
</div> </div>
{{/if}} {{/if}}
{{/if}} {{/if}}

View File

@ -63,7 +63,7 @@
{{/each}} {{/each}}
</table> </table>
{{#if invitesLoading}} {{#if invitesLoading}}
<div class='spinner'>{{i18n loading}}</div> <div class='spinner'></div>
{{/if}} {{/if}}
{{else}} {{else}}

View File

@ -17,7 +17,7 @@
</div> </div>
{{/each}} {{/each}}
{{#if loading}} {{#if loading}}
<div class='spinner'>{{i18n loading}}</div> <div class='spinner'></div>
{{/if}} {{/if}}
{{#unless canLoadMore}} {{#unless canLoadMore}}
<div class='end-of-stream'></div> <div class='end-of-stream'></div>

View File

@ -27,5 +27,5 @@
</div> </div>
{{/each}} {{/each}}
{{#if loading}} {{#if loading}}
<div class='spinner'>{{i18n loading}}</div> <div class='spinner'></div>
{{/if}} {{/if}}

View File

@ -27,5 +27,5 @@
</div> </div>
{{/grouped-each}} {{/grouped-each}}
{{#if loading}} {{#if loading}}
<div class='spinner'>{{i18n loading}}</div> <div class='spinner'></div>
{{/if}} {{/if}}

View File

@ -140,20 +140,13 @@ body {
} }
.spinner { .spinner {
width: 100px; width: 30px;
margin: 10px auto 30px auto; margin: 0 auto;
background-color: #000; padding: 15px 15px;
@include border-radius-all(10px);
padding: 10px 10px 10px 30px;
font-size: 15px;
line-height: 23px;
text-align: center;
color: $secondary;
background: { background: {
image: image-url("spinner_96_w.gif"); image: image-url("spinner_96.gif");
repeat: no-repeat; repeat: no-repeat;
position: 10px 8px; size: 30px;
size: 25px;
}; };
-webkit-animation: spinner .25s; -webkit-animation: spinner .25s;
animation: spinner .25s; animation: spinner .25s;