diff --git a/app/assets/javascripts/discourse/templates/group/index.hbs b/app/assets/javascripts/discourse/templates/group/index.hbs index cb270552e..aee834721 100644 --- a/app/assets/javascripts/discourse/templates/group/index.hbs +++ b/app/assets/javascripts/discourse/templates/group/index.hbs @@ -7,6 +7,7 @@ {{unbound title}} + {{category-link category}} {{#if byName}} {{unbound byName}} diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss index e6e4c9f0f..dc22e2845 100644 --- a/app/assets/stylesheets/desktop/user.scss +++ b/app/assets/stylesheets/desktop/user.scss @@ -452,12 +452,13 @@ text-overflow: ellipsis; } .name { - display: block; + display: inline-block; font-size: 14px; max-width: 400px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + vertical-align: middle; } .edit-reason { background-color: scale-color($highlight, $lightness: 25%); diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss index b75319cbc..f2a47cfab 100644 --- a/app/assets/stylesheets/mobile/user.scss +++ b/app/assets/stylesheets/mobile/user.scss @@ -459,12 +459,13 @@ text-overflow: ellipsis; } .name { - display: block; + display: inline-block; font-size: 14px; max-width: 400px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + vertical-align: middle; } .edit-reason { background-color: scale-color($highlight, $lightness: 25%); diff --git a/app/serializers/group_post_serializer.rb b/app/serializers/group_post_serializer.rb index cd2342340..c9e37bdc0 100644 --- a/app/serializers/group_post_serializer.rb +++ b/app/serializers/group_post_serializer.rb @@ -5,7 +5,8 @@ class GroupPostSerializer < ApplicationSerializer :title, :url, :user_title, - :user_long_name + :user_long_name, + :category has_one :user, serializer: BasicUserSerializer, embed: :objects @@ -24,5 +25,9 @@ class GroupPostSerializer < ApplicationSerializer def include_user_long_name? SiteSetting.enable_names? end + + def category + object.topic.category + end end