diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs index a014d4257b1..765b011da84 100644 --- a/app/assets/javascripts/discourse/templates/user.hbs +++ b/app/assets/javascripts/discourse/templates/user.hbs @@ -3,38 +3,38 @@
{{#unless collapsedInfo}} + {{#if showStaffCounters}} +
+ {{#if model.number_of_flags_given}} +
{{model.number_of_flags_given}}{{i18n 'user.staff_counters.flags_given'}}
+ {{/if}} + {{#if model.number_of_flagged_posts}} +
+ {{#link-to 'review' (query-params username=model.username status='all' type='ReviewableFlaggedPost')}} + {{model.number_of_flagged_posts}}{{i18n 'user.staff_counters.flagged_posts'}} + {{/link-to}} +
+ {{/if}} + {{#if model.number_of_deleted_posts}} +
+ {{#link-to 'user.deletedPosts' model}} + {{model.number_of_deleted_posts}}{{i18n 'user.staff_counters.deleted_posts'}} + {{/link-to}} +
+ {{/if}} + {{#if model.number_of_suspensions}} +
+ + {{model.number_of_suspensions}}{{i18n 'user.staff_counters.suspensions'}} + +
+ {{/if}} + {{#if model.warnings_received_count}} +
{{model.warnings_received_count}}{{i18n 'user.staff_counters.warnings_received'}}
+ {{/if}} +
+ {{/if}}
- {{#if showStaffCounters}} -
- {{#if model.number_of_flags_given}} -
{{model.number_of_flags_given}}{{i18n 'user.staff_counters.flags_given'}}
- {{/if}} - {{#if model.number_of_flagged_posts}} -
- {{#link-to 'review' (query-params username=model.username status='all' type='ReviewableFlaggedPost')}} - {{model.number_of_flagged_posts}}{{i18n 'user.staff_counters.flagged_posts'}} - {{/link-to}} -
- {{/if}} - {{#if model.number_of_deleted_posts}} -
- {{#link-to 'user.deletedPosts' model}} - {{model.number_of_deleted_posts}}{{i18n 'user.staff_counters.deleted_posts'}} - {{/link-to}} -
- {{/if}} - {{#if model.number_of_suspensions}} -
- - {{model.number_of_suspensions}}{{i18n 'user.staff_counters.suspensions'}} - -
- {{/if}} - {{#if model.warnings_received_count}} -
{{model.warnings_received_count}}{{i18n 'user.staff_counters.warnings_received'}}
- {{/if}} -
- {{/if}} {{/unless}}
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss index 296c8f8524c..77e32201060 100644 --- a/app/assets/stylesheets/desktop/user.scss +++ b/app/assets/stylesheets/desktop/user.scss @@ -205,10 +205,6 @@ } } - .staff-counters { - margin-bottom: 20px; - } - .user-field { input[type="text"] { width: 530px; diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss index b0990b9a773..12b8806a4bc 100644 --- a/app/assets/stylesheets/mobile/user.scss +++ b/app/assets/stylesheets/mobile/user.scss @@ -274,10 +274,6 @@ } } -.staff-counters { - margin-bottom: s(4); -} - .user-right { &, > .user-stream {