diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-10-12 23:36:24 +0500 |
---|---|---|
committer | Asaad Mahmood <Unknowngi@live.com> | 2015-10-12 23:36:24 +0500 |
commit | 893a72141bcab38c8a5a10ec920c9480120d6b51 (patch) | |
tree | 58a63db7918abd24f3a5839da39568ac54b2c9c5 /web/sass-files/sass/partials | |
parent | 7bb8f5d1ef47e02c4f1784656f6abcff409b96d5 (diff) | |
parent | 246d934e5e557555645a1d26ae005be452ecbd2d (diff) | |
download | chat-893a72141bcab38c8a5a10ec920c9480120d6b51.tar.gz chat-893a72141bcab38c8a5a10ec920c9480120d6b51.tar.bz2 chat-893a72141bcab38c8a5a10ec920c9480120d6b51.zip |
Merge branch 'master' of https://github.com/mattermost/platform into ui-fixes
Diffstat (limited to 'web/sass-files/sass/partials')
-rw-r--r-- | web/sass-files/sass/partials/_base.scss | 5 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_markdown.scss | 9 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 2 |
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); } |