Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
app/assets/javascripts/discourse/controllers/topic.js.es6
View File

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

4
app/assets/javascripts/discourse/templates/badges/show.hbs
View File

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

4
app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
View File

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

4
app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
View File

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

2
app/assets/javascripts/discourse/templates/composer.hbs
View File

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

2
app/assets/javascripts/discourse/templates/discovery.hbs
View File

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

2
app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
View File

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

10
app/assets/javascripts/discourse/templates/topic.hbs
View File

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

2
app/assets/javascripts/discourse/templates/user/invited.hbs
View File

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

2
app/assets/javascripts/discourse/templates/user/notifications.hbs
View File

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

2
app/assets/javascripts/discourse/templates/user/posts.hbs
View File

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

2
app/assets/javascripts/discourse/templates/user/stream.hbs
View File

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

17
app/assets/stylesheets/common/base/discourse.scss
View File

@ -140,20 +140,13 @@ body {
}
.spinner {
width: 100px;
margin: 10px 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;
width: 30px;
margin: 0 auto;
padding: 15px 15px;
background: {
image: image-url("spinner_96_w.gif");
image: image-url("spinner_96.gif");
repeat: no-repeat;
position: 10px 8px;
size: 25px;
size: 30px;
};
-webkit-animation: spinner .25s;
animation: spinner .25s;