fixups on people/show. make photos scroll over header on show pages.

app/views/people/_aspect_list.haml

@@ -35,8 +35,7 @@
     .right
       = link_to t('.edit_membership'), "#", :id=> "edit_contact_aspects"
 
-  .edit{:class => ("hidden" if contact)}
+  .edit.hidden
-
     = render :partial => 'people/share_with_pane',
         :locals => {:person => person,
           :contact => contact,

app/views/people/_person.html.haml

@@ -12,7 +12,6 @@
     - elsif (contact && contact.pending) || request
       = t('.pending_request')
     - else
-      - single_aspect_form ||= nil
       = link_to "start sharing",
         {:controller => "people",
         :action => "share_with",

app/views/people/_profile_sidebar.html.haml

@@ -39,19 +39,19 @@
     %ul#profile_information
       %li
         - unless person.profile.bio.blank?
-          %h3
+          %h4
             =t('.bio')
           = markdownify(person.profile.bio, :newlines => true)
 
       %li.span-8.last
         .span-4
           - unless person.profile.gender.blank?
-            %h3
+            %h4
               =t('.gender')
             = person.profile.gender
 
         .span-4.last
           - unless person.profile.birthday.blank?
-            %h3
+            %h4
               =t('.born')
             = birthday_format(person.profile.birthday)

app/views/people/_share_with_pane.html.haml

@@ -2,7 +2,7 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-.contact_list#aspects_list
+.aspect_list#aspects_list
   %ul
     - for aspect in aspects_with_person
       %li{:data=>{:guid=>aspect.id}}

app/views/people/show.html.haml

@@ -19,9 +19,21 @@
 
 .span-15.last
   #author_info
-    .right#person_nav_links
+    - unless @contact || current_user.person == @person
-      = link_to t('layouts.header.view_profile'), person_path(@person)
+      .right
-      = link_to t('_photos'), person_photos_path(@person)
+        = link_to "start sharing",
+          {:controller => "people",
+          :action => "share_with",
+          :id => @person.id},
+          :class => 'button',
+          :rel => 'facebox'
+
+    - else
+      .right
+        - if @post_type == :photos
+          = link_to t('layouts.header.view_profile'), person_path(@person)
+        - else
+          = link_to t('_photos'), person_photos_path(@person)
 
     %h3
       = @person.name

public/stylesheets/sass/application.sass

@@ -20,7 +20,7 @@ a
 p
   :word-wrap break-word
 
-h1, h2, h3, h4
+h1, h2, h3, h4, h5
   :color #444
   :position relative
   :font
@@ -114,7 +114,6 @@ form
 header
   :z-index 10
   :position relative
-  :min-height 40px
 
   :background
     :color #111
@@ -148,7 +147,7 @@ header
   &.landing
     .right
       :top 10px
-    :height 45px
+    :height 40px
 
   ul#user_menu
     :overflow hidden
@@ -297,11 +296,6 @@ header
   h3
     :display inline-block
 
-  #person_nav_links
-    a
-      :margin
-        :right 2em
-
 .stream_element
   :position relative
   :word-wrap break-word
@@ -651,14 +645,14 @@ ul.show_comments
     :align center
 
 #show_photo
+  :z-index 11
   :position relative
   :display inline-block
-  :background
-    :color #fff
   :max-width 100%
 
   img
     :max-width 100%
+    :-webkit-box-shadow 0 2px 5px #666
 
   #photo_spinner
     :z-index 1
@@ -1642,7 +1636,8 @@ ul#request_result
     input.add
       :color green
 
-.contact_list
+.contact_list,
+.aspect_list
   :height 450px
   :max-height 450px
 
@@ -1709,6 +1704,22 @@ ul#request_result
             :background -webkit-gradient( linear, left bottom, left top, color-stop(0, rgb(130,55,55)), color-stop(1, rgb(199,119,119)))
             :background -moz-linear-gradient(top, rgb(199,119,119), rgb(130,55,55))
 
+.aspect_list
+  :height 300px
+  :max-height 300px
+
+  .name
+    :left 1em
+
+  ul
+    > li
+      :padding 1em
+      :height 1em
+
+      .right
+        :top 2px
+        :right 1em
+
 footer
   :margin
     :top 40px
@@ -1779,8 +1790,6 @@ ul#landing_nav
     :text-shadow 0 1px 0 #000
 
 
-
-
 #signup_field
   :margin
     :top -200px
@@ -1950,15 +1959,6 @@ h3,h4
   p
     :color #999
 
-  h4
-    a
-      :font
-        :size 12px
-  img
-    :-webkit-box-shadow 0 1px 2px #666
-    :-moz-box-shadow 0 1px 2px #666
-    :box-shadow 0 1px 2px #666
-
 .what_is_this
   :position relative
   :top 3px

public/stylesheets/sass/ui.sass

@@ -6,7 +6,7 @@
 .button, .button_set
   :font
     :style normal
-    :weight normal
+    :weight bold
 
   :display inline