diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass index 8e73e22226f843c59bca65cff904df9e5a86d894..a2434bab792acce3660ab5ef4a22cdc85d8af414 100644 --- a/app/assets/stylesheets/application.css.sass +++ b/app/assets/stylesheets/application.css.sass @@ -2068,6 +2068,19 @@ ul#requested-scopes .scope-description :display none +.item_count + :width 16px + :line-height 16px + :text-align center + @include border-radius(4px) + :color #999 + :background + :color #eee + :display inline-block + :font + :size 11px + :weight 700 + ul.left_nav :margin 0 :bottom 15px @@ -2100,9 +2113,7 @@ ul.left_nav > a:not(.sub_selected) :color #333 - .contact_count - :font - :weight 700 + .item_count :color #666 a.aspect_selector, @@ -2155,22 +2166,9 @@ ul.left_nav :display none &:hover @include opacity(1) - - .contact_count - :width 16px - :line-height 16px - :text-align center - @include border-radius(4px) - :margin-top 1px - :color #999 - :background - :color #eee - :display inline-block - :font - :size 11px - + a.home_selector - .contact_count + .item_count :float right ul.sub_nav diff --git a/app/assets/stylesheets/rtl.css.scss b/app/assets/stylesheets/rtl.css.scss index 8cacfa335005b8560a141728b3755d65963590a1..41e003541071850567751a53d86b0940748c17a4 100644 --- a/app/assets/stylesheets/rtl.css.scss +++ b/app/assets/stylesheets/rtl.css.scss @@ -297,7 +297,7 @@ ul.comments li.posted .controls .delete { left: 10px; } -ul.left_nav .contact_count, ul.left_nav .edit { +ul.left_nav .item_count, ul.left_nav .edit { float: left; } diff --git a/app/views/contacts/_aspect_listings.haml b/app/views/contacts/_aspect_listings.haml index 05d5a9348e432824ea23bbb624d1963f91a0384b..120f6bf213092626cd63e857e7f27b6b441d83ca 100644 --- a/app/views/contacts/_aspect_listings.haml +++ b/app/views/contacts/_aspect_listings.haml @@ -6,7 +6,7 @@ %li.all_aspects{:class => ("active" if params["set"] != "all" && params["set"] != "only_sharing" && !@spotlight)} %a.home_selector{:href => contacts_path, :class => ("sub_selected" if params["a_id"])} = t('contacts.index.my_contacts') - .contact_count + .item_count = my_contacts_count %ul.sub_nav @@ -15,7 +15,7 @@ .icons-check_yes_ok{:class => ("invisible" if params["a_id"].to_i != aspect.id) } %a.community_aspect_selector{:href => contacts_path(:a_id => aspect.id)} = aspect - .contact_count + .item_count = aspect.contacts.size %li @@ -24,7 +24,7 @@ %li.all_contacts{:class => ("active" if params["set"] == "all" || params["set"] == "only_sharing")} %a.home_selector{:href => contacts_path(:set => "all"), :class => ("sub_selected" if params["set"] == "only_sharing")} = t('contacts.index.all_contacts') - .contact_count + .item_count = all_contacts_count %ul.sub_nav @@ -32,6 +32,6 @@ .icons-check_yes_ok{:class => ("invisible" if params["set"] == "only_sharing")} %a.community_aspect_selector{:href => contacts_path(:set => "only_sharing")} = t('contacts.index.only_sharing_with_me') - .contact_count + .item_count = only_sharing_count diff --git a/app/views/people/_profile_sidebar.html.haml b/app/views/people/_profile_sidebar.html.haml index dc0a3caceb51646fd77276b01e147c5c192c83fe..efbcf252891731b8b6716964d420c220a4f1c268 100644 --- a/app/views/people/_profile_sidebar.html.haml +++ b/app/views/people/_profile_sidebar.html.haml @@ -18,7 +18,7 @@ %br %br -if contact.sharing? || person == current_user.person - %ul#aspect_nav.left_nav + %ul#profile_information - unless person.bio.blank? %li @@ -48,8 +48,8 @@ - unless @photos.blank? %h4 = t('_photos') - .contact_count - = " #{@photos.count}" + .item_count + = "#{@photos.count}" - @thumbs = @photos.limit(3) - for photo in @thumbs = image_tag(photo.url(:thumb_small))