From 284c40b4da4a6054ee23974f8490859eba1c72b5 Mon Sep 17 00:00:00 2001
From: Asphyxia <dario.cavuotti@gmail.com>
Date: Mon, 14 Jan 2013 01:52:43 -0300
Subject: [PATCH] Issue #3840: Fix extra blank on streams

---
 Changelog.md                                    | 2 +-
 app/assets/stylesheets/application.css.sass     | 8 ++++++++
 app/assets/templates/reshare_tpl.jst.hbs        | 4 +---
 app/assets/templates/stream-element_tpl.jst.hbs | 4 +---
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 325d46cda..14129e44b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -27,7 +27,7 @@
 * Re-add hovercards [#3802](https://github.com/diaspora/diaspora/pull/3802)
 * Add images to notifications [#3821](https://github.com/diaspora/diaspora/pull/3821)
 * Show pod version in footer and updated the link to the changelog [#3822](https://github.com/diaspora/diaspora/pull/3822)
-* User interface enhancements [#3832](https://github.com/diaspora/diaspora/pull/3832), [#3839](https://github.com/diaspora/diaspora/pull/3839), [#3834](https://github.com/diaspora/diaspora/pull/3834).
+* User interface enhancements [#3832](https://github.com/diaspora/diaspora/pull/3832), [#3839](https://github.com/diaspora/diaspora/pull/3839), [#3834](https://github.com/diaspora/diaspora/pull/3834), [#3840](https://github.com/diaspora/diaspora/issues/3840).
 
 ## Bug Fixes
 
diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass
index 06ec8b64b..c48bd8499 100644
--- a/app/assets/stylesheets/application.css.sass
+++ b/app/assets/stylesheets/application.css.sass
@@ -411,6 +411,10 @@ ul.as-selections
   &:hover
     @include opacity(1)
 
+.controls
+  a:hover
+    :text-decoration none
+
 .status_message_show
   .comment_box
     :width 653px
@@ -2418,6 +2422,10 @@ a.toggle_selector
     :margin
       :bottom -2px
 
+.stream-faces
+  a:hover
+    :text-decoration none
+
 #view_all_contacts_link
   @include border-radius(2px)
   :display block
diff --git a/app/assets/templates/reshare_tpl.jst.hbs b/app/assets/templates/reshare_tpl.jst.hbs
index fa6ab0bad..b528bfc55 100644
--- a/app/assets/templates/reshare_tpl.jst.hbs
+++ b/app/assets/templates/reshare_tpl.jst.hbs
@@ -13,9 +13,7 @@
       {{#with root}}
         <div class="bd">
           <div>
-            <a href="/people/{{author.guid}}" class="author {{{hovercardable this}}}">
-              {{author.name}}
-            </a>
+            <a href="/people/{{author.guid}}" class="author {{{hovercardable this}}}">{{author.name}}</a>
 
             <span class="details grey">
               -
diff --git a/app/assets/templates/stream-element_tpl.jst.hbs b/app/assets/templates/stream-element_tpl.jst.hbs
index 82126bdab..f2b04c23b 100644
--- a/app/assets/templates/stream-element_tpl.jst.hbs
+++ b/app/assets/templates/stream-element_tpl.jst.hbs
@@ -26,9 +26,7 @@
   <div class="bd">
     <div>
       {{#with author}}
-        <a href="/people/{{guid}}" class="author {{{hovercardable this}}}">
-          {{name}}
-        </a>
+        <a href="/people/{{guid}}" class="author {{{hovercardable this}}}">{{name}}</a>
       {{/with}}
 
       <span class="details grey">