From 7f34c7af7a162538f6dc4995b199cdcabbd8e84e Mon Sep 17 00:00:00 2001 From: Asphyxia Date: Mon, 21 Jan 2013 22:43:48 -0300 Subject: [PATCH] Issue #3874: Distorted profile thumbnail --- Changelog.md | 2 +- app/assets/stylesheets/application.css.sass | 5 +++++ app/views/contacts/index.html.haml | 2 +- app/views/conversations/_show.haml | 2 +- app/views/notifications/_notify_popup_item.haml | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Changelog.md b/Changelog.md index 51c0fbdba..2662f78cb 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), [#3840](https://github.com/diaspora/diaspora/issues/3840), [#3846](https://github.com/diaspora/diaspora/issues/3846), [#3851](https://github.com/diaspora/diaspora/issues/3851), [#3828](https://github.com/diaspora/diaspora/issues/3828). +* 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), [#3846](https://github.com/diaspora/diaspora/issues/3846), [#3851](https://github.com/diaspora/diaspora/issues/3851), [#3828](https://github.com/diaspora/diaspora/issues/3828), [#3874](https://github.com/diaspora/diaspora/issues/3874). ## Bug Fixes diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass index eb78156dd..e7bdb4ceb 100644 --- a/app/assets/stylesheets/application.css.sass +++ b/app/assets/stylesheets/application.css.sass @@ -1893,6 +1893,11 @@ ul#press_logos :margin :top 9px +.conversation_participants + a:hover + :text-decoration none + + .stream_element.conversation :padding 8px diff --git a/app/views/contacts/index.html.haml b/app/views/contacts/index.html.haml index 57f8232d1..c0b03c786 100644 --- a/app/views/contacts/index.html.haml +++ b/app/views/contacts/index.html.haml @@ -36,7 +36,7 @@ .media .img - = person_image_link(contact.person) + = person_image_link(contact.person, :size => :thumb_small) .bd = person_link(contact.person) diff --git a/app/views/conversations/_show.haml b/app/views/conversations/_show.haml index 6586340f5..2b9a1c43c 100644 --- a/app/views/conversations/_show.haml +++ b/app/views/conversations/_show.haml @@ -10,7 +10,7 @@ = conversation.subject - for participant in conversation.participants - = person_image_link(participant) + = person_image_link(participant, :size => :thumb_small) .span-15.last .stream diff --git a/app/views/notifications/_notify_popup_item.haml b/app/views/notifications/_notify_popup_item.haml index b82cedc64..b761f9bcd 100644 --- a/app/views/notifications/_notify_popup_item.haml +++ b/app/views/notifications/_notify_popup_item.haml @@ -1,5 +1,5 @@ .notification_element{:data=>{:guid => n.id}, :class => (n.unread ? "unread" : "read")} - = person_image_tag n.actors.first, :thumb_medium + = person_image_tag n.actors.first, :thumb_small = notification_message_for(n) %div %time