From 55ac4c80544df4b0d3f7efed9b9a9a5c45e2c40a Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Wed, 16 Mar 2011 17:46:09 -0700 Subject: [PATCH] show tags under names in people partials --- app/views/aspects/index.html.haml | 1 - app/views/people/_person.html.haml | 2 +- app/views/posts/index.html.haml | 2 +- public/stylesheets/sass/application.sass | 16 ++++++++++++++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml index 24697e818..eeb06b112 100644 --- a/app/views/aspects/index.html.haml +++ b/app/views/aspects/index.html.haml @@ -36,7 +36,6 @@ %h4= t('shared.invitations.invite_your_friends') = render "shared/invitations", :invites => @invites - #aspect_listings.section = render 'aspects/aspect_listings', :aspects => @aspects diff --git a/app/views/people/_person.html.haml b/app/views/people/_person.html.haml index ce0aa8042..4e8df4e57 100644 --- a/app/views/people/_person.html.haml +++ b/app/views/people/_person.html.haml @@ -32,5 +32,5 @@ =person_link(person) .info - = person.diaspora_handle + = person.profile.format_tags(person.profile.tag_string) diff --git a/app/views/posts/index.html.haml b/app/views/posts/index.html.haml index 1c3b0a0bc..a3129fa9f 100644 --- a/app/views/posts/index.html.haml +++ b/app/views/posts/index.html.haml @@ -48,7 +48,7 @@ %span.from =person_link(person) .info - = person.diaspora_handle + = person.profile.format_tags(person.profile.tag_string) - if @people_count > 15 \... diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 451de9f87..332ee1b05 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -2787,6 +2787,22 @@ ul.show_comments :font :weight bold +.info + :overflow hidden + :white-space nowrap + :text-overflow ellipsis + + .tag + :background + :color #efefef + :color #999 + :border + :bottom 1px dotted #999 + + &:hover + :border + :bottom 1px solid #999 + .diaspora_handle :font :size 12px