diff options
| author | Stas Vovk <stas@vovk.me> | 2015-10-12 21:54:51 +0300 |
|---|---|---|
| committer | Stas Vovk <stas@vovk.me> | 2015-10-12 21:54:51 +0300 |
| commit | bafb341015e6a9aaba878bec8126fcc825531015 (patch) | |
| tree | 1312efa11b3435205d2d31818a0f2ce91269373c /web/sass-files/sass | |
| parent | b5a499977ec212139444974255a27f8e66d0befd (diff) | |
| parent | 246d934e5e557555645a1d26ae005be452ecbd2d (diff) | |
| download | chat-bafb341015e6a9aaba878bec8126fcc825531015.tar.gz chat-bafb341015e6a9aaba878bec8126fcc825531015.tar.bz2 chat-bafb341015e6a9aaba878bec8126fcc825531015.zip | |
Merge remote-tracking branch 'upstream/master' into PLT-589
Diffstat (limited to 'web/sass-files/sass')
| -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 82ec1811a..d9a99d4a4 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -667,7 +667,7 @@ .modal-image { .image-wrapper { font-size: 12px; - max-width: 280px; + min-width: 280px; .modal-close { @include opacity(1); } |