touched up stream_element and comment partial

This commit is contained in:
danielvincent 2011-01-06 16:41:40 -08:00
parent f44b3cbe3d
commit 3ff4b67ff0
3 changed files with 18 additions and 19 deletions

View file

@ -1,14 +1,14 @@
-# Copyright (c) 2010, Diaspora Inc. This file is -# Copyright (c) 2010, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See -# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
- comment = hash[:comment]
- person = hash[:person] %li.comment{:data=>{:guid=>hash[:comment].id}, :class => ("hidden" if(defined? hidden))}
%li.comment{:data=>{:guid=>comment.id}, :class => ("hidden" if(defined? hidden))} = person_image_link(hash[:person])
=person_image_link(person)
.content .content
.from .from
=person_link(person) = person_link(hash[:person])
= markdownify(comment.text, :youtube_maps => comment[:youtube_titles]) = markdownify(hash[:comment].text, :youtube_maps => hash[:comment][:youtube_titles])
%div.time
= comment.created_at ? t('ago', :time => time_ago_in_words(comment.created_at)) : time_ago_in_words(Time.now)
.info
%span.time
= hash[:comment].created_at ? t('ago', :time => time_ago_in_words(hash[:comment].created_at)) : time_ago_in_words(Time.now)

View file

@ -4,7 +4,7 @@
.stream_element{:data=>{:guid=>post.id}} .stream_element{:data=>{:guid=>post.id}}
- if person.owner_id == current_user.id - if person.owner_id == current_user.id
.right.controls .right.hidden.controls
- reshare_aspects = aspects_without_post(all_aspects, post) - reshare_aspects = aspects_without_post(all_aspects, post)
- unless reshare_aspects.empty? - unless reshare_aspects.empty?
= render 'shared/reshare', :aspects => reshare_aspects, :post => post = render 'shared/reshare', :aspects => reshare_aspects, :post => post
@ -14,7 +14,7 @@
.content .content
.from .from
%h4 %h5
=person_link(person) =person_link(person)
- if post.public? - if post.public?

View file

@ -120,7 +120,7 @@ header
:color #111 :color #111
:color rgba(30,30,30,0.98) :color rgba(30,30,30,0.98)
:background -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(30,30,30,0.84)), to(rgba(0,0,0,0.96))) :background -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(25,25,25,0.83)), to(rgba(0,0,0,0.98)))
:-webkit-box-shadow 0 1px 3px #111 :-webkit-box-shadow 0 1px 3px #111
:-moz-box-shadow 0 1px 2px #111 :-moz-box-shadow 0 1px 2px #111
@ -238,7 +238,7 @@ header
.stream .stream
.stream_element .stream_element
:padding 0.7em 1em :padding 0.7em 1.2em
:min-height 50px :min-height 50px
:border :border
:bottom 1px solid #eee :bottom 1px solid #eee
@ -309,7 +309,7 @@ header
:color #777 :color #777
.from .from
h4 h5
:display inline :display inline
a a
:color #444 :color #444
@ -318,7 +318,7 @@ header
:margin :margin
:top 0 :top 0
:padding :padding
:left 60px :left 63px
:color #444 :color #444
:font :font
@ -508,7 +508,7 @@ header
ul.comments ul.comments
textarea textarea
:width 284px :width 275px
.stream ul.comments .stream ul.comments
.avatar .avatar
@ -536,7 +536,7 @@ ul.show_comments
li li
:list :list
:style none :style none
:padding 0.7em :padding 0.5em
:border :border
:bottom 1px solid #ddd :bottom 1px solid #ddd
:top 1px solid #fff :top 1px solid #fff
@ -558,7 +558,7 @@ ul.show_comments
:top 0px :top 0px
:bottom -2px :bottom -2px
:padding :padding
:left 40px :left 38px
:right 20px :right 20px
.from .from
a a
@ -576,7 +576,7 @@ ul.show_comments
textarea textarea
:font :font
:size 1em :size 1em
:width 485px :width 478px
.submit_instructions .submit_instructions
:text-align center :text-align center
@ -616,7 +616,6 @@ ul.show_comments
.stream_element .stream_element
.right .right
:display none
:position absolute :position absolute
:right 12px :right 12px