From d74d5fb39e49e899e19dfc2710f9bebd5a357e8e Mon Sep 17 00:00:00 2001 From: Kris Aubuchon Date: Thu, 3 Jul 2014 23:40:49 -0400 Subject: [PATCH] truncating loooooooooong name fields --- .../templates/group/index.js.handlebars | 2 +- .../templates/poster_expansion.handlebars | 25 +++++++------ .../stylesheets/common/base/header.scss | 4 ++ .../stylesheets/common/base/topic-post.scss | 5 +++ .../stylesheets/desktop/poster_expansion.scss | 37 ++++++++++--------- app/assets/stylesheets/desktop/user.scss | 22 +++++++++++ app/assets/stylesheets/mobile/user.scss | 4 ++ 7 files changed, 69 insertions(+), 30 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/group/index.js.handlebars b/app/assets/javascripts/discourse/templates/group/index.js.handlebars index 810bf21bd94..ab0dea2779c 100644 --- a/app/assets/javascripts/discourse/templates/group/index.js.handlebars +++ b/app/assets/javascripts/discourse/templates/group/index.js.handlebars @@ -8,7 +8,7 @@ {{unbound title}} {{#if byName}} - + {{unbound byName}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/poster_expansion.handlebars b/app/assets/javascripts/discourse/templates/poster_expansion.handlebars index bc635c1e899..c2bb9825d6f 100644 --- a/app/assets/javascripts/discourse/templates/poster_expansion.handlebars +++ b/app/assets/javascripts/discourse/templates/poster_expansion.handlebars @@ -7,20 +7,21 @@

{{name}}

{{/if}} - {{#if showBadges}} -
- {{#each user.featured_user_badges}} - {{user-badge badge=badge}} - {{/each}} - {{#if showMoreBadges}} - {{#link-to 'user.badges' user class="btn more-user-badges"}} - {{i18n badges.more_badges count=moreBadgesCount}} - {{/link-to}} - {{/if}} -
- {{/if}} + + {{#if showBadges}} +
+ {{#each user.featured_user_badges}} + {{user-badge badge=badge}} + {{/each}} + {{#if showMoreBadges}} + {{#link-to 'user.badges' user class="btn more-user-badges"}} + {{i18n badges.more_badges count=moreBadgesCount}} + {{/link-to}} + {{/if}} +
+ {{/if}} {{#if user}}