nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
Sarah Mei 2011-09-10 13:38:12 -07:00
commit ae32ffc667
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/comments/_comment.mobile.haml
View file

@ -14,6 +14,6 @@
.content .content
.from .from
= person_link(comment.author) = person_link(comment.author)
%p{ :class => direction_for(comment.text) } %div{ :class => direction_for(comment.text) }
= markdownify(comment, :youtube_maps => comment[:youtube_titles]) = markdownify(comment, :youtube_maps => comment[:youtube_titles])

2
app/views/messages/_message.haml
View file

@ -11,6 +11,6 @@
%time.timeago{:datetime => message.created_at} %time.timeago{:datetime => message.created_at}
= how_long_ago(message) = how_long_ago(message)
%p{ :class => direction_for(message.text) } %div{ :class => direction_for(message.text) }
= markdownify(message) = markdownify(message)

2
app/views/status_messages/_status_message.haml
View file

@ -15,5 +15,5 @@
- for photo in photos[1..photos.size] - for photo in photos[1..photos.size]
= link_to (image_tag photo.url(:thumb_small), :class => 'stream-photo thumb_small', 'data-small-photo' => photo.url(:thumb_medium), 'data-full-photo' => photo.url), photo_path(photo), :class => 'stream-photo-link' = link_to (image_tag photo.url(:thumb_small), :class => 'stream-photo thumb_small', 'data-small-photo' => photo.url(:thumb_medium), 'data-full-photo' => photo.url), photo_path(photo), :class => 'stream-photo-link'
%p{:class => direction_for(post.text)} %div{:class => direction_for(post.text)}
!= markdownify(post, :youtube_maps => post[:youtube_titles]) != markdownify(post, :youtube_maps => post[:youtube_titles])

2
public/stylesheets/sass/rtl.sass
View file

@ -256,3 +256,5 @@ ul.left_nav .contact_count, ul.left_nav .edit
:float left :float left
:margin-right 10px :margin-right 10px
div.content span.rtl
:display block