8 files changed, 26 insertions, 11 deletions
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index 18462d92a..470db16dc 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -34,6 +34,11 @@ body {
   }
 }
 
+img {
+  max-width: 100%;
+  height: auto;
+}
+
 .input-group-addon {
   background: transparent;
 }
diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss
index 8e353aff9..feaa5acfb 100644
--- a/web/sass-files/sass/partials/_headers.scss
+++ b/web/sass-files/sass/partials/_headers.scss
@@ -147,7 +147,8 @@
 		}
 		.header__info {
 			color: #fff;
-			padding-left: 4px;
+			@include clearfix;
+			padding-left: 2px;
 			z-index: 1;
 			position: relative;
 		}
@@ -155,7 +156,7 @@
 			display: block;
 			font-weight: 600;
 			font-size: 16px;
-			max-width: 80%;
+			max-width: 85%;
 			overflow: hidden;
 			white-space: nowrap;
 			text-overflow: ellipsis;
diff --git a/web/sass-files/sass/partials/_markdown.scss b/web/sass-files/sass/partials/_markdown.scss
index 122586354..1aa942ad0 100644
--- a/web/sass-files/sass/partials/_markdown.scss
+++ b/web/sass-files/sass/partials/_markdown.scss
@@ -53,15 +53,10 @@ blockquote {
 }
 pre {
 	border: none;
-	background-color: #f7f7f7;
 	margin: 5px 0;
-	.current--user & {
-		background: #fff;
-	}
-	code {
-		color: #c7254e;
-	}
+	color: inherit;
 }
 code {
 	background: #fff;
+	color: inherit;
 }
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index 2722333a4..90ea8ce2c 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -1,3 +1,6 @@
+#channel_members_modal .modal-body {
+	min-height: 110px;
+}
 .modal-body {
 	padding: 20px 15px;
 }
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index ccd7fd425..85bb2eb28 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -195,6 +195,14 @@ body.ios {
 		.post-body__cell {
 			vertical-align: top;
 			position: relative;
+			&.scroll {
+				.btn-file {
+					right: 15px;
+				}
+				.custom-textarea {
+					padding-right: 43px;
+				}
+			}
 		}
 		.send-button {
 			display: none;
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index 82ec1811a..4e532c16e 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -421,6 +421,9 @@
             .post-body__cell {
                 display: table-cell;
                 padding-left: 45px;
+                .sidebar--right & {
+                    padding-left: 0;
+                }
             }
             .app__content & {
                 .btn-file {
@@ -667,7 +670,7 @@
         .modal-image {
             .image-wrapper {
                 font-size: 12px;
-                max-width: 280px;
+                min-width: 280px;
                 .modal-close {
                     @include opacity(1);
                 }
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index 8debb0b4e..0c2f25eab 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -268,7 +268,6 @@
         position:absolute;
         right:15px;
         top:13px;
-        color:#414142;
     }
 }
 
diff --git a/web/sass-files/sass/partials/_sidebar--right.scss b/web/sass-files/sass/partials/_sidebar--right.scss
index b37dbf421..c954b03d8 100644
--- a/web/sass-files/sass/partials/_sidebar--right.scss
+++ b/web/sass-files/sass/partials/_sidebar--right.scss
@@ -26,6 +26,7 @@
         .post-header {
             .post-header-col {
                 &.post-header__reply {
+                    min-width: 30px;
                     text-align: right;
                     float: right;
                 }