diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index d3c7e06fa4ea2dc8c273fcf288d48bacfa2c5f1a..c3396aab9cdfb9c5c037bbdac82397945d4d200a 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -58,12 +58,16 @@ #group_header .container .span-5.last - - if @group == :all + - if @person %h1 - = link_to "All Relations", root_path + = @person.real_name - else - %h1 - = link_to @group.name, @group + - if @group == :all + %h1 + = link_to "All Relations", root_path + - else + %h1 + = link_to @group.name, @group .page_title = yield :page_title diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js index d1d91351ab48898ee4941572124e99adef764d97..ba442a831d3836ed14844103a8c3cdb2846292b0 100644 --- a/public/javascripts/stream.js +++ b/public/javascripts/stream.js @@ -46,6 +46,6 @@ $(".comment_box").live('blur', function(evt){ }); $(".comment_submit").live('click', function(evt){ - $this.parents("p").parents("form").children("p").children(".comment_box").attr("rows", 1); + $(this).closest("form").children("p .comment_box").attr("rows", 1); }); diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index fb5e73c8455c0e54a5ec8c703b6dcbcded8b186d..ad271dfda7fd3475f6a189b1c9277d334b6eb314 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -238,15 +238,16 @@ ul.comment_set { padding: 0.6em; border-bottom: 1px solid #cccccc; } ul.comment_set li.comment .from { - font-weight: normal; } - ul.comment_set li.comment .from a { - font-weight: bold; } + font-size: 1em; } ul.comment_set li.comment div.time { color: #666666; font-size: 70%; } ul.comment_set li.comment form { margin-top: -5px; - margin-bottom: 0; } + margin-bottom: 0; + font-size: 1em; } + ul.comment_set li.comment form textarea { + font-size: 1em; } .profile_photo img { height: 150px; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 9fb7e044c89eb44dbe1cf757cf46ae6577f01531..87bff252690f741db73d972fd49b37b004d49161 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -300,10 +300,7 @@ ul.comment_set .from :font - :weight normal - a - :font - :weight bold + :size 1em div.time :color #666 @@ -313,6 +310,11 @@ ul.comment_set :margin :top -5px :bottom 0 + :font + :size 1em + textarea + :font + :size 1em .profile_photo img