From d1e1a91cb6084bd998dc2b298efb372716fef61f Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 24 Mar 2016 17:20:17 -0400 Subject: [PATCH] FIX: Large widths, weird button floating on badge view --- app/assets/javascripts/discourse/templates/badges/show.hbs | 3 ++- app/assets/stylesheets/common/base/user.scss | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs index 5976649b3..7f15cc73e 100644 --- a/app/assets/javascripts/discourse/templates/badges/show.hbs +++ b/app/assets/javascripts/discourse/templates/badges/show.hbs @@ -32,8 +32,9 @@ {{#unless canLoadMore}} {{#if user}} - {{log model}} +
{{i18n 'badges.others_count' count=model.grant_count}} +
{{/if}} {{/unless}} diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss index cba098d51..da721c7eb 100644 --- a/app/assets/stylesheets/common/base/user.scss +++ b/app/assets/stylesheets/common/base/user.scss @@ -136,14 +136,14 @@ } .user-info.medium { - width: 550px; + width: 480px; min-height: 60px; .user-image { width: 55px; } .user-detail { - width: 450px; + width: 380px; } .username, .name {