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

app/views/people/index.html.haml

@@ -3,17 +3,17 @@
 -#   the COPYRIGHT file.
 
 
-%h1.big_text
-  .back
-    = link_to "⇧ home", root_path
+- content_for :publish do
+  %h1
+    Search
 
-  Search
-
-%p
   =form_tag '/people', :method => "get" do
     = text_field_tag :q
     = submit_tag "search"
 
+- content_for :left_pane do
+  \.
+
 = (@people.count).to_s + search_or_index
 %table
   %tr

app/views/status_messages/_status_message.html.haml

@@ -16,8 +16,10 @@
       = link_to(how_long_ago(post), object_path(post))
       \--
       = link_to "show comments (#{post.comments.count})", '#', :class => "show_post_comments"
+
     = render   "comments/comments", :post => post 
 
+
   - if current_user.owns?(post)
     .destroy_link
       = link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "delete"

app/views/users/edit.html.haml

@@ -3,15 +3,14 @@
 -#   the COPYRIGHT file.
 
 
-%h1.big_text
-  .back
-    = link_to "⇧ home", root_path
+- content_for :publish do
+  %h1
+    Editing profile
 
-  Editing your profile
+- content_for :left_pane do
+  \.
 
 = form_for @user do |f|
-
-
   = f.error_messages
 
   = f.fields_for :profile do |p|

public/stylesheets/application.css

@@ -156,14 +156,15 @@ li.message {
     margin-right: 15px; }
   li.message .delete:hover {
     background: #eeeeee; }
-  li.message .content span.from {
-    color: black;
-    font-weight: normal;
-    margin-right: 0.2em;
-    font-size: 110%; }
-  li.message .content div.info {
-    color: #bababa;
-    font-size: 70%; }
+  li.message .content {
+    padding-left: 65px; }
+    li.message .content span.from {
+      color: black;
+      font-weight: normal;
+      font-size: 110%; }
+    li.message .content div.info {
+      color: #bababa;
+      font-size: 70%; }
 
 form {
   position: relative;
@@ -205,10 +206,6 @@ form {
     height: 30px;
     margin-right: 10px; }
 
-#stream ul.comment_set {
-  padding: 0;
-    padding-left: 65px; }
-
 input.comment_submit {
   display: none;
   margin-right: -10px; }

public/stylesheets/sass/application.sass

@@ -216,12 +216,13 @@ li.message
     :background #eee
     
   .content
+    :padding
+      :left 65px
+
     span.from
       :color #000
       :font
         :weight normal
-      :margin
-        :right 0.2em
       :font
         :size 110%
 
@@ -283,10 +284,6 @@ form
     :margin
       :right 10px
 
-#stream ul.comment_set
-  :padding 0
-    :left 65px
-
 input.comment_submit
   :display none
   :margin

public/stylesheets/sass/sessions.sass

@@ -40,7 +40,7 @@ body
   :background #fff
 
   :margin
-    :left 2em
+    :left 100px
 
 /* via blueprint */
 input[type=text],

public/stylesheets/sessions.css

@@ -16,7 +16,7 @@ body {
   font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
   color: #222222;
   background: white;
-  margin-left: 2em; }
+  margin-left: 100px; }
 
 /* via blueprint */
 input[type=text],