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

Merge pull request #4823 from Flaburgan/fix-avatar-mobile-notification

Browse source 
Fix avatar position in mobile notification
This commit is contained in:
Jonne Haß 2014-03-04 00:41:44 +01:00
commit f12546bb78
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/stylesheets/mobile/mobile.css.scss
View file

@ -47,6 +47,7 @@ h3 {
overflow: auto; overflow: auto;
position: relative; position: relative;
text-align: left; text-align: left;
padding: 10px 0;
* { * {
max-width: 100%; } max-width: 100%; }
min-height: 34px; min-height: 34px;
@ -76,9 +77,8 @@ h3 {
> .content, > .content,
.reshare > .content { .reshare > .content {
padding: 10px { padding: 5px;
bottom: 0; }; } }
padding: 10px 0;
.info { .info {
margin: { margin: {
top: 0; }; } top: 0; }; }

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

@ -13,9 +13,8 @@
%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 .content.from
=person_image_link(note.actors.last) =person_image_link(note.actors.last)
.from
= notification_message_for(note) = notification_message_for(note)
.time_notif .time_notif
= timeago(note.created_at) = timeago(note.created_at)