From a3aab92212b0b60b5e48ee9b588c776bca799ae0 Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Fri, 8 Oct 2010 12:25:42 -0700
Subject: [PATCH 1/2] fixed photo partial

---
 app/views/photos/_photo.haml             | 13 +++++++------
 public/stylesheets/application.css       |  6 ------
 public/stylesheets/sass/application.sass |  9 ---------
 3 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/app/views/photos/_photo.haml b/app/views/photos/_photo.haml
index 85a2cd80a..9d48ac8b6 100644
--- a/app/views/photos/_photo.haml
+++ b/app/views/photos/_photo.haml
@@ -10,12 +10,13 @@
     .from
       = link_to post.person.real_name, post.person
       .aspect
-        → 
-        - if post.public?
-          the world
-        - else
-          - for aspect in current_user.aspects_with_post( post.id )
-            = aspect.name
+        ➔
+        %ul
+          - if post.public?
+            the world
+          - else
+            - for aspect in current_user.aspects_with_post( post.id )
+              %li= link_to aspect.name, aspect
 
     =t('.posted_a_new_photo_to')
     = link_to post.album.name, object_path(post.album)
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 6584d1dff..6320a4567 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -428,12 +428,6 @@ label {
     margin-bottom: 0; }
   #publisher .button {
     margin-left: 100px; }
-  #publisher img {
-    box-shadow: 0 1px 2px white;
-    -moz-box-shadow: 0 1px 2px white;
-    -webkit-box-shadow: 0 1px 2px white;
-    border: 1px solid #bbbbbb;
-      border-top: 1px solid #666666; }
 
 #image_picker .small_photo {
   height: 100px;
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index fd22daa89..40e824fa0 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -578,15 +578,6 @@ label
   .button
     :margin-left 100px
 
-  img
-    :box-shadow 0 1px 2px #fff
-    :-moz-box-shadow 0 1px 2px #fff
-    :-webkit-box-shadow 0 1px 2px #fff
-    :border 1px solid #bbb
-      :top 1px solid #666
-
-
-
 #image_picker
   .small_photo
     :height 100px

From 3754b519a7ea51a2fee61452ee19ebbe4ff90dcc Mon Sep 17 00:00:00 2001
From: Crimer <crimer90@gmail.com>
Date: Fri, 8 Oct 2010 21:51:59 +0000
Subject: [PATCH 2/2] Solved issue #79 'Email Label in Forgot Password Appears
 Outside of Textbox'.

---
 app/views/devise/passwords/new.html.haml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml
index 9afd3d244..1d877b70e 100644
--- a/app/views/devise/passwords/new.html.haml
+++ b/app/views/devise/passwords/new.html.haml
@@ -3,7 +3,6 @@
   = devise_error_messages!
   %p
     = f.label :email
-    %br/
     = f.text_field :email
   %p
   = f.submit "Send me reset password instructions"