Merge branch 'css_mobi_notif' of git://github.com/movilla/diaspora into develop
This commit is contained in:
commit
0677459ff9
3 changed files with 20 additions and 3 deletions
|
|
@ -14,6 +14,7 @@
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
* Add possibility to contact the administrator. [#3792](https://github.com/diaspora/diaspora/pull/3792)
|
* 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
|
## Bug Fixes
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ body {
|
||||||
|
|
||||||
.from {
|
.from {
|
||||||
a {
|
a {
|
||||||
color: #444 !important;
|
color: #444;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
margin-bottom: 2px;
|
margin-bottom: 2px;
|
||||||
|
|
@ -787,4 +787,20 @@ textarea#conversation_text {
|
||||||
form#new_user.new_user input.btn {
|
form#new_user.new_user input.btn {
|
||||||
white-space: normal;
|
white-space: normal;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.unread {
|
||||||
|
background-color: LightGrey;
|
||||||
|
.ltr {
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.read.stream_element {
|
||||||
|
color: dimGray;
|
||||||
|
.from {
|
||||||
|
a {
|
||||||
|
color: dimGray;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
= day
|
= day
|
||||||
%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' : ''}"}
|
.stream_element{:data=>{:guid => note.id}, :class => "#{note.unread ? 'unread' : 'read'}"}
|
||||||
|
|
||||||
= person_image_link(note.actors.last)
|
= person_image_link(note.actors.last)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue