diff --git a/app/assets/javascripts/discourse/templates/group/members.js.handlebars b/app/assets/javascripts/discourse/templates/group/members.js.handlebars index 07044e03b..0a0c81719 100644 --- a/app/assets/javascripts/discourse/templates/group/members.js.handlebars +++ b/app/assets/javascripts/discourse/templates/group/members.js.handlebars @@ -1,8 +1,22 @@ -{{#each model}} -
- {{i18n last_seen}} {{date last_seen_at}} - {{avatar this imageSize="large"}} -

{{#link-to 'user' this}}{{username}}{{/link-to}}

-

{{name}}

-
-{{/each}} +{{#if model}} + + + + + {{#each model}} + + + + + + + {{/each}} +
{{i18n last_seen}}
+ {{avatar this imageSize="large"}} + +

{{#link-to 'user' this}}{{username}}{{/link-to}}

+

{{name}}

+
+ {{date last_seen_at}} +
+{{/if}} diff --git a/app/assets/javascripts/discourse/templates/user/user.js.handlebars b/app/assets/javascripts/discourse/templates/user/user.js.handlebars index 73e4c3567..beac824ac 100644 --- a/app/assets/javascripts/discourse/templates/user/user.js.handlebars +++ b/app/assets/javascripts/discourse/templates/user/user.js.handlebars @@ -47,7 +47,7 @@
{{i18n groups.title count=custom_groups.length}}: {{#each custom_groups}} - {{#link-to 'group' this}}{{name}}{{/link-to}} + {{#link-to 'group' this class="group-link"}}{{name}}{{/link-to}} {{/each}}
{{/if}} diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss index 9d4d09e82..737d3d709 100644 --- a/app/assets/stylesheets/desktop/user.scss +++ b/app/assets/stylesheets/desktop/user.scss @@ -116,17 +116,23 @@ width: 680px; } - .group-member { - img { - float: left; - margin-right: 10px; + table.group-members { + width: 100%; + th.seen { + text-align: right; } - span.last-seen-at { - float: right; - color: #999; + td.avatar { + width: 60px; + } + td { + img { + margin-right: 10px; + } + span.last-seen-at { + float: right; + color: #999; + } } - clear: both; - } .user-content { @@ -204,6 +210,9 @@ h1, h2 {margin-top: 10px;} + .group-link { + color: #aae; + } .bio { color: #ddd;