diff --git a/app/views/aspects/manage.html.haml b/app/views/aspects/manage.html.haml index 7d8605050743a7c31fbad1495719dbed5b793caa..390aaf15759cd0124a5fcc87cb3561eed2cd2eea 100644 --- a/app/views/aspects/manage.html.haml +++ b/app/views/aspects/manage.html.haml @@ -33,32 +33,30 @@ = render 'shared/invitations', :invites => @invites .span-19.last - %ul#aspect_list - - for aspect in @aspects - %li.aspect{:data=>{:guid=>aspect.id}} - - .aspect_name - %span.edit_name_field - %h3{:contenteditable=>true} - = aspect.name - %span.tip click to edit - - %ul.tools - %li= link_to t('.add_a_new_contact'), "#manage_aspect_contacts_pane_#{aspect.id}", :class => 'manage_aspect_contacts_button' - %li!= remove_link(aspect) - - %ul.dropzone{:data=>{:aspect_id=>aspect.id}} - -for contact in aspect.contacts - %li.person{:data=>{:guid=>contact.person.id, :aspect_id=>aspect.id}} - .delete - .x - X - .circle - = link_to person_image_tag(contact.person), contact.person - .draggable_info - =t('.drag_to_add') + - for aspect in @aspects + .aspect.span-9{:data=>{:guid=>aspect.id}} + .aspect_name + %span.edit_name_field + %h3{:contenteditable=>true} + = aspect.name + %span.tip click to edit + + %ul.tools + %li= link_to t('.add_a_new_contact'), "#manage_aspect_contacts_pane_#{aspect.id}", :class => 'manage_aspect_contacts_button' + %li!= remove_link(aspect) + + %ul.dropzone{:data=>{:aspect_id=>aspect.id}} + -for contact in aspect.contacts + %li.person{:data=>{:guid=>contact.person.id, :aspect_id=>aspect.id}} + .delete + .x + X + .circle + = link_to person_image_tag(contact.person), contact.person + .draggable_info + =t('.drag_to_add') - .fancybox_content - %div{:id => "manage_aspect_contacts_pane_#{aspect.id}"} - = render "requests/manage_aspect_contacts", :aspect_name => aspect.name, :aspect_id => aspect.id, :manage => true + .fancybox_content + %div{:id => "manage_aspect_contacts_pane_#{aspect.id}"} + = render "requests/manage_aspect_contacts", :aspect_name => aspect.name, :aspect_id => aspect.id, :manage => true diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 496c21ec5bee8363558e9189336019c628f0a5eb..1d5cf34cb0add4f11036f1f1bf30d9ef5bf81ea8 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -1022,7 +1022,7 @@ label ul.tools :position absolute - :top 5px + :top 3px :right 0 :display inline :padding 0 @@ -1036,15 +1036,13 @@ label :margin :right 0 .aspect, -.requests, -.aspect_remove +.requests :color #999 :cursor default :text-shadow 0 1px #fff - ul.dropzone :position relative - :min-height 20px + :min-height 65px :margin 0 :bottom 25px @@ -1080,8 +1078,8 @@ label :color #eee img - :height 70px - :width 70px + :height 50px + :width 50px :-webkit-box-shadow 0 1px 2px #999 :-moz-box-shadow 0 1px 2px #999 @@ -1127,7 +1125,7 @@ label :border 1px solid #fff :-webkit-border-radius 20px - :-moz-border-radius 20px + :-moz-border-adius 20px :border-radius 20px :-webkit-box-shadow 0 1px 3px #000 @@ -1145,6 +1143,10 @@ label :background :color rgba(208,49,43,1) +.aspect + :margin + :right 20px + .requests ul.dropzone