Solving conflicts and also fixing css for MM-1752

2015-08-21 15:45:48 +05:00
--- 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;
--- 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 {