Permalink
Browse files

Merge pull request #3450 from despora/mobile_messages

add messages/conversations to mobile
  • Loading branch information...
2 parents bc478ef + 00032a1 commit 629277502f7f3e3b7f1ff59fcf44d6ef2ac11b83 @Raven24 Raven24 committed Jul 16, 2012
Showing with 29 additions and 0 deletions.
  1. +24 −0 app/assets/stylesheets/mobile.css.scss
  2. +5 −0 app/views/layouts/application.mobile.haml
@@ -648,3 +648,27 @@ display: inline-block;
width: 28px;
}
+
+#conversation_inbox .message_count {
+ border-radius: 5px;
+
+ float: right;
+ right: 0px;
+ margin: 5px 5px auto;
+ padding: 5px;
+ position: relative;
+ background-color: #999;
+ color: #eee;
+ font-size: 25px;
+ font-weight: bold;
+}
+
+.conversation_participants img.avatar{
+ height:35px;
+ width:35px;
+ margin: 5px 0 5px 2px;
+}
+form#new_message.new_message input.button.creation{
+ float: right;
+ margin: 0 5px 5px;
+}
@@ -60,6 +60,11 @@
- if current_user.unread_notifications.count > 0
.badge_count
= current_user.unread_notifications.count
+ .badge{:class => "badge-inverse", :id => "conversations_badge"}
+ = link_to(image_tag('icons/mail_grey.png', :height => 16, :width => 16), conversations_path)
+ - if current_user.unread_message_count > 0
+ .badge_count
+ = current_user.unread_message_count
- if user_signed_in?
.right

0 comments on commit 6292775

Please sign in to comment.