From 35c337885237cca8100b29f7424ba95086c7422d Mon Sep 17 00:00:00 2001
From: Logan Hanks <logan@reddit.com>
Date: Wed, 18 Apr 2012 10:36:01 -0700
Subject: [PATCH] Disable word-wrapping in link flair.

---
 r2/r2/public/static/css/compact.css | 2 +-
 r2/r2/public/static/css/mobile.css  | 2 +-
 r2/r2/public/static/css/reddit.css  | 1 +
 r2/r2/templates/link.htmllite       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/r2/r2/public/static/css/compact.css b/r2/r2/public/static/css/compact.css
index fecbefdc1..9ac26459e 100644
--- a/r2/r2/public/static/css/compact.css
+++ b/r2/r2/public/static/css/compact.css
@@ -554,4 +554,4 @@ a.author { margin-right: 0.5em; }
 
 .flair, .linkflair { margin-top: 2px; margin-right: 0.5em; padding: 0px 2px; display: inline-block; background: whiteSmoke; color: #545454; border: 1px solid #dedede; font-size: 9px; -moz-border-radius: 2px; -webkit-border-radius: 2px; -o-border-radius: 2px; -ms-border-radius: 2px; -khtml-border-radius: 2px; border-radius: 2px; -moz-box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.9); -webkit-box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.9); -o-box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.9); box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.9); }
 
-.linkflair { font-weight: normal; max-width: 10em; overflow: hidden; text-overflow: ellipsis; }
+.linkflair { font-weight: normal; max-width: 10em; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
diff --git a/r2/r2/public/static/css/mobile.css b/r2/r2/public/static/css/mobile.css
index b0bace2fb..9747f36ab 100644
--- a/r2/r2/public/static/css/mobile.css
+++ b/r2/r2/public/static/css/mobile.css
@@ -148,5 +148,5 @@ ul {
 .md ol, .md ul { margin: 10px 2em; }
 .md pre { margin: 10px; }
 .flair, .linkflair { color: #545454; background-color: #F5F5F5; border: 1px solid #DEDEDE; }
-.linkflair { font-size: small; max-width: 10em; overflow: hidden; text-overflow: ellipsis; }
+.linkflair { display: inline-block; font-size: small; max-width: 10em; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 a.author, .flair, .linkflair { margin-right: 0.5em }
diff --git a/r2/r2/public/static/css/reddit.css b/r2/r2/public/static/css/reddit.css
index 38c806a49..3f88e803c 100644
--- a/r2/r2/public/static/css/reddit.css
+++ b/r2/r2/public/static/css/reddit.css
@@ -689,6 +689,7 @@ a.author { margin-right: 0.5em; }
     max-width: 10em;
     overflow: hidden;
     text-overflow: ellipsis;
+    white-space: nowrap;
 }
 
 .link .flair {
diff --git a/r2/r2/templates/link.htmllite b/r2/r2/templates/link.htmllite
index 6739706a9..193907901 100644
--- a/r2/r2/templates/link.htmllite
+++ b/r2/r2/templates/link.htmllite
@@ -29,7 +29,7 @@
 
 <%def name="flair()">
   <span class="linkflair"
-      ${optionalstyle("color: #545454; background-color: #f5f5f5; border: 1px solid #dedede; display: inline-block; font-size: x-small; margin-right: 0.5em; padding: 0 2px; max-width: 10em; overflow: hidden; text-overflow: ellipsis;")}>
+      ${optionalstyle("color: #545454; background-color: #f5f5f5; border: 1px solid #dedede; display: inline-block; font-size: x-small; margin-right: 0.5em; padding: 0 2px; max-width: 10em; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;")}>
     ${thing.flair_text}
   </span>
 </%def>