Merge branch 'css_mobi_notif' of git://github.com/movilla/diaspora into develop

This commit is contained in:
Jonne Haß 2012-12-08 13:46:23 +01:00
commit 0677459ff9
3 changed files with 20 additions and 3 deletions

View file

@ -14,6 +14,7 @@
## Features
* Add possibility to contact the administrator. [#3792](https://github.com/diaspora/diaspora/pull/3792)
* Add simple background for unread messages/conversations mobile. [#3724](https://github.com/diaspora/diaspora/pull/3724)
## Bug Fixes

View file

@ -45,7 +45,7 @@ body {
.from {
a {
color: #444 !important;
color: #444;
font-weight: bold;
}
margin-bottom: 2px;
@ -787,4 +787,20 @@ textarea#conversation_text {
form#new_user.new_user input.btn {
white-space: normal;
}
.unread {
background-color: LightGrey;
.ltr {
font-weight: bold;
}
}
.read.stream_element {
color: dimGray;
.from {
a {
color: dimGray;
font-weight: bold;
}
}
}

View file

@ -12,7 +12,7 @@
= day
%ul.notifications_for_day
- notes.each do |note|
.stream_element{:data=>{:guid => note.id}, :class => "#{note.unread ? 'unread' : ''}"}
.stream_element{:data=>{:guid => note.id}, :class => "#{note.unread ? 'unread' : 'read'}"}
= person_image_link(note.actors.last)