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

use bootstrap labels

Browse source
This commit is contained in:
Steffen van Bergerem 2013-12-16 00:46:55 +01:00
parent 206e3f9422
commit a96611c259
2 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/assets/stylesheets/conversations.css.scss
View file

@ -102,24 +102,12 @@
} }
.message_count, .unread_message_count { .message_count, .unread_message_count {
@include border-radius(5px); margin-right: 3px;
float: right; float: right;
padding: 0px 6px;
position: relative;
color: $background-grey;
font-size: 12px; font-size: 12px;
font-weight: normal; font-weight: normal;
} }
.message_count {
background-color: #999;
right: 0px;
}
.unread_message_count {
background-color: #b11;
right: 4px;
}
.participants_link { .participants_link {
clear: right; clear: right;
float: right; float: right;
@ -127,7 +115,6 @@
} }
.icons-users { .icons-users {
margin-left: 4px;
display: block; display: block;
width: 25px; width: 25px;
height: 16px; height: 16px;

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

@ -1,8 +1,8 @@
.subject .subject
.message_count .label.label-dafault.message_count
= conversation.messages.size = conversation.messages.size
- if unread_count > 0 - if unread_count > 0
.unread_message_count .label.label-important.unread_message_count
= unread_count = unread_count
%div{ :class => direction_for(conversation.subject) } %div{ :class => direction_for(conversation.subject) }