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

Correcting BS3 regression on badge color + spelling mistake

Browse source
This commit is contained in:
augier 2015-08-28 10:13:00 +02:00
parent 9446a3ae21
commit 2ca963fadb
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/stylesheets/conversations.scss
View file

@ -252,3 +252,6 @@
label { font-weight: bold; } label { font-weight: bold; }
} }
.badge-important {
background-color: $brand-danger;
}

2
app/views/conversations/_conversation.haml
View file

@ -16,7 +16,7 @@
= other_participants.count - 1 = other_participants.count - 1
.bg .bg
.badge.badge-dafault.message_count .badge.badge-default.message_count
= conversation.messages.size = conversation.messages.size
- if visibility.unread > 0 - if visibility.unread > 0
.badge.badge-important.unread_message_count .badge.badge-important.unread_message_count

2
app/views/conversations/_conversation_subject.haml
View file

@ -1,5 +1,5 @@
.subject .subject
.badge.badge-dafault.message_count .badge.badge-default.message_count
= conversation.messages.size = conversation.messages.size
- if unread_count > 0 - if unread_count > 0
.badge.badge-important.unread_message_count .badge.badge-important.unread_message_count