From 266a896bde320fdc5f9db66d682efd00b8a5bccf Mon Sep 17 00:00:00 2001
From: Daniel Vincent Grippi <Dan@SPEEDRACER.local>
Date: Fri, 10 Sep 2010 23:55:33 -0700
Subject: [PATCH] mtweaking comments in stream
---
app/views/layouts/application.html.haml | 12 ++++++++----
public/javascripts/stream.js | 2 +-
public/stylesheets/application.css | 9 +++++----
public/stylesheets/sass/application.sass | 10 ++++++----
4 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index d3c7e06fa4..c3396aab9c 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 d1d91351ab..ba442a831d 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 fb5e73c845..ad271dfda7 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 9fb7e044c8..87bff25269 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
--
GitLab