From 73dab4b3effcc7589aec912a140df0581214da6c Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Wed, 15 Sep 2010 10:17:37 -0700 Subject: [PATCH] fixed stream elements --- .../status_messages/_status_message.html.haml | 2 ++ public/stylesheets/application.css | 21 ++++++++----------- public/stylesheets/sass/application.sass | 9 +++----- public/stylesheets/sass/sessions.sass | 2 +- public/stylesheets/sessions.css | 2 +- 5 files changed, 16 insertions(+), 20 deletions(-) diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml index 9581e4c1d..f99496611 100644 --- a/app/views/status_messages/_status_message.html.haml +++ b/app/views/status_messages/_status_message.html.haml @@ -30,8 +30,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" diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index fb34cdc83..b93d5ec04 100644 --- a/public/stylesheets/application.css +++ b/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; } diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index a96b19507..a713c2db0 100644 --- a/public/stylesheets/sass/application.sass +++ b/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 diff --git a/public/stylesheets/sass/sessions.sass b/public/stylesheets/sass/sessions.sass index 10fb82fd3..fd86f2a7a 100644 --- a/public/stylesheets/sass/sessions.sass +++ b/public/stylesheets/sass/sessions.sass @@ -40,7 +40,7 @@ body :background #fff :margin - :left 2em + :left 100px /* via blueprint */ input[type=text], diff --git a/public/stylesheets/sessions.css b/public/stylesheets/sessions.css index 96c4bf30c..f4e585c62 100644 --- a/public/stylesheets/sessions.css +++ b/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],