From 2ca963fadbb1a22d421cd74cb89a6d9d1a7aedc8 Mon Sep 17 00:00:00 2001
From: augier <christophe@c-henry.fr>
Date: Fri, 28 Aug 2015 10:13:00 +0200
Subject: [PATCH] Correcting BS3 regression on badge color + spelling mistake
---
app/assets/stylesheets/conversations.scss | 3 +++
app/views/conversations/_conversation.haml | 2 +-
app/views/conversations/_conversation_subject.haml | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/app/assets/stylesheets/conversations.scss b/app/assets/stylesheets/conversations.scss
index 6c46ce67b2..1a7f00cd22 100644
--- 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;
+}
diff --git a/app/views/conversations/_conversation.haml b/app/views/conversations/_conversation.haml
index 17899a543b..c76c968b32 100644
--- 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
diff --git a/app/views/conversations/_conversation_subject.haml b/app/views/conversations/_conversation_subject.haml
index cde73f0ed3..965f60c68f 100644
--- 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
--
GitLab