From c3c5ac3ef70899c93fe7f7ecd77ad38503711a7e Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Fri, 21 Mar 2014 15:33:30 -0400
Subject: [PATCH] Some tweaks to sub-category badges
---
app/assets/javascripts/discourse/lib/html.js | 4 ++--
app/assets/stylesheets/common/components/badges.css.scss | 7 +++++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/app/assets/javascripts/discourse/lib/html.js b/app/assets/javascripts/discourse/lib/html.js
index 6663f6731..8d4e65862 100644
--- a/app/assets/javascripts/discourse/lib/html.js
+++ b/app/assets/javascripts/discourse/lib/html.js
@@ -104,11 +104,11 @@ Discourse.HTML = {
if (opts.showParent && category.get('parent_category_id')) {
var parent = Discourse.Category.findById(category.get('parent_category_id'));
- html = "<a class='badge-category-parent' style=\"" + (Discourse.HTML.categoryStyle(parent)||'') +
+ html = "<span class='badge-wrapper'><a class='badge-category-parent' style=\"" + (Discourse.HTML.categoryStyle(parent)||'') +
"\" href=\"" + url + "\"><span class='category-name'>" +
(Em.get(parent, 'read_restricted') ? "<i class='fa fa-group'></i> " : "") +
Em.get(parent, 'name') + "</span></a>" +
- html;
+ html + "</span>";
}
return html;
diff --git a/app/assets/stylesheets/common/components/badges.css.scss b/app/assets/stylesheets/common/components/badges.css.scss
index 35a806286..68adec818 100644
--- a/app/assets/stylesheets/common/components/badges.css.scss
+++ b/app/assets/stylesheets/common/components/badges.css.scss
@@ -24,6 +24,13 @@
white-space: nowrap;
display: inline-block;
line-height: 1;
+ i.fa {
+ font-size: 11px;
+ vertical-align: 1px;
+ }
+}
+.badge-wrapper {
+ white-space: nowrap;
}
.badge-category {