diff --git a/app/assets/javascripts/discourse/controllers/group/members.js.es6 b/app/assets/javascripts/discourse/controllers/group/members.js.es6 index 881a614ca3a..ca218875fbd 100644 --- a/app/assets/javascripts/discourse/controllers/group/members.js.es6 +++ b/app/assets/javascripts/discourse/controllers/group/members.js.es6 @@ -21,4 +21,3 @@ export default Ember.ObjectController.extend({ } } }); - diff --git a/app/assets/javascripts/discourse/templates/group/members.hbs b/app/assets/javascripts/discourse/templates/group/members.hbs index fcfd0374b5b..8421949e044 100644 --- a/app/assets/javascripts/discourse/templates/group/members.hbs +++ b/app/assets/javascripts/discourse/templates/group/members.hbs @@ -1,19 +1,17 @@ {{#if model}} - + + {{#each model.members as |m|}} - + - {{/each}} diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss index 467d8763013..b6faa34f4cb 100644 --- a/app/assets/stylesheets/desktop/user.scss +++ b/app/assets/stylesheets/desktop/user.scss @@ -115,19 +115,24 @@ overflow: hidden; text-overflow: ellipsis; } - th.seen { + th { + padding: 0.5em; text-align: right; + border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); } td.avatar { width: 60px; } td { + padding: 0.5em; + border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); img { margin-right: 10px; } - span.last-seen-at { + span.text { float: right; - color: $primary; + font-size: 1.2em; + color: dark-light-diff($primary, $secondary, 50%, -50%); } } } diff --git a/app/serializers/group_user_serializer.rb b/app/serializers/group_user_serializer.rb index a42afab1944..9bcef433216 100644 --- a/app/serializers/group_user_serializer.rb +++ b/app/serializers/group_user_serializer.rb @@ -1,4 +1,3 @@ class GroupUserSerializer < BasicUserSerializer - attributes :name, :last_seen_at + attributes :name, :last_posted_at, :last_seen_at end -
{{i18n 'last_seen'}}{{i18n 'last_post'}}{{i18n 'last_seen'}}
- {{avatar m imageSize="large"}} + {{user-small user=m}} + {{bound-date m.last_posted_at}} -

{{#link-to 'user' m}}{{m.username}}{{/link-to}}

-

{{m.name}}

-
- {{bound-date m.last_seen_at}} + {{bound-date m.last_seen_at}}