diff --git a/app/assets/javascripts/discourse/app/components/about-page-users.hbs b/app/assets/javascripts/discourse/app/components/about-page-users.hbs index 9b5597487f6..ebf8c28367c 100644 --- a/app/assets/javascripts/discourse/app/components/about-page-users.hbs +++ b/app/assets/javascripts/discourse/app/components/about-page-users.hbs @@ -1,34 +1,32 @@ {{#each this.usersTemplates as |userTemplate|}} -
-
-
- + + -
-
- - +
+
+ {{#if userTemplate.prioritizeName }}{{userTemplate.name}}{{else}}{{userTemplate.username}}{{/if}} - - - - {{#if - userTemplate.prioritizeName - }}{{userTemplate.username}}{{else}}{{userTemplate.name}}{{/if}} - + + + {{#if + userTemplate.prioritizeName + }}{{userTemplate.username}}{{else}}{{userTemplate.name}}{{/if}} + +
+
{{userTemplate.title}}
-
{{userTemplate.title}}
-
+ {{/each}} \ No newline at end of file diff --git a/app/assets/stylesheets/common/components/user-info.scss b/app/assets/stylesheets/common/components/user-info.scss index 3dd22005302..f08d96df2c7 100644 --- a/app/assets/stylesheets/common/components/user-info.scss +++ b/app/assets/stylesheets/common/components/user-info.scss @@ -25,24 +25,16 @@ .name-line { @include ellipsis; - } + color: var(--primary-high); - .bold a { - font-weight: bold; - } - - .margin a { - margin-left: 5px; - } - - .name a, - .username a { - color: var(--primary-high-or-secondary-low); + span:first-child { + color: var(--primary); + } } .title { margin-top: 3px; - color: var(--primary-med-or-secondary-med); + color: var(--primary-medium); } } diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index ad7a07dbb9b..9f211db2de4 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1076,6 +1076,7 @@ en: user: said: "%{username}:" profile: "Profile" + profile_possessive: "%{username}'s profile" mute: "Mute" edit: "Edit Preferences" download_archive: