Merge branch 'master' of https://github.com/mattermost/platform into ui-fixes

3 files changed, 8 insertions, 8 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/_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/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index f31e7cdc5..4e532c16e 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -670,7 +670,7 @@
         .modal-image {
             .image-wrapper {
                 font-size: 12px;
-                max-width: 280px;
+                min-width: 280px;
                 .modal-close {
                     @include opacity(1);
                 }