diff options
| author | Raphael Sofaer <raphael@joindiaspora.com> | 2011-07-12 03:17:11 +0400 |
|---|---|---|
| committer | Raphael Sofaer <raphael@joindiaspora.com> | 2011-07-12 03:17:11 +0400 |
| commit | 8f50c622fada4cf864f432c5c3866624c50a801e (patch) | |
| tree | 4ecda43f973c14a0c453fc88c319ff2a760bdbbd /public | |
| parent | a7d8535d36cdcb8a009950c0202485513c2e3be6 (diff) | |
Fix contentUpdater spec, adjust migration and fix a couple of the js viwes
Diffstat (limited to 'public')
| -rw-r--r-- | public/javascripts/content-updater.js | 4 | ||||
| -rw-r--r-- | public/stylesheets/sass/application.sass | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/public/javascripts/content-updater.js b/public/javascripts/content-updater.js index 028670c65..a3c0c7dd0 100644 --- a/public/javascripts/content-updater.js +++ b/public/javascripts/content-updater.js @@ -6,7 +6,7 @@ var ContentUpdater = { addPostToStream: function(html) { var streamElement = $(html); - var postGUID = streamElement.id; + var postGUID = $(streamElement).attr('id'); if($("#"+postGUID).length === 0) { if($("#no_posts").length) { @@ -31,5 +31,5 @@ var ContentUpdater = { .html(html) .fadeIn("fast"); } - + }; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 0275ce0ad..56b25dad5 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -667,6 +667,7 @@ form.new_comment :display inline-block +.comment .likes, .likes_container :display inline @@ -2221,6 +2222,11 @@ ul.show_comments :border :top 1px dotted #aaa +ul.show_comments, +.likes_container + a + :color #999 + .likes_container :margin :bottom -4px @@ -2228,10 +2234,6 @@ ul.show_comments ul.show_comments, .likes_container - a - :font - :weight bold - img :position relative :top 2px |