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/sass-files/sass/partials/_modal.scss         |  7 +++++++
 web/sass-files/sass/partials/_popover.scss       |  8 +++++++-
 web/sass-files/sass/partials/_sidebar--left.scss | 13 +++++++------
 3 files changed, 21 insertions(+), 7 deletions(-)

(limited to 'web/sass-files/sass/partials')

diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index 014f834ed..8462701c9 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -50,6 +50,13 @@
 		@include clearfix;
 		.modal-title {
 			float: left;
+			font-size: 16px;
+			line-height: 27px;
+			color: #f4f4f4;
+			.name {
+				font-weight: 600;
+				color: #fff;
+			}
 		}
 		.modal-action {
 			padding: 0;
diff --git a/web/sass-files/sass/partials/_popover.scss b/web/sass-files/sass/partials/_popover.scss
index 5008331b4..126d239ec 100644
--- a/web/sass-files/sass/partials/_popover.scss
+++ b/web/sass-files/sass/partials/_popover.scss
@@ -1,3 +1,8 @@
+.channel-header__info .popover-content {
+	max-height: 250px;
+	overflow: auto;
+}
+
 .user-popover {
 	cursor: pointer;
 	display: inline-block;
@@ -13,4 +18,5 @@
 	overflow: hidden;
 	text-overflow: ellipsis;
 	display: block;
-}
\ No newline at end of file
+}
+
diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss
index 6d9f2ad8b..22b7426b1 100644
--- a/web/sass-files/sass/partials/_sidebar--left.scss
+++ b/web/sass-files/sass/partials/_sidebar--left.scss
@@ -38,24 +38,25 @@
         height: 100%;
         position: relative;
         overflow: auto;
-
     }
 
     .nav-pills__unread-indicator {
         position: absolute;
         left: 0;
         right: 0;
-        width: 70%;
-        background-color: darken($primary-color, 5%);
-        color: white;
+        width: 72%;
+        color: #777;
+        background: #DCF0FF;
+        @include border-radius(50px);
         margin: 0 auto;
-        padding: 2px;
+        padding: 3px 0 4px;
+        font-size: 13.5px;
         text-align: center;
         z-index: 1;
     }
 
     .nav-pills__unread-indicator-top {
-        top: 56px;
+        top: 66px;
     }
     .nav-pills__unread-indicator-bottom {
         bottom: 0px;
-- 
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/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/sass/partials')

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