Merge pull request #6357 from AugierLe42e/badges-fix

[Quickfix] Correcting BS3 regression on badge color + spelling mistake
2015-08-28 15:55:33 +02:00 · 2015-08-28 15:55:33 +02:00 · cdc6e9128b
commit cdc6e9128b
parent 9446a3ae21 2ca963fadb
3 changed files with 5 additions and 2 deletions
--- a/app/assets/stylesheets/conversations.scss
+++ b/app/assets/stylesheets/conversations.scss
@ -252,3 +252,6 @@
  label { font-weight: bold; }
 }

+.badge-important {
+  background-color: $brand-danger;
+}
--- a/app/views/conversations/_conversation.haml
+++ b/app/views/conversations/_conversation.haml
@ -16,7 +16,7 @@
              = other_participants.count - 1

      .bg
-        .badge.badge-dafault.message_count
+        .badge.badge-default.message_count
          = conversation.messages.size
        - if visibility.unread > 0
          .badge.badge-important.unread_message_count
--- a/app/views/conversations/_conversation_subject.haml
+++ b/app/views/conversations/_conversation_subject.haml
@ -1,5 +1,5 @@
 .subject
-  .badge.badge-dafault.message_count
+  .badge.badge-default.message_count
    = conversation.messages.size
  - if unread_count > 0
    .badge.badge-important.unread_message_count