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

UX: Position loading spinner properly on user pages

This commit is contained in:
Robin Ward 2014-11-12 13:57:59 -05:00
parent 4090ed226a
commit 02abcd03fb
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/ember/resolver.js.es6
View File

@ -3,7 +3,7 @@
var classify = Ember.String.classify; var classify = Ember.String.classify;
var get = Ember.get; var get = Ember.get;
var LOADING_WHITELIST = ['badges', 'userActivity', 'userPrivateMessages', 'admin', 'adminFlags'], var LOADING_WHITELIST = ['badges', 'userActivity', 'userPrivateMessages', 'admin', 'adminFlags', 'user', 'preferences'],
_dummyRoute, _dummyRoute,
_loadingView; _loadingView;

4
app/assets/javascripts/discourse/templates/user/user.hbs
View File

@ -187,7 +187,9 @@
{{/if}} {{/if}}
</section> </section>
{{outlet}} <section class='user-right'>
{{outlet}}
</section>
</section> </section>
</div> </div>

35
app/assets/stylesheets/desktop/user.scss
View File

@ -141,15 +141,18 @@
} }
} }
.user-right {
width: 75%;
float: right;
margin-top: 20px;
}
.user-content { .user-content {
padding: 10px 8px; padding: 10px 8px;
background-color: $secondary; background-color: $secondary;
border: 1px solid scale-color-diff(); border: 1px solid scale-color-diff();
margin-bottom: 10px; margin-bottom: 10px;
box-sizing: border-box; box-sizing: border-box;
width: 75%;
float: right;
margin-top: 20px;
.btn.right { .btn.right {
float: right float: right
@ -394,8 +397,6 @@
.user-stream { .user-stream {
float: right;
width: 75%;
.excerpt { .excerpt {
margin: 5px 0; margin: 5px 0;
font-size: 13px; font-size: 13px;
@ -574,20 +575,16 @@
} }
.paginated-topics-list { .paginated-topics-list {
float: right; .topic-list > tbody > tr:nth-child(odd) {
width: 75%; background-color: darken($secondary, 3%);
margin-top: 20px; }
.topic-list > tbody > tr:nth-child(odd) { .topic-list > tbody > tr:nth-child(even) {
background-color: darken($secondary, 3%); background-color: $secondary;
} }
.topic-list > tbody > tr:nth-child(even) { .user-content {
background-color: $secondary; width: 100%;
} margin-top: 0;
}
.user-content {
width: 100%;
margin-top: 0;
}
} }