From 701cbfa94abce6bb26d6bdada66c644a2d4fba0b Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Thu, 20 Aug 2015 21:48:49 +0500
Subject: Multiple UI Improvements

---
 web/react/components/channel_notifications.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/react/components/channel_notifications.jsx')

diff --git a/web/react/components/channel_notifications.jsx b/web/react/components/channel_notifications.jsx
index 38bc91682..4d1789434 100644
--- a/web/react/components/channel_notifications.jsx
+++ b/web/react/components/channel_notifications.jsx
@@ -209,7 +209,7 @@ module.exports = React.createClass({
                                 <span aria-hidden="true">&times;</span>
                                 <span className="sr-only">Close</span>
                             </button>
-                            <h4 className="modal-title">{"Notification Preferences for " + this.state.title}</h4>
+                            <h4 className='modal-title'>Notification Preferences for <span className='name'>{this.state.title}</span></h4>
                         </div>
                         <div className="modal-body">
                             <div className="settings-table">
-- 
cgit v1.2.3-1-g7c22


From e7064e6449346c99514cb6569cafc68ebb51e1fe Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Fri, 21 Aug 2015 15:45:48 +0500
Subject: Solving conflicts and also fixing css for MM-1752

---
 web/react/components/channel_notifications.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/react/components/channel_notifications.jsx')

diff --git a/web/react/components/channel_notifications.jsx b/web/react/components/channel_notifications.jsx
index cd477feb7..884bad9d2 100644
--- a/web/react/components/channel_notifications.jsx
+++ b/web/react/components/channel_notifications.jsx
@@ -300,7 +300,7 @@ export default class ChannelNotifications extends React.Component {
                                 <span aria-hidden='true'>&times;</span>
                                 <span className='sr-only'>Close</span>
                             </button>
-                            <h4 className='modal-title'>{'Notification Preferences for ' + this.state.title}</h4>
+                            <h4 className='modal-title'>Notification Preferences for <span className='name'>{this.state.title}</span></h4>
                         </div>
                         <div className='modal-body'>
                             <div className='settings-table'>
-- 
cgit v1.2.3-1-g7c22