From d73da263d908cd0dea2fb30f66ffb29abb9e7f7f Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Mon, 19 Aug 2013 14:53:55 +0200 Subject: [PATCH] Unify profile sidebar --- app/assets/stylesheets/application.css.sass | 18 +++++++++--------- app/views/people/_profile_sidebar.html.haml | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass index 1ebc30a71..76e63aae2 100644 --- a/app/assets/stylesheets/application.css.sass +++ b/app/assets/stylesheets/application.css.sass @@ -461,6 +461,15 @@ form.new_comment h4 :font-weight bold + #image_list + .section + :margin + :bottom 4px + + img + :height 45px + :width 45px + #sharing_message :font-size smaller :align middle @@ -1883,15 +1892,6 @@ h1.tag .hover_edit :display inline -#contacts_of_contact - .section - :margin - :bottom 4px - - .avatar - :height 45px - :width 45px - .date :background :color #e6e6e6 diff --git a/app/views/people/_profile_sidebar.html.haml b/app/views/people/_profile_sidebar.html.haml index e349008ab..2d8cdf981 100644 --- a/app/views/people/_profile_sidebar.html.haml +++ b/app/views/people/_profile_sidebar.html.haml @@ -45,22 +45,22 @@ =t('.born') = birthday_format(person.birthday) - if @photos.present? - %li + %li#image_list %h4 = t('.photos') .item_count = "#{@photos.count}" - - @photos.limit(3).each do |photo| + - @photos.limit(8).each do |photo| = image_tag(photo.url(:thumb_small)) %br = link_to t('layouts.header.view_all'), person_photos_path(person) - if person == current_user.person - %li#contacts_of_contact + %li#image_list %h4 = t('_contacts') .item_count - = my_contacts_count + = all_contacts_count .section.contact_pictures - current_user.contacts.limit(8).each do |contact| = person_image_link contact.person, :size => :thumb_small