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

FIX: time read on users directory was not rendering correctly on mobile

This commit is contained in:
Neil Lalonde 2018-01-29 13:31:06 -05:00
parent 51e327f640
commit fcc86d5be3
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/components/user-stat.js.es6
View File

@ -1,5 +1,6 @@
export default Ember.Component.extend({ export default Ember.Component.extend({
classNames: ['user-stat'], classNames: ['user-stat'],
type: 'number', type: 'number',
isNumber: Ember.computed.equal('type', 'number') isNumber: Ember.computed.equal('type', 'number'),
isDuration: Ember.computed.equal('type', 'duration')
}); });

2
app/assets/javascripts/discourse/templates/components/user-stat.hbs
View File

@ -1,6 +1,8 @@
<span class='value'> <span class='value'>
{{#if isNumber}} {{#if isNumber}}
{{number value}} {{number value}}
{{else if isDuration}}
{{format-duration value}}
{{else}} {{else}}
{{value}} {{value}}
{{/if}} {{/if}}

2
app/assets/javascripts/discourse/templates/mobile/components/directory-item.hbs
View File

@ -7,5 +7,5 @@
{{user-stat value=item.posts_read label="directory.posts_read"}} {{user-stat value=item.posts_read label="directory.posts_read"}}
{{user-stat value=item.days_visited label="directory.days_visited"}} {{user-stat value=item.days_visited label="directory.days_visited"}}
{{#if showTimeRead}} {{#if showTimeRead}}
<div class='time-read'>{{unbound item.time_read}}</div> {{user-stat value=item.time_read label="directory.time_read" type="duration"}}
{{/if}} {{/if}}

5
app/assets/stylesheets/common/base/directory.scss
View File

@ -32,6 +32,9 @@
font-size: $font-up-3; font-size: $font-up-3;
color: $primary-medium; color: $primary-medium;
} }
.time-read {
white-space: nowrap;
}
} }
tr.me { tr.me {
@ -39,7 +42,7 @@
background-color: dark-light-choose($highlight-low, $highlight-medium); background-color: dark-light-choose($highlight-low, $highlight-medium);
.username a, .name, .title, .number, .time-read { .username a, .name, .title, .number, .time-read {
color: $primary-medium; color: $primary-medium;
} }
} }
} }