Merge branch 'master' of github.com:diaspora/diaspora_rails

2010-07-23 21:43:17 -07:00 · 2010-07-23 21:43:17 -07:00 · 1fc4a8a008
commit 1fc4a8a008
parent 72d9b7b496 4d2b11310b
1 changed files with 2 additions and 2 deletions
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@ -50,13 +50,13 @@

    .container
      .span-24.last
-        .span-3.append-2.last
+        .span-3.append-1.last
          = link_to person_image_tag(User.owner), root_path
          = link_to "Edit your profile", edit_user_path(current_user)
          %br
          %br
          = render 'people/sidebar' if user_signed_in?
-        .span-19.last
+        .span-18.last
          = yield

        .span-24.last