Solving conflicts and also fixing css for MM-1752

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'>

web/sass-files/sass/partials/_headers.scss

@@ -65,6 +65,9 @@
 	}
 	.channel-intro-img {
 		float:left;
+		img {
+			@include border-radius(100px);
+		}
 	}
 	.channel-intro__title {
 		font-weight:600;

web/sass-files/sass/partials/_modal.scss

@@ -50,7 +50,7 @@
 		@include clearfix;
 		.modal-title {
 			float: left;
-			font-size: 16px;
+			font-size: 17px;
 			line-height: 27px;
 			color: #f4f4f4;
 			.name {