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

Use media objects for mobile posts/comments/notifications

Browse source
This commit is contained in:
Steffen van Bergerem 2015-06-04 14:10:24 +02:00 committed by Jonne Haß
parent 676c0ab611
commit cc58c66e3d
5 changed files with 36 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/stylesheets/mobile/mobile.scss
View file

@ -9,12 +9,6 @@
@import "header"; @import "header";
@import "mobile/tags"; @import "mobile/tags";
.col-xs-1{
width: 50px;
padding-right: 0;
}
.col-xs-11{ width: calc(100% - 50px); }
a { a {
color: #2489ce; color: #2489ce;
text-decoration: none; text-decoration: none;
@ -162,6 +156,8 @@ h3 { margin-top: 0; }
padding-top: 10px; padding-top: 10px;
} }
.stream_element .media { padding: 0; }
.photo_attachments { .photo_attachments {
position: relative; position: relative;
left: 0; left: 0;

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

@ -4,9 +4,10 @@
%li.comment{data:{guid:comment.id}, class: ("hidden" if(defined? hidden))} %li.comment{data:{guid:comment.id}, class: ("hidden" if(defined? hidden))}
.content .content
.col-xs-1 .media
= person_image_link(comment.author, size: :thumb_small) .media-left
.col-xs-11 = person_image_link(comment.author, size: :thumb_small, class: "media-object")
.media-body
.from.pull-left .from.pull-left
= person_link(comment.author) = person_link(comment.author)
.info .info
@ -17,7 +18,6 @@
- if user_signed_in? && comment.author == current_user.person - if user_signed_in? && comment.author == current_user.person
= link_to(raw("<i class='entypo trash'></i>"), comment_path(comment), method: :delete, = link_to(raw("<i class='entypo trash'></i>"), comment_path(comment), method: :delete,
data: { confirm: "#{t('are_you_sure')}" }, class: "remove") data: { confirm: "#{t('are_you_sure')}" }, class: "remove")
.clearfix
%div{class: direction_for(comment.text)} %div{class: direction_for(comment.text)}
= comment.message.markdownified = comment.message.markdownified

8
app/views/notifications/index.mobile.haml
View file

@ -16,10 +16,10 @@
%ul.notifications_for_day %ul.notifications_for_day
- notes.each do |note| - notes.each do |note|
.stream_element{:data=>{guid: note.id}, class: "#{note.unread ? 'unread' : 'read'}"} .stream_element{:data=>{guid: note.id}, class: "#{note.unread ? 'unread' : 'read'}"}
.content.from .content.from.media
.col-xs-1 .media-left
= person_image_link(note.actors.last, size: :thumb_small) = person_image_link(note.actors.last, size: :thumb_small, class: "media-object")
.col-xs-11 .media-body
= notification_message_for(note) = notification_message_for(note)
.time_notif .time_notif
= timeago(note.created_at) = timeago(note.created_at)

8
app/views/shared/_post_info.mobile.haml
View file

@ -2,10 +2,10 @@
-# 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.
.from .from.media
.col-xs-1 .media-left
= person_image_link(post.author, size: :thumb_small) = person_image_link(post.author, size: :thumb_small, class: "media-object")
.col-xs-11 .media-body
.pull-left .pull-left
= person_link(post.author) = person_link(post.author)