nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '1584-aspects-list'

Browse source
This commit is contained in:
Gonzalo Rodriguez 2011-10-06 01:52:53 -02:00
commit 04b51cced8
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/contacts/_aspect_listings.haml
View file

@ -21,7 +21,7 @@
= link_to t('aspects.aspect_listings.add_an_aspect'), new_aspect_path, :class => "new_aspect", :rel => "facebox"
%li.all_contacts{:class => ("active" if params["set"] == "all" || params["set"] == "only_sharing")}
%a.aspect_selector{:href => contacts_path(:set => "all"), :class => ("sub_selected" if params["set"] == "only_sharing")}
%a.home_selector{:href => contacts_path(:set => "all"), :class => ("sub_selected" if params["set"] == "only_sharing")}
.contact_count
= all_contacts_count
= t('contacts.index.all_contacts')

10
public/stylesheets/sass/application.sass
View file

@ -2888,6 +2888,12 @@ ul.left_nav
:weight 700
:color #666
> a.aspect_selector
:background
:image url(../images/icons/check_yes_ok.png)
:position 3px 50%
:repeat no-repeat
.contact_count
:float right
@ -2929,8 +2935,8 @@ ul.left_nav
.new_aspect,
a.tag_selector
:padding
:left 15px
:width 182px
:left 25px
:width 172px
a.toggle_selector
:outline none