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" 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