Merge pull request #1926 from awesomerobot/master

now that wbr tags are inputted, breaking usernames a bit more natually
2014-02-11 15:43:41 -05:00 · 2014-02-11 15:43:41 -05:00 · 1e374e1958
parent 80bdc6e430 3b71f8af3a
commit 1e374e1958
2 changed files with 10 additions and 1 deletions
--- a/app/assets/stylesheets/common/components/badges.css.scss
+++ b/app/assets/stylesheets/common/components/badges.css.scss
@ -36,6 +36,15 @@
  }
 }

+.d-dropdown .badge-category {
+&.restricted {
+    div {
+      display: inline-block;
+      margin: 0;
+      padding-right: 6px;
+    }
+}}
+
 h1 a.badge-category div {vertical-align: top;}


--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@ -618,7 +618,7 @@ position: relative;
  h3 {
    font-size: 13px;
    margin-top: 5px;
-    word-wrap: break-word;
+    overflow: hidden;
    line-height: 1.2em;
  }
 }