Merge branch 'develop' of github.com:diaspora/diaspora into develop

Conflicts:
	Changelog.md

Changelog.md

@@ -1,15 +1,16 @@
 # Head
 
 ## Refactor
-Move non-model federation stuff into lib/ [#4363](https://github.com/diaspora/diaspora/pull/4363)
+* Move non-model federation stuff into lib/ [#4363](https://github.com/diaspora/diaspora/pull/4363)
 
 ## Bug fixes
-Highlight down arrow at the user menu on hover [#4441](https://github.com/diaspora/diaspora/pull/4441)
-Make invite code input width consistent across borwsers [#4448](https://github.com/diaspora/diaspora/pull/4448)
+* Highlight down arrow at the user menu on hover [#4441](https://github.com/diaspora/diaspora/pull/4441)
+* Make invite code input width consistent across borwsers [#4448](https://github.com/diaspora/diaspora/pull/4448)
+* Fix style of contacts in profile sidebar [#4451](https://github.com/diaspora/pull/4451)
 
 ## Features
-Add oEmbed content to the mobile view [#4343](https://github.com/diaspora/diaspora/pull/4353)
-One click to select the invite URL [#4447](https://github.com/diaspora/diaspora/pull/4447)
+* Add oEmbed content to the mobile view [#4343](https://github.com/diaspora/diaspora/pull/4353)
+* One click to select the invite URL [#4447](https://github.com/diaspora/diaspora/pull/4447)
 
 # 0.2.0.0
 

app/assets/stylesheets/profile.css.scss

@@ -22,7 +22,7 @@
       }
   }
 
-  #image_list {
+  .image_list {
     .section {
       margin-bottom: 4px;
     }

app/views/people/_profile_sidebar.html.haml

@@ -56,7 +56,7 @@
               =t('.born')
             = birthday_format(person.birthday)
         - if @photos.present?
-          %li#image_list
+          %li.image_list
             %h4
               = t('.photos')
               .item_count
@@ -67,7 +67,7 @@
               = link_to t('layouts.header.view_all'),  person_photos_path(person)
   
         - if person == current_user.person
-          %li#image_list
+          %li.image_list
             %h4
               = t('_contacts')
               .item_count
@@ -77,7 +77,7 @@
                 = person_image_link contact.person, :size => :thumb_small
             %p.see_all= link_to t('layouts.header.view_all'), contacts_path
         - elsif @contact.persisted? && @contacts_of_contact_count > 0
-          %li#contacts_of_contact
+          %li.image_list
             %h4
               = t('_contacts')
               .item_count

features/desktop/profile_photos.feature

@@ -16,7 +16,7 @@ Feature: show photos
 
     Scenario: see my own photos
       When I am on "robert@grimm.grimm"'s page
-      And I follow "View all" within "#image_list"
+      And I follow "View all" within ".image_list"
       Then I should be on person_photos page
 
     Scenario: I cannot see photos of people who don't share with me