From b832c3d88526eedaf177fbcefef5268f7c5a0c27 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 27 Feb 2018 17:10:02 -0500
Subject: [PATCH] Glyph wasn't wrapping properly with long categories

---
 .../templates/components/category-title-link.hbs      | 11 ++++++-----
 app/assets/stylesheets/common/base/category-list.scss |  4 ++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/components/category-title-link.hbs b/app/assets/javascripts/discourse/templates/components/category-title-link.hbs
index 51db0e5f775..f27eac550c9 100644
--- a/app/assets/javascripts/discourse/templates/components/category-title-link.hbs
+++ b/app/assets/javascripts/discourse/templates/components/category-title-link.hbs
@@ -1,11 +1,12 @@
 {{category-title-before category=category}}
 <a class="category-title-link" href={{category.url}}>
-  {{#if category.read_restricted}}
-    {{d-icon 'lock'}}
-  {{/if}}
-
-  <span class="category-name">{{dir-span category.name}}</span>
+  <div class="category-text-title">
+    {{#if category.read_restricted}}
+      {{d-icon 'lock'}}
+    {{/if}}
 
+    <span class="category-name">{{dir-span category.name}}</span>
+  </div>
   {{#if category.uploaded_logo.url}}
     <div>{{cdn-img src=category.uploaded_logo.url class="category-logo"}}</div>
   {{/if}}
diff --git a/app/assets/stylesheets/common/base/category-list.scss b/app/assets/stylesheets/common/base/category-list.scss
index 739b577375f..ff00a121167 100644
--- a/app/assets/stylesheets/common/base/category-list.scss
+++ b/app/assets/stylesheets/common/base/category-list.scss
@@ -1,5 +1,9 @@
 .category-list {
   table-layout: fixed;
+  .category-text-title {
+    display: flex;
+    align-items: baseline;
+  }
   .category-name {
     display: inline-block;
     max-width: 100%;