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/sass-files/sass/partials/_headers.scss | 3 +++
 web/sass-files/sass/partials/_modal.scss   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'web/sass-files')

diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss
index da648a170..571c7ff1f 100644
--- a/web/sass-files/sass/partials/_headers.scss
+++ b/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;
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index 8462701c9..dec08b567 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/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 {
-- 
cgit v1.2.3-1-g7c22